From c4a72db87dc5eefffaa65f6be34025e434f2c5b9 Mon Sep 17 00:00:00 2001 From: Christian Pfaab Date: Tue, 5 Aug 2014 00:50:24 +0200 Subject: Beginning of German translation --- localization/localization_de_DE.ts | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts index 920f3ed4..2ea75f70 100644 --- a/localization/localization_de_DE.ts +++ b/localization/localization_de_DE.ts @@ -6,12 +6,12 @@ Configuration - + Einstellungen Pass - + Pass @@ -24,57 +24,57 @@ Executable pass - + Ausführbares pass Native - + Nativ Executable git - + Ausführbares git Executable gpg - + Ausführbares gpg Native git/gpg - + Systemeigenes git/gpg Use pass - + Pass benutzen Other - + Weiteres Folder password-store - + Ordner für Passwortspeicher Clipboard - + Zwischenablage Autoclear - + Automatisch löschen Seconds - + Sekunden @@ -82,32 +82,32 @@ QtPass - + QtPass Update - + Aktualisieren Config - + Einstellungen qtpass - + qtpass Clipboard cleared - + Zwischenablage gelöscht Password copied to clipboard - + Passwort in Zwischenablage kopiert -- cgit v1.2.3 From b3bed5ed55bfe4e31c9e5aaf32ac133cea1a2dbd Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 5 Aug 2014 00:53:01 +0200 Subject: icons and such --- artwork/icon.icns | Bin 0 -> 145275 bytes artwork/icon.ico | Bin 0 -> 370070 bytes artwork/icon.svg | 39 +++++++++++++++++++++++++++++++++++++++ qtpass.pro | 4 ++++ windows.rc | 1 + 5 files changed, 44 insertions(+) create mode 100644 artwork/icon.icns create mode 100644 artwork/icon.ico create mode 100644 artwork/icon.svg create mode 100644 windows.rc diff --git a/artwork/icon.icns b/artwork/icon.icns new file mode 100644 index 00000000..20b73e75 Binary files /dev/null and b/artwork/icon.icns differ diff --git a/artwork/icon.ico b/artwork/icon.ico new file mode 100644 index 00000000..d2f175f9 Binary files /dev/null and b/artwork/icon.ico differ diff --git a/artwork/icon.svg b/artwork/icon.svg new file mode 100644 index 00000000..ab51641f --- /dev/null +++ b/artwork/icon.svg @@ -0,0 +1,39 @@ + + +Padlocked heart. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qtpass.pro b/qtpass.pro index f9b6756a..0cd17e92 100644 --- a/qtpass.pro +++ b/qtpass.pro @@ -28,3 +28,7 @@ TRANSLATIONS += localization/localization_nl_NL.ts \ RESOURCES += resources.qrc TRANSLATIONS += localization/localization_nl_NL.ts + +RC_FILE = windows.rc + +ICON = artwork/icon.icns diff --git a/windows.rc b/windows.rc new file mode 100644 index 00000000..2ee351e9 --- /dev/null +++ b/windows.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "artwork/icon.ico" -- cgit v1.2.3 From 7ef40a486dc0a1870bcb8daca12046bc0c063764 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 5 Aug 2014 01:02:24 +0200 Subject: updated binary translation and removed crappy double dutch --- localization/localization_de_DE.qm | Bin 23 -> 1482 bytes qtpass.pro | 2 -- 2 files changed, 2 deletions(-) diff --git a/localization/localization_de_DE.qm b/localization/localization_de_DE.qm index 9dad8dff..dfee88af 100644 Binary files a/localization/localization_de_DE.qm and b/localization/localization_de_DE.qm differ diff --git a/qtpass.pro b/qtpass.pro index f9b6756a..d5194ef0 100644 --- a/qtpass.pro +++ b/qtpass.pro @@ -26,5 +26,3 @@ TRANSLATIONS += localization/localization_nl_NL.ts \ localization/localization_hu_HU.ts RESOURCES += resources.qrc - -TRANSLATIONS += localization/localization_nl_NL.ts -- cgit v1.2.3 From 70ebd7cf69a14f6dd32dbafae21f905582f53be7 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 5 Aug 2014 01:03:25 +0200 Subject: added png --- artwork/icon.png | Bin 0 -> 48509 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100755 artwork/icon.png diff --git a/artwork/icon.png b/artwork/icon.png new file mode 100755 index 00000000..af3eca39 Binary files /dev/null and b/artwork/icon.png differ -- cgit v1.2.3 From 49412ed444fd8a6b5c6ee36aa302a7213685895b Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 5 Aug 2014 01:17:29 +0200 Subject: adding more --- main.cpp | 2 ++ qtpass.pro | 3 ++- resources.qrc | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 0f8a869b..c6ca0cd6 100644 --- a/main.cpp +++ b/main.cpp @@ -14,6 +14,8 @@ int main(int argc, char *argv[]) MainWindow w; + app.setWindowIcon(QIcon(":artwork/icon.png")); + w.checkConfig(); w.show(); diff --git a/qtpass.pro b/qtpass.pro index 0cd17e92..03e29230 100644 --- a/qtpass.pro +++ b/qtpass.pro @@ -31,4 +31,5 @@ TRANSLATIONS += localization/localization_nl_NL.ts RC_FILE = windows.rc -ICON = artwork/icon.icns +ICON += artwork/icon.svg \ + artwork/icon.icns diff --git a/resources.qrc b/resources.qrc index 6a04153f..d44f279e 100644 --- a/resources.qrc +++ b/resources.qrc @@ -6,5 +6,9 @@ localization/localization_hu_HU.ts localization/localization_nl_NL.qm localization/localization_nl_NL.ts + artwork/icon.icns + artwork/icon.ico + artwork/icon.png + artwork/icon.svg -- cgit v1.2.3 From 020cf0d30e788f0f66008bed56506162ca625dc3 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 5 Aug 2014 01:37:32 +0200 Subject: conditionales --- main.cpp | 6 +++++- qtpass.pro | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/main.cpp b/main.cpp index c6ca0cd6..b604afb7 100644 --- a/main.cpp +++ b/main.cpp @@ -6,6 +6,11 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); + QCoreApplication::setOrganizationName("IJHack"); + QCoreApplication::setOrganizationDomain("ijhack.org"); + QCoreApplication::setApplicationName("QtPass"); + QCoreApplication::setApplicationVersion("0.0.1"); + //Setup and load translator for localization QTranslator translator; QString locale = QLocale::system().name(); @@ -15,7 +20,6 @@ int main(int argc, char *argv[]) MainWindow w; app.setWindowIcon(QIcon(":artwork/icon.png")); - w.checkConfig(); w.show(); diff --git a/qtpass.pro b/qtpass.pro index 03e29230..3cb5aa5e 100644 --- a/qtpass.pro +++ b/qtpass.pro @@ -8,7 +8,12 @@ QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = qtpass +macx { + TARGET = QtPass +} else { + TARGET = qtpass +} + TEMPLATE = app SOURCES += main.cpp\ @@ -29,7 +34,10 @@ RESOURCES += resources.qrc TRANSLATIONS += localization/localization_nl_NL.ts -RC_FILE = windows.rc +win32 { + RC_FILE = windows.rc +} else:macx { + ICON = artwork/icon.icns +} -ICON += artwork/icon.svg \ - artwork/icon.icns +OTHER_FILES += LICENSE -- cgit v1.2.3 From 8879a78ba84acea6bc61173afe994de4af205b1c Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 5 Aug 2014 01:51:31 +0200 Subject: added install target --- qtpass.pro | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qtpass.pro b/qtpass.pro index 6b25ffc3..b8c4916d 100644 --- a/qtpass.pro +++ b/qtpass.pro @@ -39,3 +39,6 @@ win32 { } OTHER_FILES += LICENSE + +target.path = /usr/local/bin/ +INSTALLS += target -- cgit v1.2.3 From 050d9a724aaeb436f198c9f41f468319292a90d9 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 5 Aug 2014 02:01:43 +0200 Subject: hidden header --- mainwindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/mainwindow.cpp b/mainwindow.cpp index d49bb700..3822ddb1 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -91,6 +91,7 @@ void MainWindow::checkConfig() { ui->treeView->setColumnHidden(1, true); ui->treeView->setColumnHidden(2, true); ui->treeView->setColumnHidden(3, true); + ui->treeView->header()->hide(); } /** -- cgit v1.2.3