From ec37f77a390cfe8d7b76997e17850e7ff0566293 Mon Sep 17 00:00:00 2001 From: nils Date: Thu, 25 Mar 2010 19:40:20 +0000 Subject: now the view menu is fine git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@280 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- TODO | 2 ++ fileencryptiondialog.cpp | 4 +-- gpgwin.cpp | 52 +++-------------------------------- gpgwin.h | 4 --- release/icons/checkbox_checked.png | Bin 3373 -> 0 bytes release/icons/checkbox_unchecked.png | Bin 3185 -> 0 bytes release/ts/gpg4usb_de.ts | 12 ++++---- release/ts/gpg4usb_en.ts | 12 ++++---- release/ts/gpg4usb_ru.ts | 12 ++++---- 9 files changed, 26 insertions(+), 72 deletions(-) delete mode 100644 release/icons/checkbox_checked.png delete mode 100644 release/icons/checkbox_unchecked.png diff --git a/TODO b/TODO index 66c8864..d4df33b 100644 --- a/TODO +++ b/TODO @@ -9,6 +9,8 @@ Release 0.2.2 Release 0.2.2.1 - encrypt files for checked not selected keys. - add translation for portuguese and french +- beautify view menu +- save window settings Release 0.2.3 - more doku on building gpg4usb (especially on windows) diff --git a/fileencryptiondialog.cpp b/fileencryptiondialog.cpp index 2dbd816..2d8b44d 100755 --- a/fileencryptiondialog.cpp +++ b/fileencryptiondialog.cpp @@ -51,7 +51,7 @@ FileEncryptionDialog::FileEncryptionDialog(GpgME::Context *ctx, QString iconPath /* Setup input & Outputfileselection*/ inputFileEdit = new QLineEdit(); - QPushButton *fb1 = new QPushButton(tr("...")); + QPushButton *fb1 = new QPushButton("..."); connect(fb1, SIGNAL(clicked()), this, SLOT(selectInputFile())); QLabel *fl1 = new QLabel(tr("Input")); fl1->setBuddy(inputFileEdit); @@ -107,7 +107,7 @@ void FileEncryptionDialog::selectInputFile() path=QFileInfo(inputFileEdit->text()).absolutePath(); } - QString infileName = QFileDialog::getOpenFileName(this, tr("Open File"), path, tr("Files") + "All Files (*)"); + QString infileName = QFileDialog::getOpenFileName(this, tr("Open File"), path, tr("Files") + tr("All Files (*)")); inputFileEdit->setText(infileName); // try to find a matching output-filename, if not yet done diff --git a/gpgwin.cpp b/gpgwin.cpp index c00e75d..44cf760 100644 --- a/gpgwin.cpp +++ b/gpgwin.cpp @@ -251,10 +251,6 @@ void GpgWin::createMenus() keyMenu->addAction(openKeyManagementAct); viewMenu = menuBar()->addMenu(tr("&View")); - viewMenu->addAction(viewCryptToolbarAct); - viewMenu->addAction(viewKeyToolbarAct); - viewMenu->addAction(viewEditToolbarAct); - viewMenu->addAction(viewKeyListAct); helpMenu = menuBar()->addMenu(tr("&Help")); helpMenu->addAction(aboutAct); @@ -266,15 +262,18 @@ void GpgWin::createToolBars() cryptToolBar->addAction(encryptAct); cryptToolBar->addAction(decryptAct); cryptToolBar->addAction(fileEncryptionAct); + viewMenu->addAction(cryptToolBar->toggleViewAction()); keyToolBar = addToolBar(tr("Key")); keyToolBar->addAction(importKeyDialogAct); keyToolBar->addAction(openKeyManagementAct); + viewMenu->addAction(keyToolBar->toggleViewAction()); editToolBar = addToolBar(tr("Edit")); editToolBar->addAction(copyAct); editToolBar->addAction(pasteAct); editToolBar->addAction(selectallAct); + viewMenu->addAction(editToolBar->toggleViewAction()); } void GpgWin::createStatusBar() @@ -288,6 +287,7 @@ void GpgWin::createDockWindows() dock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); addDockWidget(Qt::RightDockWidgetArea, dock); dock->setWidget(mKeyList); + viewMenu->addAction(dock->toggleViewAction()); /*dock = new QDockWidget(tr("Attached files:"), this); dock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea ); @@ -613,47 +613,3 @@ void GpgWin::fileEncryption() new FileEncryptionDialog(mCtx, iconPath); } - -void GpgWin::viewKeyToolBar() -{ - if (keyToolBar->isHidden()) { - keyToolBar->show(); - viewKeyToolbarAct->setIcon(QIcon(iconPath + "checkbox_checked.png")); - } else { - keyToolBar->hide(); - viewKeyToolbarAct->setIcon(QIcon(iconPath + "checkbox_unchecked.png")); - } -} - -void GpgWin::viewCryptToolBar() -{ - if (cryptToolBar->isHidden()) { - cryptToolBar->show(); - viewCryptToolbarAct->setIcon(QIcon(iconPath + "checkbox_checked.png")); - } else { - cryptToolBar->hide(); - viewCryptToolbarAct->setIcon(QIcon(iconPath + "checkbox_unchecked.png")); - } -} - -void GpgWin::viewEditToolBar() -{ - if (editToolBar->isHidden()) { - editToolBar->show(); - viewEditToolbarAct->setIcon(QIcon(iconPath + "checkbox_checked.png")); - } else { - editToolBar->hide(); - viewEditToolbarAct->setIcon(QIcon(iconPath + "checkbox_unchecked.png")); - } -} - -void GpgWin::viewKeyList() -{ - if (dock->isVisible()) { - dock->close(); - viewKeyListAct->setIcon(QIcon(iconPath + "checkbox_unchecked.png")); - } else { - dock->show(); - viewKeyListAct->setIcon(QIcon(iconPath + "checkbox_checked.png")); - } -} diff --git a/gpgwin.h b/gpgwin.h index 0a7ae5f..2773ee2 100644 --- a/gpgwin.h +++ b/gpgwin.h @@ -73,10 +73,6 @@ public slots: bool saveAs(); void open(); void fileEncryption(); - void viewKeyToolBar(); - void viewCryptToolBar(); - void viewEditToolBar(); - void viewKeyList(); // void dropEvent(QDropEvent *event); private: diff --git a/release/icons/checkbox_checked.png b/release/icons/checkbox_checked.png deleted file mode 100644 index d8cd269..0000000 Binary files a/release/icons/checkbox_checked.png and /dev/null differ diff --git a/release/icons/checkbox_unchecked.png b/release/icons/checkbox_unchecked.png deleted file mode 100644 index 80d10e4..0000000 Binary files a/release/icons/checkbox_unchecked.png and /dev/null differ diff --git a/release/ts/gpg4usb_de.ts b/release/ts/gpg4usb_de.ts index 751c5b8..1042ba8 100644 --- a/release/ts/gpg4usb_de.ts +++ b/release/ts/gpg4usb_de.ts @@ -363,7 +363,7 @@ &Crypt - + &Help &Hilfe @@ -373,7 +373,7 @@ Datei - + Edit Bearbeiten @@ -437,18 +437,18 @@ - + Key Schlüssel - + Ready Fertig - + Encrypt for: Verschlüssele für: @@ -560,7 +560,7 @@ Do you want to save your changes? &Importiere neuen Schlüssel aus... - + Crypt Crypt diff --git a/release/ts/gpg4usb_en.ts b/release/ts/gpg4usb_en.ts index c4036e5..35fbeeb 100644 --- a/release/ts/gpg4usb_en.ts +++ b/release/ts/gpg4usb_en.ts @@ -336,7 +336,7 @@ - + &Help @@ -346,7 +346,7 @@ - + Edit @@ -376,18 +376,18 @@ - + Key - + Ready - + Encrypt for: @@ -484,7 +484,7 @@ Do you want to save your changes? - + Crypt diff --git a/release/ts/gpg4usb_ru.ts b/release/ts/gpg4usb_ru.ts index 7a2a731..bd23680 100644 --- a/release/ts/gpg4usb_ru.ts +++ b/release/ts/gpg4usb_ru.ts @@ -365,7 +365,7 @@ &Шифрование - + &Help &Справка @@ -375,7 +375,7 @@ Файл - + Edit Правка @@ -438,18 +438,18 @@ - + Key Ключ - + Ready Готово - + Encrypt for: Зашифровать для: @@ -564,7 +564,7 @@ Do you want to save your changes? &Импорт нового ключа из... - + Crypt Шифрование -- cgit v1.2.3