From ea97b59e283ad03a2ebf77fa07edf61b8f994d76 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 25 Mar 2021 18:25:45 +0300 Subject: [PATCH] [win] refactoring --- ...indicator_2x.png => menu-indicator@2x.png} | Bin win-linux/res/styles/styles.qss | 18 +++++++++--------- win-linux/res/styles/styles@2x.qss | 12 ++++++------ win-linux/resources.qrc | 2 +- win-linux/src/cfiledialog.cpp | 18 ++++++++++-------- 5 files changed, 26 insertions(+), 24 deletions(-) rename win-linux/res/icons/{menu-indicator_2x.png => menu-indicator@2x.png} (100%) diff --git a/win-linux/res/icons/menu-indicator_2x.png b/win-linux/res/icons/menu-indicator@2x.png similarity index 100% rename from win-linux/res/icons/menu-indicator_2x.png rename to win-linux/res/icons/menu-indicator@2x.png diff --git a/win-linux/res/styles/styles.qss b/win-linux/res/styles/styles.qss index e64446968..e8582ac3a 100644 --- a/win-linux/res/styles/styles.qss +++ b/win-linux/res/styles/styles.qss @@ -162,17 +162,17 @@ QPushButton::menu-indicator:hover { border-image: url(:/res/icons/menu-indicator.png) 0 10 0 0 repeat repeat; } -QPushButton[theme=dark]::menu-indicator { - border-image: url(:/res/icons/menu-indicator-dark.png) 0 0 0 0 repeat repeat; -} +/*QPushButton[theme=dark]::menu-indicator {*/ + /*border-image: url(:/res/icons/menu-indicator-dark.png) 0 0 0 0 repeat repeat;*/ +/*}*/ -QPushButton[theme=dark]::menu-indicator:disabled { - border-image: url(:/res/icons/menu-indicator-dark.png) 0 0 0 10 repeat repeat; -} +/*QPushButton[theme=dark]::menu-indicator:disabled {*/ + /*border-image: url(:/res/icons/menu-indicator-dark.png) 0 0 0 10 repeat repeat;*/ +/*}*/ -QPushButton[theme=dark]::menu-indicator:hover { - border-image: url(:/res/icons/menu-indicator-dark.png) 0 10 0 0 repeat repeat; -} +/*QPushButton[theme=dark]::menu-indicator:hover {*/ + /*border-image: url(:/res/icons/menu-indicator-dark.png) 0 10 0 0 repeat repeat;*/ +/*}*/ QPushButton#toolButtonDownload { /*background-repeat: no-repeat;*/ diff --git a/win-linux/res/styles/styles@2x.qss b/win-linux/res/styles/styles@2x.qss index d308d0ab1..31d73db6a 100644 --- a/win-linux/res/styles/styles@2x.qss +++ b/win-linux/res/styles/styles@2x.qss @@ -53,13 +53,13 @@ QPushButton::menu-indicator:hover { border-image: url(:/menu-indicator_2x.png) 0 20 0 0 repeat repeat; } -QPushButton[theme=dark]::menu-indicator:disabled { - border-image: url(:/res/icons/menu-indicator-dark.png) 0 0 0 20 repeat repeat; -} +/*QPushButton[theme=dark]::menu-indicator:disabled {*/ + /*border-image: url(:/res/icons/menu-indicator-dark.png) 0 0 0 20 repeat repeat;*/ +/*}*/ -QPushButton[theme=dark]::menu-indicator:hover { - border-image: url(:/res/icons/menu-indicator-dark.png) 0 20 0 0 repeat repeat; -} +/*QPushButton[theme=dark]::menu-indicator:hover {*/ + /*border-image: url(:/res/icons/menu-indicator-dark.png) 0 20 0 0 repeat repeat;*/ +/*}*/ QPushButton#toolButtonDownload::menu-indicator { top: -20px; diff --git a/win-linux/resources.qrc b/win-linux/resources.qrc index 6c272e2f5..4abdb03ef 100644 --- a/win-linux/resources.qrc +++ b/win-linux/resources.qrc @@ -19,7 +19,7 @@ res/icons/menu-indicator.png res/icons/menu-indicator-dark.png res/icons/menu-indicator@1.5x.png - res/icons/menu-indicator_2x.png + res/icons/menu-indicator@2x.png res/icons/radiobox.png res/icons/radiobox@2x.png res/icons/checkbox.png diff --git a/win-linux/src/cfiledialog.cpp b/win-linux/src/cfiledialog.cpp index d7aa81264..b91d966b9 100644 --- a/win-linux/src/cfiledialog.cpp +++ b/win-linux/src/cfiledialog.cpp @@ -46,13 +46,15 @@ #ifdef Q_OS_WIN # include +# include #endif #include using namespace std; #ifdef Q_OS_WIN -static DWORD win_ver_major{0}; +//static DWORD win_ver_major{0}; +static const int win_ver_major = QOperatingSystemVersion::current().majorVersion(); using VectorShellItems = vector; auto itemsFromItemArray(IShellItemArray * items) @@ -416,15 +418,15 @@ QStringList CFileDialogWrapper::modalOpen(const QString& path, const QString& fi args.multiSelect = multi; args.folder = path.toStdWString(); - if ( win_ver_major == 0 ) { - OSVERSIONINFO osvi; +// if ( win_ver_major == 0 ) { +// OSVERSIONINFO osvi; - ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); +// ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); +// osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&osvi); - win_ver_major = osvi.dwMajorVersion; - } +// GetVersionEx(&osvi); +// win_ver_major = osvi.dwMajorVersion; +// } // Win XP doesn't support IFileOpenDialog if ( win_ver_major > 5 ) {