From f700b6a7018f5223a0c972ef22c8ffc1c48872b9 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 24 Oct 2017 13:15:13 +0200 Subject: TrayIcon use 'qtpass-tray' fixes #318 --- localization/localization_ar_MA.ts | 12 ++++++------ localization/localization_cs_CZ.ts | 12 ++++++------ localization/localization_de_DE.ts | 12 ++++++------ localization/localization_de_LU.ts | 12 ++++++------ localization/localization_el_GR.ts | 12 ++++++------ localization/localization_en_GB.ts | 12 ++++++------ localization/localization_en_US.ts | 12 ++++++------ localization/localization_es_ES.ts | 12 ++++++------ localization/localization_fr_BE.ts | 12 ++++++------ localization/localization_fr_FR.ts | 12 ++++++------ localization/localization_fr_LU.ts | 12 ++++++------ localization/localization_gl_ES.ts | 12 ++++++------ localization/localization_he_IL.ts | 12 ++++++------ localization/localization_hu_HU.ts | 12 ++++++------ localization/localization_it_IT.ts | 12 ++++++------ localization/localization_lb_LU.ts | 12 ++++++------ localization/localization_nl_BE.ts | 12 ++++++------ localization/localization_nl_NL.ts | 12 ++++++------ localization/localization_pl_PL.ts | 12 ++++++------ localization/localization_pt_PT.ts | 12 ++++++------ localization/localization_ru_RU.ts | 12 ++++++------ localization/localization_sv_SE.ts | 12 ++++++------ localization/localization_zh_CN.ts | 12 ++++++------ qtpass.pri | 4 ++-- src/trayicon.cpp | 3 ++- 25 files changed, 142 insertions(+), 141 deletions(-) diff --git a/localization/localization_ar_MA.ts b/localization/localization_ar_MA.ts index 1303e9f8..5a7d9aed 100644 --- a/localization/localization_ar_MA.ts +++ b/localization/localization_ar_MA.ts @@ -876,32 +876,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit diff --git a/localization/localization_cs_CZ.ts b/localization/localization_cs_CZ.ts index 5d9b6a13..5011aa05 100644 --- a/localization/localization_cs_CZ.ts +++ b/localization/localization_cs_CZ.ts @@ -913,32 +913,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show Z&obrazit - + &Hide &Skrýt - + Mi&nimize Mi&nimalizovat - + Ma&ximize Ma&ximalizovat - + &Restore Obno&vit - + &Quit Ukonči&t diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts index 372e673f..3b179241 100755 --- a/localization/localization_de_DE.ts +++ b/localization/localization_de_DE.ts @@ -899,32 +899,32 @@ Neues Passwort-Datei: TrayIcon - + &Show &Anzeigen - + &Hide &Verstecken - + Mi&nimize M&inimieren - + Ma&ximize M&aximieren - + &Restore &Wiederherstellen - + &Quit &Schließen diff --git a/localization/localization_de_LU.ts b/localization/localization_de_LU.ts index 7d6815c8..48a17908 100755 --- a/localization/localization_de_LU.ts +++ b/localization/localization_de_LU.ts @@ -898,32 +898,32 @@ Neues Passwort-Datei: TrayIcon - + &Show &Anzeigen - + &Hide &Verstecken - + Mi&nimize M&inimieren - + Ma&ximize M&aximieren - + &Restore &Wiederherstellen - + &Quit diff --git a/localization/localization_el_GR.ts b/localization/localization_el_GR.ts index a63eb0bc..1bc727bb 100644 --- a/localization/localization_el_GR.ts +++ b/localization/localization_el_GR.ts @@ -875,32 +875,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit diff --git a/localization/localization_en_GB.ts b/localization/localization_en_GB.ts index aba3ef73..5c9a9b13 100644 --- a/localization/localization_en_GB.ts +++ b/localization/localization_en_GB.ts @@ -913,32 +913,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit &Quit diff --git a/localization/localization_en_US.ts b/localization/localization_en_US.ts index 41c02d0d..00643129 100644 --- a/localization/localization_en_US.ts +++ b/localization/localization_en_US.ts @@ -913,32 +913,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit &Quit diff --git a/localization/localization_es_ES.ts b/localization/localization_es_ES.ts index c8c9fd1c..c8e3b283 100644 --- a/localization/localization_es_ES.ts +++ b/localization/localization_es_ES.ts @@ -888,32 +888,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit &Salir diff --git a/localization/localization_fr_BE.ts b/localization/localization_fr_BE.ts index 3ff6ebba..36651548 100644 --- a/localization/localization_fr_BE.ts +++ b/localization/localization_fr_BE.ts @@ -913,32 +913,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit &Quitter diff --git a/localization/localization_fr_FR.ts b/localization/localization_fr_FR.ts index 98a91c3a..cbde8821 100644 --- a/localization/localization_fr_FR.ts +++ b/localization/localization_fr_FR.ts @@ -920,32 +920,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show &Afficher - + &Hide &Cacher - + Mi&nimize &Minimiser - + Ma&ximize Ma&ximiser - + &Restore &Restorer - + &Quit &Quitter diff --git a/localization/localization_fr_LU.ts b/localization/localization_fr_LU.ts index 346de50d..27857325 100644 --- a/localization/localization_fr_LU.ts +++ b/localization/localization_fr_LU.ts @@ -913,32 +913,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit &Quitter diff --git a/localization/localization_gl_ES.ts b/localization/localization_gl_ES.ts index c1c1860e..32f8f347 100644 --- a/localization/localization_gl_ES.ts +++ b/localization/localization_gl_ES.ts @@ -986,32 +986,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit diff --git a/localization/localization_he_IL.ts b/localization/localization_he_IL.ts index 069f5b49..a1ca3fae 100644 --- a/localization/localization_he_IL.ts +++ b/localization/localization_he_IL.ts @@ -876,32 +876,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit diff --git a/localization/localization_hu_HU.ts b/localization/localization_hu_HU.ts index ae2d3ded..1523974e 100644 --- a/localization/localization_hu_HU.ts +++ b/localization/localization_hu_HU.ts @@ -875,32 +875,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit diff --git a/localization/localization_it_IT.ts b/localization/localization_it_IT.ts index 08f48466..3f155c27 100644 --- a/localization/localization_it_IT.ts +++ b/localization/localization_it_IT.ts @@ -894,32 +894,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show Mo&stra - + &Hide &Nascondi - + Mi&nimize &Minimizza - + Ma&ximize Massimiz&za - + &Restore &Ripristina - + &Quit &Esci diff --git a/localization/localization_lb_LU.ts b/localization/localization_lb_LU.ts index 867e0e43..452adbc2 100644 --- a/localization/localization_lb_LU.ts +++ b/localization/localization_lb_LU.ts @@ -875,32 +875,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit diff --git a/localization/localization_nl_BE.ts b/localization/localization_nl_BE.ts index 18fb4b26..3689baad 100644 --- a/localization/localization_nl_BE.ts +++ b/localization/localization_nl_BE.ts @@ -913,32 +913,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show &Tonen - + &Hide &Verbergen - + Mi&nimize M&inimaliseren - + Ma&ximize M&aximaliseren - + &Restore &Herstellen - + &Quit &Afsluiten diff --git a/localization/localization_nl_NL.ts b/localization/localization_nl_NL.ts index 1dd072c0..dd309e8c 100644 --- a/localization/localization_nl_NL.ts +++ b/localization/localization_nl_NL.ts @@ -913,32 +913,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show &Tonen - + &Hide &Verbergen - + Mi&nimize M&inimaliseren - + Ma&ximize M&aximaliseren - + &Restore &Herstellen - + &Quit &Afsluiten diff --git a/localization/localization_pl_PL.ts b/localization/localization_pl_PL.ts index 1500fc8d..911cc7c0 100644 --- a/localization/localization_pl_PL.ts +++ b/localization/localization_pl_PL.ts @@ -875,32 +875,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit diff --git a/localization/localization_pt_PT.ts b/localization/localization_pt_PT.ts index 9a4511fe..273b47ff 100644 --- a/localization/localization_pt_PT.ts +++ b/localization/localization_pt_PT.ts @@ -884,32 +884,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show Mostrar - + &Hide Ocultar - + Mi&nimize Minimizar - + Ma&ximize Maximizar - + &Restore Restaurar - + &Quit Sair diff --git a/localization/localization_ru_RU.ts b/localization/localization_ru_RU.ts index b2ca56f4..80a4e9df 100644 --- a/localization/localization_ru_RU.ts +++ b/localization/localization_ru_RU.ts @@ -912,32 +912,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit &Выйти diff --git a/localization/localization_sv_SE.ts b/localization/localization_sv_SE.ts index 80947918..eca8b5a8 100644 --- a/localization/localization_sv_SE.ts +++ b/localization/localization_sv_SE.ts @@ -889,32 +889,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show - + &Hide - + Mi&nimize - + Ma&ximize - + &Restore - + &Quit &Avsluta diff --git a/localization/localization_zh_CN.ts b/localization/localization_zh_CN.ts index f80e7db9..d50fe9f1 100644 --- a/localization/localization_zh_CN.ts +++ b/localization/localization_zh_CN.ts @@ -912,32 +912,32 @@ p, li { white-space: pre-wrap; } TrayIcon - + &Show 显示 (&S) - + &Hide 隐藏 (&H) - + Mi&nimize 最小化 (&N) - + Ma&ximize 最大化 (&X) - + &Restore 恢复 (&R) - + &Quit 退出 (&Q) diff --git a/qtpass.pri b/qtpass.pri index b6568524..d25f20a9 100644 --- a/qtpass.pri +++ b/qtpass.pri @@ -64,7 +64,7 @@ isEmpty(QMAKE_LUPDATE) { } win32 { - RC_FILE = ../windows.rc + RC_FILE = windows.rc static { QMAKE_LFLAGS += -static-libgcc -static-libstdc++ } @@ -73,7 +73,7 @@ win32 { LIBS += -lmpr -lbcrypt } else:macx { ICON = ../artwork/icon.icns - QMAKE_INFO_PLIST = ../qtpass.plist + QMAKE_INFO_PLIST = $$(PWD)/qtpass.plist } else:bsd { LIBS += -L/usr/local/lib } diff --git a/src/trayicon.cpp b/src/trayicon.cpp index 7e89a82d..34f9cb4c 100644 --- a/src/trayicon.cpp +++ b/src/trayicon.cpp @@ -11,7 +11,8 @@ TrayIcon::TrayIcon(QMainWindow *parent) { createActions(); createTrayIcon(); - sysTrayIcon->setIcon(QIcon(":/artwork/icon.png")); + sysTrayIcon->setIcon( + QIcon::fromTheme("qtpass-tray", QIcon(":/artwork/icon.png"))); sysTrayIcon->show(); -- cgit v1.2.3