aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2010-02-12 00:19:20 +0000
committernils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2010-02-12 00:19:20 +0000
commit4ebbcc581f82f2b13f1d51204a93613d9a71b7e2 (patch)
tree2105b5d6bb0e396868a60df6f6f1d6f1922bf9a0
parentaslo (diff)
downloadgpg4usb-4ebbcc581f82f2b13f1d51204a93613d9a71b7e2.tar.gz
gpg4usb-4ebbcc581f82f2b13f1d51204a93613d9a71b7e2.zip
added view menu (keylist is missing till now)
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@274 34ebc366-c3a9-4b3c-9f84-69acf7962910
-rw-r--r--gpgwin.cpp56
-rw-r--r--gpgwin.h10
-rw-r--r--release/icons/checkbox_checked.pngbin0 -> 5479 bytes
-rw-r--r--release/icons/checkbox_unchecked.pngbin0 -> 3372 bytes
4 files changed, 63 insertions, 3 deletions
diff --git a/gpgwin.cpp b/gpgwin.cpp
index ecf0c32..0ae55cb 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -179,6 +179,23 @@ void GpgWin::createActions()
importKeyDialogAct->setToolTip(tr("Open Import New Key Dialog"));
connect(importKeyDialogAct, SIGNAL(triggered()), this, SLOT(importKeyDialog()));
+ /** View Menu
+ */
+ viewKeyToolbarAct = new QAction(tr("Keytoolbar"), this);
+ viewKeyToolbarAct->setIcon(QIcon(iconPath + "checkbox_checked.png"));
+ viewKeyToolbarAct->setToolTip(tr("Show/Hide Key-Toolbar"));
+ connect(viewKeyToolbarAct, SIGNAL(triggered()), this, SLOT(viewKeyToolBar()));
+
+ viewCryptToolbarAct = new QAction(tr("Crypttoolbar"), this);
+ viewCryptToolbarAct->setIcon(QIcon(iconPath + "checkbox_checked.png"));
+ viewCryptToolbarAct->setToolTip(tr("Show/Hide Crypt-Toolbar"));
+ connect(viewCryptToolbarAct, SIGNAL(triggered()), this, SLOT(viewCryptToolBar()));
+
+ viewEditToolbarAct = new QAction(tr("Edittoolbar"), this);
+ viewEditToolbarAct->setIcon(QIcon(iconPath + "checkbox_checked.png"));
+ viewEditToolbarAct->setToolTip(tr("Show/Hide Edit-Toolbar"));
+ connect(viewEditToolbarAct, SIGNAL(triggered()), this, SLOT(viewEditToolBar()));
+
/** About Menu
*/
aboutAct = new QAction(tr("&About"), this);
@@ -226,6 +243,11 @@ void GpgWin::createMenus()
importKeyMenu->addAction(importKeyFromEditAct);
importKeyMenu->addAction(importKeyFromClipboardAct);
keyMenu->addAction(openKeyManagementAct);
+
+ viewMenu = menuBar()->addMenu(tr("View"));
+ viewMenu->addAction(viewCryptToolbarAct);
+ viewMenu->addAction(viewKeyToolbarAct);
+ viewMenu->addAction(viewEditToolbarAct);
helpMenu = menuBar()->addMenu(tr("&Help"));
helpMenu->addAction(aboutAct);
@@ -556,10 +578,42 @@ void GpgWin::appendSelectedKeys()
edit->appendPlainText(*keyArray);
}
-
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"));
+ }
+}
diff --git a/gpgwin.h b/gpgwin.h
index db1bb2a..0d65696 100644
--- a/gpgwin.h
+++ b/gpgwin.h
@@ -72,6 +72,9 @@ public slots:
bool saveAs();
void open();
void fileEncryption();
+ void viewKeyToolBar();
+ void viewCryptToolBar();
+ void viewEditToolBar();
private:
void createActions();
@@ -92,6 +95,7 @@ private:
QMenu *cryptMenu;
QMenu *helpMenu;
QMenu *keyMenu;
+ QMenu *viewMenu;
QMenu *importKeyMenu;
QToolBar *cryptToolBar;
QToolBar *editToolBar;
@@ -109,7 +113,6 @@ private:
QAction *importKeyFromFileAct;
QAction *importKeyFromEditAct;
QAction *importKeyFromClipboardAct;
- //QAction *deleteSelectedKeysAct;
QAction *appendSelectedKeysAct;
QAction *openKeyManagementAct;
QAction *copyAct;
@@ -118,7 +121,10 @@ private:
QAction *selectallAct;
QAction *aboutAct;
QAction *fileEncryptionAct;
-
+ QAction *viewKeyToolbarAct;
+ QAction *viewCryptToolbarAct;
+ QAction *viewEditToolbarAct;
+
QLineEdit *nameEdit;
QLineEdit *emailEdit;
QLineEdit *commentEdit;
diff --git a/release/icons/checkbox_checked.png b/release/icons/checkbox_checked.png
new file mode 100644
index 0000000..f439f6f
--- /dev/null
+++ b/release/icons/checkbox_checked.png
Binary files differ
diff --git a/release/icons/checkbox_unchecked.png b/release/icons/checkbox_unchecked.png
new file mode 100644
index 0000000..7ec21a7
--- /dev/null
+++ b/release/icons/checkbox_unchecked.png
Binary files differ