From 394139a14784678bbe3da5c8e2c1c443ba9ab8be Mon Sep 17 00:00:00 2001 From: Syping Date: Fri, 20 Sep 2019 03:24:32 +0200 Subject: [PATCH] change year to 2019 --- src/luaengine/luaengine/LuaEngine.cpp | 2 +- src/luaengine/luaengine/LuaEngine.h | 2 +- src/luaengine/luaengine/LuaEngine_global.h | 2 +- src/luaengineapp/luaenginestyle/LuaEngineStyle.h | 2 +- src/luaengineapp/main.cpp | 14 ++------------ src/luaenginegui/luaengine/LuaEngineGui.cpp | 6 +++--- src/luaenginegui/luaengine/LuaEngineGui.h | 2 +- src/luaenginegui/luaengine/LuaEngineGui_global.h | 2 +- src/luaenginegui/luaenginegui.pro | 2 +- src/src.pro | 2 +- 10 files changed, 13 insertions(+), 23 deletions(-) diff --git a/src/luaengine/luaengine/LuaEngine.cpp b/src/luaengine/luaengine/LuaEngine.cpp index 43dfef9..f8d1935 100644 --- a/src/luaengine/luaengine/LuaEngine.cpp +++ b/src/luaengine/luaengine/LuaEngine.cpp @@ -1,6 +1,6 @@ /***************************************************************************** * luaEngine Lua Engine for Qt -* Copyright (C) 2018 Syping +* Copyright (C) 2018-2019 Syping * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/luaengine/luaengine/LuaEngine.h b/src/luaengine/luaengine/LuaEngine.h index 99e28a5..8d1bc42 100644 --- a/src/luaengine/luaengine/LuaEngine.h +++ b/src/luaengine/luaengine/LuaEngine.h @@ -1,6 +1,6 @@ /***************************************************************************** * luaEngine Lua Engine for Qt -* Copyright (C) 2018 Syping +* Copyright (C) 2018-2019 Syping * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/luaengine/luaengine/LuaEngine_global.h b/src/luaengine/luaengine/LuaEngine_global.h index 02d8c98..7abc8b7 100644 --- a/src/luaengine/luaengine/LuaEngine_global.h +++ b/src/luaengine/luaengine/LuaEngine_global.h @@ -1,6 +1,6 @@ /***************************************************************************** * luaEngine Lua Engine for Qt -* Copyright (C) 2018 Syping +* Copyright (C) 2018-2019 Syping * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/luaengineapp/luaenginestyle/LuaEngineStyle.h b/src/luaengineapp/luaenginestyle/LuaEngineStyle.h index 194ca0c..674e8b7 100644 --- a/src/luaengineapp/luaenginestyle/LuaEngineStyle.h +++ b/src/luaengineapp/luaenginestyle/LuaEngineStyle.h @@ -1,6 +1,6 @@ /***************************************************************************** * luaEngine Lua Engine for Qt -* Copyright (C) 2015-2018 Syping +* Copyright (C) 2015-2019 Syping * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/luaengineapp/main.cpp b/src/luaengineapp/main.cpp index 2c65c6c..d7c0533 100644 --- a/src/luaengineapp/main.cpp +++ b/src/luaengineapp/main.cpp @@ -1,6 +1,6 @@ /***************************************************************************** * luaEngine Lua Engine for Qt -* Copyright (C) 2018 Syping +* Copyright (C) 2018-2019 Syping * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,10 +21,6 @@ #include #include -#ifdef Q_OS_WIN -#include "windows.h" -#endif - int main(int argc, char *argv[]) { QApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); @@ -37,13 +33,7 @@ int main(int argc, char *argv[]) #if QT_VERSION >= 0x050400 if (QSysInfo::windowsVersion() >= 0x0080) { - NONCLIENTMETRICS ncm; - ncm.cbSize = sizeof(ncm); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0); - LOGFONTW uiFont = ncm.lfMessageFont; - QString uiFontStr(QString::fromStdWString(std::wstring(uiFont.lfFaceName))); - QFont appFont(uiFontStr, 9); - a.setFont(appFont); + a.setFont(QApplication::font("QMenu")); } #endif #endif diff --git a/src/luaenginegui/luaengine/LuaEngineGui.cpp b/src/luaenginegui/luaengine/LuaEngineGui.cpp index b853371..4f75491 100644 --- a/src/luaenginegui/luaengine/LuaEngineGui.cpp +++ b/src/luaenginegui/luaengine/LuaEngineGui.cpp @@ -1,6 +1,6 @@ /***************************************************************************** * luaEngine Lua Engine for Qt -* Copyright (C) 2018 Syping +* Copyright (C) 2018-2019 Syping * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -147,7 +147,7 @@ int LuaEngineGui::showFileDialog(lua_State *L_p) QString dialogTitle = "LuaEngine"; QString fileFormats = "All files (*)"; QFileDialog::FileMode fileMode = QFileDialog::ExistingFile; - QFileDialog::Options fileOptions = QFileDialog::DontUseNativeDialog; + QFileDialog::Options fileOptions; QFileDialog::AcceptMode fileAcceptMode = QFileDialog::AcceptOpen; if (getArgumentCount(L_p) >= 1) { switch (getVariant(L_p, 1).toInt()) { @@ -157,7 +157,7 @@ int LuaEngineGui::showFileDialog(lua_State *L_p) break; case 2: fileMode = QFileDialog::Directory; - fileOptions = QFileDialog::ShowDirsOnly | QFileDialog::DontUseNativeDialog; + fileOptions = QFileDialog::ShowDirsOnly; break; } if (getArgumentCount(L_p) >= 2) { diff --git a/src/luaenginegui/luaengine/LuaEngineGui.h b/src/luaenginegui/luaengine/LuaEngineGui.h index c690ec0..dd6678c 100644 --- a/src/luaenginegui/luaengine/LuaEngineGui.h +++ b/src/luaenginegui/luaengine/LuaEngineGui.h @@ -1,6 +1,6 @@ /***************************************************************************** * luaEngine Lua Engine for Qt -* Copyright (C) 2018 Syping +* Copyright (C) 2018-2019 Syping * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/luaenginegui/luaengine/LuaEngineGui_global.h b/src/luaenginegui/luaengine/LuaEngineGui_global.h index e8d99a1..fcc552a 100644 --- a/src/luaenginegui/luaengine/LuaEngineGui_global.h +++ b/src/luaenginegui/luaengine/LuaEngineGui_global.h @@ -1,6 +1,6 @@ /***************************************************************************** * luaEngine Lua Engine for Qt -* Copyright (C) 2018 Syping +* Copyright (C) 2018-2019 Syping * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/luaenginegui/luaenginegui.pro b/src/luaenginegui/luaenginegui.pro index 02b5791..1cbd87c 100644 --- a/src/luaenginegui/luaenginegui.pro +++ b/src/luaenginegui/luaenginegui.pro @@ -1,6 +1,6 @@ #/***************************************************************************** #* luaEngine Lua Engine for Qt -#* Copyright (C) 2018 Syping +#* Copyright (C) 2018-2019 Syping #* #* Licensed under the Apache License, Version 2.0 (the "License"); #* you may not use this file except in compliance with the License. diff --git a/src/src.pro b/src/src.pro index 71e2dac..6e737e4 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,6 +1,6 @@ #/***************************************************************************** #* luaEngine Lua Engine for Qt -#* Copyright (C) 2018 Syping +#* Copyright (C) 2018-2019 Syping #* #* Licensed under the Apache License, Version 2.0 (the "License"); #* you may not use this file except in compliance with the License.