now the view menu is fine

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@280 34ebc366-c3a9-4b3c-9f84-69acf7962910

9 files changed, 26 insertions, 72 deletions

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
--- a/release/icons/checkbox_checked.png
+++ /dev/null
diff --git a/release/icons/checkbox_unchecked.png b/release/icons/checkbox_unchecked.png
deleted file mode 100644
index 80d10e4..0000000
--- a/release/icons/checkbox_unchecked.png
+++ /dev/null
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 @@
         <translation type="obsolete">&amp;Crypt</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="259"/>
+        <location filename="../../gpgwin.cpp" line="255"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
@@ -373,7 +373,7 @@
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="274"/>
+        <location filename="../../gpgwin.cpp" line="272"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
@@ -437,18 +437,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="270"/>
+        <location filename="../../gpgwin.cpp" line="267"/>
         <source>Key</source>
         <translation>Schlüssel</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="282"/>
+        <location filename="../../gpgwin.cpp" line="281"/>
         <location filename="../../gpgwin.cpp" line="453"/>
         <source>Ready</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="287"/>
+        <location filename="../../gpgwin.cpp" line="286"/>
         <source>Encrypt for:</source>
         <translation>Verschlüssele für:</translation>
     </message>
@@ -560,7 +560,7 @@ Do you want to save your changes?</source>
         <translation type="obsolete">&amp;Importiere neuen Schlüssel aus...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="265"/>
+        <location filename="../../gpgwin.cpp" line="261"/>
         <source>Crypt</source>
         <translation>Crypt</translation>
     </message>
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 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="259"/>
+        <location filename="../../gpgwin.cpp" line="255"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -346,7 +346,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="274"/>
+        <location filename="../../gpgwin.cpp" line="272"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -376,18 +376,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="270"/>
+        <location filename="../../gpgwin.cpp" line="267"/>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="282"/>
+        <location filename="../../gpgwin.cpp" line="281"/>
         <location filename="../../gpgwin.cpp" line="453"/>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="287"/>
+        <location filename="../../gpgwin.cpp" line="286"/>
         <source>Encrypt for:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -484,7 +484,7 @@ Do you want to save your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="265"/>
+        <location filename="../../gpgwin.cpp" line="261"/>
         <source>Crypt</source>
         <translation type="unfinished"></translation>
     </message>
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 @@
         <translation type="obsolete">&amp;Шифрование</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="259"/>
+        <location filename="../../gpgwin.cpp" line="255"/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
@@ -375,7 +375,7 @@
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="274"/>
+        <location filename="../../gpgwin.cpp" line="272"/>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
@@ -438,18 +438,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="270"/>
+        <location filename="../../gpgwin.cpp" line="267"/>
         <source>Key</source>
         <translation>Ключ</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="282"/>
+        <location filename="../../gpgwin.cpp" line="281"/>
         <location filename="../../gpgwin.cpp" line="453"/>
         <source>Ready</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="287"/>
+        <location filename="../../gpgwin.cpp" line="286"/>
         <source>Encrypt for:</source>
         <translation>   Зашифровать для:</translation>
     </message>
@@ -564,7 +564,7 @@ Do you want to save your changes?</source>
         <translation type="obsolete">&amp;Импорт нового ключа из...</translation>
     </message>
     <message>
-        <location filename="../../gpgwin.cpp" line="265"/>
+        <location filename="../../gpgwin.cpp" line="261"/>
         <source>Crypt</source>
         <translation>Шифрование</translation>
     </message>