diff --git a/src/luaengineapp/app.lua b/src/luaengineapp/app.lua index 3a17cf1..5dc35ce 100644 --- a/src/luaengineapp/app.lua +++ b/src/luaengineapp/app.lua @@ -46,7 +46,7 @@ function main() layoutAddWidget(mainLayout, pushButton1) connect(pushButton1, "clicked()", "showDialog") - setWidgetFixedSize(mainWindow) + setWidgetFixed(mainWindow) showWidget(mainWindow, ShowNormal) return GuiExecuted end @@ -71,7 +71,7 @@ function showDialog(pushButton) local dialogButton = createPushButton("Close", dialog) layoutAddWidget(buttonLayout, dialogButton) connect(dialogButton, "clicked()", "closeDialog") - setWidgetFixedSize(dialog) + setWidgetFixed(dialog) executeWidget(dialog) delete(dialog, DeleteInstant) end diff --git a/src/luaengineapp/main.cpp b/src/luaengineapp/main.cpp index cd6df76..06ae604 100644 --- a/src/luaengineapp/main.cpp +++ b/src/luaengineapp/main.cpp @@ -28,7 +28,9 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); +#ifdef _WIN32 QApplication::setStyle(new LuaEngineStyle()); +#endif #ifdef _WIN32 #if QT_VERSION >= 0x050400 @@ -45,14 +47,16 @@ int main(int argc, char *argv[]) #endif #endif +#ifdef _WIN32 QFile *luaEngineStyleFile = new QFile(":/luaenginestyle/luaenginestyle.qss"); if (luaEngineStyleFile->open(QFile::ReadOnly)) { a.setStyleSheet(QString::fromUtf8(luaEngineStyleFile->readAll())); } delete luaEngineStyleFile; +#endif - QFile luaScript(":/lua/edit.lua"); + QFile luaScript(":/lua/app.lua"); LuaEngineGui luaEngineGui; luaEngineGui.executeLuaScript(&luaScript); @@ -79,9 +83,6 @@ int main(int argc, char *argv[]) return 1; } } - else { - return 1; - } - return a.exec(); + return 1; } diff --git a/src/luaenginegui/luaengine/LuaEngineGui.cpp b/src/luaenginegui/luaengine/LuaEngineGui.cpp index a9dd2be..f8bbf38 100644 --- a/src/luaenginegui/luaengine/LuaEngineGui.cpp +++ b/src/luaenginegui/luaengine/LuaEngineGui.cpp @@ -173,7 +173,11 @@ int LuaEngineGui::showFileDialog(lua_State *L_p) } } QFileDialog fileDialog(parent); +#if QT_VERSION >= 0x050900 fileDialog.setWindowFlag(Qt::WindowContextHelpButtonHint, false); +#else + fileDialog.setWindowFlags(fileDialog.windowFlags()^Qt::WindowContextHelpButtonHint); +#endif fileDialog.setWindowTitle(dialogTitle); fileDialog.setAcceptMode(fileAcceptMode); fileDialog.setNameFilter(fileFormats); @@ -531,7 +535,11 @@ int LuaEngineGui::createDialog(lua_State *L_p) } } QDialog *dialog = new QDialog(parent); +#if QT_VERSION >= 0x050900 dialog->setWindowFlag(Qt::WindowContextHelpButtonHint, false); +#else + dialog->setWindowFlags(dialog->windowFlags()^Qt::WindowContextHelpButtonHint); +#endif dialog->setObjectName(nameForPointer(dialog)); dialog->setWindowTitle(windowTitle); pushPointer(L_p, dialog);