diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp index 6824d56f0..b04b41042 100644 --- a/src/apps/deskflow-gui/MainWindow.cpp +++ b/src/apps/deskflow-gui/MainWindow.cpp @@ -983,17 +983,11 @@ void MainWindow::showConfigureServer(const QString &message) void MainWindow::secureSocket(bool secureSocket) { m_SecureSocket = secureSocket; + const auto txt = secureSocket ? tr("Secure Connection") : tr("Insecure Connection"); ui->lblConnectionSecurityStatus->setToolTip(txt); -// mac os will try to use the 16x16 low detail icon when we use the theme name -// because of this we manually select the 64x64 icon from our packed in set -#ifdef Q_OS_MAC - const auto icon = QIcon(QStringLiteral(":/icons/deskflow-%1/status/64/security-%2") - .arg(iconMode(), secureSocket ? QStringLiteral("high") : QStringLiteral("low"))); -#else const auto icon = QIcon::fromTheme(secureSocket ? QIcon::ThemeIcon::SecurityHigh : QIcon::ThemeIcon::SecurityLow); -#endif ui->lblConnectionSecurityStatus->setPixmap(icon.pixmap(QSize(32, 32))); } diff --git a/src/apps/res/deskflow.qrc b/src/apps/res/deskflow.qrc index d71721fb7..aee85a38e 100644 --- a/src/apps/res/deskflow.qrc +++ b/src/apps/res/deskflow.qrc @@ -41,15 +41,6 @@ icons/deskflow-dark/apps/64/deskflow-symbolic.svg icons/deskflow-dark/devices/64/video-display.svg icons/deskflow-dark/places/64/user-trash.svg - icons/deskflow-dark/status/16/security-high.svg - icons/deskflow-dark/status/16/security-low.svg - icons/deskflow-dark/status/16/security-medium.svg - icons/deskflow-dark/status/22/security-high.svg - icons/deskflow-dark/status/22/security-low.svg - icons/deskflow-dark/status/22/security-medium.svg - icons/deskflow-dark/status/24/security-high.svg - icons/deskflow-dark/status/24/security-low.svg - icons/deskflow-dark/status/24/security-medium.svg icons/deskflow-dark/status/64/dialog-error.svg icons/deskflow-dark/status/64/dialog-information.svg icons/deskflow-dark/status/64/dialog-positive.svg @@ -101,15 +92,6 @@ icons/deskflow-light/apps/64/deskflow.svg icons/deskflow-light/apps/64/deskflow-symbolic.svg icons/deskflow-light/devices/64/video-display.svg - icons/deskflow-light/status/16/security-high.svg - icons/deskflow-light/status/16/security-low.svg - icons/deskflow-light/status/16/security-medium.svg - icons/deskflow-light/status/22/security-high.svg - icons/deskflow-light/status/22/security-low.svg - icons/deskflow-light/status/22/security-medium.svg - icons/deskflow-light/status/24/security-high.svg - icons/deskflow-light/status/24/security-low.svg - icons/deskflow-light/status/24/security-medium.svg icons/deskflow-light/status/64/dialog-error.svg icons/deskflow-light/status/64/dialog-information.svg icons/deskflow-light/status/64/dialog-positive.svg diff --git a/src/apps/res/icons/deskflow-dark/index.theme b/src/apps/res/icons/deskflow-dark/index.theme index f42cc175a..9846a28c5 100644 --- a/src/apps/res/icons/deskflow-dark/index.theme +++ b/src/apps/res/icons/deskflow-dark/index.theme @@ -30,7 +30,7 @@ KDE-Extensions=.svg ########## ordered by category and alphabetically Directories=actions/16,actions/22,actions/24,actions/32,apps/64,devices/64,places/64,status/16,status/22,status,24,status/64 -ScaledDirectories=actions/16@2x,actions/16@3x,actions/22@2x,actions/22@3x,actions/24@2x,actions/24@3x,actions/32@2x,actions/32@3x,status/16@2x,status/22@2x,status,24@2x,status/16@3x,status/22@3x,status,24@3x +ScaledDirectories=actions/16@2x,actions/16@3x,actions/22@2x,actions/22@3x,actions/24@2x,actions/24@3x,actions/32@2x,actions/32@3x [apps/64] Size=64 @@ -148,7 +148,6 @@ Type=Scalable MinSize=16 MaxSize=256 - #64x64 - Fixed size - For folder icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Color [places/64] Size=64 @@ -157,88 +156,6 @@ Context=Places MinSize=48 MaxSize=256 -########## Status -########## ordered by size - -#16x16 - Fixed size - For toolbar icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/16] -Size=16 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#16x16@2x - Fixed size - For toolbar icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/16@2x] -Size=16 -Scale=2 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#16x16@3x - Fixed size - For toolbar icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/16@3x] -Size=16 -Scale=3 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - - -#22x22 - Fixed size - For toolbar icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/22] -Size=22 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#22x22@2x - Fixed size - For toolbar icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/22@2x] -Size=22 -Scale=2 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#22x22@3x - Fixed size - For toolbar icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/22@3x] -Size=22 -Scale=3 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#24x24 - Fixed size - GTK icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/24] -Size=24 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#24x24@2x - Fixed size - GTK icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/24@2x] -Size=24 -Scale=2 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#24x24@3x - Fixed size - GTK icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/24@3x] -Size=24 -Scale=3 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - #64x64 - Fixed size - For dialog icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Color [status/64] Size=64 diff --git a/src/apps/res/icons/deskflow-dark/status/16/security-high.svg b/src/apps/res/icons/deskflow-dark/status/16/security-high.svg deleted file mode 100644 index e51498dff..000000000 --- a/src/apps/res/icons/deskflow-dark/status/16/security-high.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/apps/res/icons/deskflow-dark/status/16/security-low.svg b/src/apps/res/icons/deskflow-dark/status/16/security-low.svg deleted file mode 100644 index 84a954729..000000000 --- a/src/apps/res/icons/deskflow-dark/status/16/security-low.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/apps/res/icons/deskflow-dark/status/16/security-medium.svg b/src/apps/res/icons/deskflow-dark/status/16/security-medium.svg deleted file mode 100644 index d4ecc86ae..000000000 --- a/src/apps/res/icons/deskflow-dark/status/16/security-medium.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/apps/res/icons/deskflow-dark/status/16@2x b/src/apps/res/icons/deskflow-dark/status/16@2x deleted file mode 120000 index 19c7bdba7..000000000 --- a/src/apps/res/icons/deskflow-dark/status/16@2x +++ /dev/null @@ -1 +0,0 @@ -16 \ No newline at end of file diff --git a/src/apps/res/icons/deskflow-dark/status/16@3x b/src/apps/res/icons/deskflow-dark/status/16@3x deleted file mode 120000 index 19c7bdba7..000000000 --- a/src/apps/res/icons/deskflow-dark/status/16@3x +++ /dev/null @@ -1 +0,0 @@ -16 \ No newline at end of file diff --git a/src/apps/res/icons/deskflow-dark/status/22/security-high.svg b/src/apps/res/icons/deskflow-dark/status/22/security-high.svg deleted file mode 100644 index 621769833..000000000 --- a/src/apps/res/icons/deskflow-dark/status/22/security-high.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/apps/res/icons/deskflow-dark/status/22/security-low.svg b/src/apps/res/icons/deskflow-dark/status/22/security-low.svg deleted file mode 100644 index 0fdf9dfa9..000000000 --- a/src/apps/res/icons/deskflow-dark/status/22/security-low.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/apps/res/icons/deskflow-dark/status/22/security-medium.svg b/src/apps/res/icons/deskflow-dark/status/22/security-medium.svg deleted file mode 100644 index 40b44711f..000000000 --- a/src/apps/res/icons/deskflow-dark/status/22/security-medium.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/apps/res/icons/deskflow-dark/status/22@2x b/src/apps/res/icons/deskflow-dark/status/22@2x deleted file mode 120000 index 8fdd954df..000000000 --- a/src/apps/res/icons/deskflow-dark/status/22@2x +++ /dev/null @@ -1 +0,0 @@ -22 \ No newline at end of file diff --git a/src/apps/res/icons/deskflow-dark/status/22@3x b/src/apps/res/icons/deskflow-dark/status/22@3x deleted file mode 120000 index 8fdd954df..000000000 --- a/src/apps/res/icons/deskflow-dark/status/22@3x +++ /dev/null @@ -1 +0,0 @@ -22 \ No newline at end of file diff --git a/src/apps/res/icons/deskflow-dark/status/24/security-high.svg b/src/apps/res/icons/deskflow-dark/status/24/security-high.svg deleted file mode 100644 index 5c155ab37..000000000 --- a/src/apps/res/icons/deskflow-dark/status/24/security-high.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/apps/res/icons/deskflow-dark/status/24/security-low.svg b/src/apps/res/icons/deskflow-dark/status/24/security-low.svg deleted file mode 100644 index 93cc255cc..000000000 --- a/src/apps/res/icons/deskflow-dark/status/24/security-low.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/apps/res/icons/deskflow-dark/status/24/security-medium.svg b/src/apps/res/icons/deskflow-dark/status/24/security-medium.svg deleted file mode 100644 index 55c117f61..000000000 --- a/src/apps/res/icons/deskflow-dark/status/24/security-medium.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/apps/res/icons/deskflow-dark/status/24@2x b/src/apps/res/icons/deskflow-dark/status/24@2x deleted file mode 120000 index cabf43b5d..000000000 --- a/src/apps/res/icons/deskflow-dark/status/24@2x +++ /dev/null @@ -1 +0,0 @@ -24 \ No newline at end of file diff --git a/src/apps/res/icons/deskflow-dark/status/24@3x b/src/apps/res/icons/deskflow-dark/status/24@3x deleted file mode 120000 index cabf43b5d..000000000 --- a/src/apps/res/icons/deskflow-dark/status/24@3x +++ /dev/null @@ -1 +0,0 @@ -24 \ No newline at end of file diff --git a/src/apps/res/icons/deskflow-light/index.theme b/src/apps/res/icons/deskflow-light/index.theme index b917ed70c..54af1ce2b 100644 --- a/src/apps/res/icons/deskflow-light/index.theme +++ b/src/apps/res/icons/deskflow-light/index.theme @@ -30,7 +30,7 @@ KDE-Extensions=.svg ########## ordered by category and alphabetically Directories=actions/16,actions/22,actions/24,actions/32,apps/64,devices/64,places/64,status/16,status/22,status,24,status/64 -ScaledDirectories=actions/16@2x,actions/16@3x,actions/22@2x,actions/22@3x,actions/24@2x,actions/24@3x,actions/32@2x,actions/32@3x,status/16@2x,status/22@2x,status,24@2x,status/16@3x,status/22@3x,status,24@3x +ScaledDirectories=actions/16@2x,actions/16@3x,actions/22@2x,actions/22@3x,actions/24@2x,actions/24@3x,actions/32@2x,actions/32@3x [apps/64] Size=64 @@ -157,88 +157,6 @@ Context=Places MinSize=48 MaxSize=256 -########## Status -########## ordered by size - -#16x16 - Fixed size - For toolbar icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/16] -Size=16 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#16x16@2x - Fixed size - For toolbar icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/16@2x] -Size=16 -Scale=2 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#16x16@3x - Fixed size - For toolbar icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/16@3x] -Size=16 -Scale=3 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - - -#22x22 - Fixed size - For toolbar icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/22] -Size=22 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#22x22@2x - Fixed size - For toolbar icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/22@2x] -Size=22 -Scale=2 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#22x22@3x - Fixed size - For toolbar icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/22@3x] -Size=22 -Scale=3 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#24x24 - Fixed size - GTK icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/24] -Size=24 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#24x24@2x - Fixed size - GTK icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/24@2x] -Size=24 -Scale=2 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - -#24x24@3x - Fixed size - GTK icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Monochrome -[status/24@3x] -Size=24 -Scale=3 -Context=Status -Type=Scalable -MinSize=16 -MaxSize=256 - #64x64 - Fixed size - For dialog icons >!!!ONLY!!!< - DO_NOT_USE_ANYWHERE_ELSE - Color [status/64] Size=64 diff --git a/src/apps/res/icons/deskflow-light/status/16/security-high.svg b/src/apps/res/icons/deskflow-light/status/16/security-high.svg deleted file mode 100644 index c63b2753f..000000000 --- a/src/apps/res/icons/deskflow-light/status/16/security-high.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/src/apps/res/icons/deskflow-light/status/16/security-low.svg b/src/apps/res/icons/deskflow-light/status/16/security-low.svg deleted file mode 100644 index 53ea58f59..000000000 --- a/src/apps/res/icons/deskflow-light/status/16/security-low.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/src/apps/res/icons/deskflow-light/status/16/security-medium.svg b/src/apps/res/icons/deskflow-light/status/16/security-medium.svg deleted file mode 100644 index 9c0379060..000000000 --- a/src/apps/res/icons/deskflow-light/status/16/security-medium.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/src/apps/res/icons/deskflow-light/status/16@2x b/src/apps/res/icons/deskflow-light/status/16@2x deleted file mode 120000 index 19c7bdba7..000000000 --- a/src/apps/res/icons/deskflow-light/status/16@2x +++ /dev/null @@ -1 +0,0 @@ -16 \ No newline at end of file diff --git a/src/apps/res/icons/deskflow-light/status/16@3x b/src/apps/res/icons/deskflow-light/status/16@3x deleted file mode 120000 index 19c7bdba7..000000000 --- a/src/apps/res/icons/deskflow-light/status/16@3x +++ /dev/null @@ -1 +0,0 @@ -16 \ No newline at end of file diff --git a/src/apps/res/icons/deskflow-light/status/22/security-high.svg b/src/apps/res/icons/deskflow-light/status/22/security-high.svg deleted file mode 100644 index ef1c564b0..000000000 --- a/src/apps/res/icons/deskflow-light/status/22/security-high.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - diff --git a/src/apps/res/icons/deskflow-light/status/22/security-low.svg b/src/apps/res/icons/deskflow-light/status/22/security-low.svg deleted file mode 100644 index 7fbaf2a1f..000000000 --- a/src/apps/res/icons/deskflow-light/status/22/security-low.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - diff --git a/src/apps/res/icons/deskflow-light/status/22/security-medium.svg b/src/apps/res/icons/deskflow-light/status/22/security-medium.svg deleted file mode 100644 index 9b1d91a36..000000000 --- a/src/apps/res/icons/deskflow-light/status/22/security-medium.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - diff --git a/src/apps/res/icons/deskflow-light/status/22@2x b/src/apps/res/icons/deskflow-light/status/22@2x deleted file mode 120000 index 8fdd954df..000000000 --- a/src/apps/res/icons/deskflow-light/status/22@2x +++ /dev/null @@ -1 +0,0 @@ -22 \ No newline at end of file diff --git a/src/apps/res/icons/deskflow-light/status/22@3x b/src/apps/res/icons/deskflow-light/status/22@3x deleted file mode 120000 index 8fdd954df..000000000 --- a/src/apps/res/icons/deskflow-light/status/22@3x +++ /dev/null @@ -1 +0,0 @@ -22 \ No newline at end of file diff --git a/src/apps/res/icons/deskflow-light/status/24/security-high.svg b/src/apps/res/icons/deskflow-light/status/24/security-high.svg deleted file mode 100644 index 489aa1e93..000000000 --- a/src/apps/res/icons/deskflow-light/status/24/security-high.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - diff --git a/src/apps/res/icons/deskflow-light/status/24/security-low.svg b/src/apps/res/icons/deskflow-light/status/24/security-low.svg deleted file mode 100644 index 51d3b9f8c..000000000 --- a/src/apps/res/icons/deskflow-light/status/24/security-low.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - diff --git a/src/apps/res/icons/deskflow-light/status/24/security-medium.svg b/src/apps/res/icons/deskflow-light/status/24/security-medium.svg deleted file mode 100644 index 1c27654fd..000000000 --- a/src/apps/res/icons/deskflow-light/status/24/security-medium.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - diff --git a/src/apps/res/icons/deskflow-light/status/24@2x b/src/apps/res/icons/deskflow-light/status/24@2x deleted file mode 120000 index cabf43b5d..000000000 --- a/src/apps/res/icons/deskflow-light/status/24@2x +++ /dev/null @@ -1 +0,0 @@ -24 \ No newline at end of file diff --git a/src/apps/res/icons/deskflow-light/status/24@3x b/src/apps/res/icons/deskflow-light/status/24@3x deleted file mode 120000 index cabf43b5d..000000000 --- a/src/apps/res/icons/deskflow-light/status/24@3x +++ /dev/null @@ -1 +0,0 @@ -24 \ No newline at end of file