aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TODO6
-rw-r--r--mainwindow.cpp67
-rw-r--r--mainwindow.h8
3 files changed, 23 insertions, 58 deletions
diff --git a/TODO b/TODO
index f60b3fc..6345b58 100644
--- a/TODO
+++ b/TODO
@@ -5,6 +5,9 @@ Release 0.3.2
- gpgwin.cpp -> mainwindow.cpp [DONE]
- context.cpp -> gpgcontext.cpp [DONE]
- show keyrings (files with .gpg) in import from file dialog too [DONE]
+- dropdown from menubar instead of dialog for import [DONE]
+- add file operation toolbar (open, save, new) (per default off) [DONE]
+- put quote and double line break removale to "special edit" operation toolbar (icons for double linebreaks missing) [DONE]
- Wizard on first start (Create Key, Import from older gpg4usb, import from gnupg)
- option in settingsdialog for enabling steganographic operations
- minimal steganography option: remove or add pgp-headers on demand
@@ -21,11 +24,8 @@ Release 0.3.2
- if import failed, because no key was found
- if key is already in keyring
- show message, when key export is successful (statusbar)
-- dropdown from menubar instead of dialog for import
- dropdown from menubar instead of dialog for file-cryption (files->encrypt,decrypt)
- encrypt and sign, decrypt and verify (?)
-- add file operation toolbar (open, save, new) (per default off)
-- put quote and double line break removale to "special edit" operation toolbar
Release 0.3.3
- create revocation file on key generation
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 20f093c..95b43db 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -153,11 +153,11 @@ void MainWindow::createActions()
/* Main Menu
*/
newTabAct = new QAction(tr("&New"), this);
+ newTabAct->setIcon(QIcon(iconPath + "misc_doc.png"));
QList<QKeySequence> newTabActShortcutList;
newTabActShortcutList.append(QKeySequence (Qt::CTRL + Qt::Key_N));
newTabActShortcutList.append(QKeySequence (Qt::CTRL + Qt::Key_T));
newTabAct->setShortcuts(newTabActShortcutList);
-
newTabAct->setToolTip(tr("Open a new file"));
connect(newTabAct, SIGNAL(triggered()), edit, SLOT(newTab()));
@@ -294,11 +294,6 @@ void MainWindow::createActions()
openKeyManagementAct->setToolTip(tr("Open Keymanagement"));
connect(openKeyManagementAct, SIGNAL(triggered()), this, SLOT(openKeyManagement()));
- importKeyDialogAct = new QAction(tr("&Import Key"), this);
- importKeyDialogAct->setIcon(QIcon(iconPath + "key_import.png"));
- importKeyDialogAct->setToolTip(tr("Open Import New Key Dialog"));
- connect(importKeyDialogAct, SIGNAL(triggered()), this, SLOT(importKeyDialog()));
-
/* About Menu
*/
aboutAct = new QAction(tr("&About"), this);
@@ -403,6 +398,14 @@ void MainWindow::createMenus()
void MainWindow::createToolBars()
{
+ fileToolBar = addToolBar(tr("File"));
+ fileToolBar->setObjectName("fileToolBar");
+ fileToolBar->addAction(newTabAct);
+ fileToolBar->addAction(openAct);
+ fileToolBar->addAction(saveAct);
+ fileToolBar->hide();
+ viewMenu->addAction(fileToolBar->toggleViewAction());
+
cryptToolBar = addToolBar(tr("Crypt"));
cryptToolBar->setObjectName("cryptToolBar");
cryptToolBar->addAction(encryptAct);
@@ -414,7 +417,6 @@ void MainWindow::createToolBars()
keyToolBar = addToolBar(tr("Key"));
keyToolBar->setObjectName("keyToolBar");
- keyToolBar->addAction(importKeyDialogAct);
keyToolBar->addAction(openKeyManagementAct);
viewMenu->addAction(keyToolBar->toggleViewAction());
@@ -423,17 +425,23 @@ void MainWindow::createToolBars()
editToolBar->addAction(copyAct);
editToolBar->addAction(pasteAct);
editToolBar->addAction(selectallAct);
- editToolBar->addAction(quoteAct);
viewMenu->addAction(editToolBar->toggleViewAction());
+ specialEditToolBar = addToolBar(tr("Special edit"));
+ specialEditToolBar->setObjectName("specialEditToolBar");
+ specialEditToolBar->addAction(quoteAct);
+ specialEditToolBar->addAction(cleanDoubleLinebreaksAct);
+ viewMenu->addAction(specialEditToolBar->toggleViewAction());
+
+ // Add dropdown menu for key import to keytoolbar
QToolButton* toolButton = new QToolButton();
toolButton->setMenu(importKeyMenu);
toolButton->setPopupMode(QToolButton::InstantPopup);
toolButton->setIcon(QIcon(iconPath + "key_import.png"));
toolButton->setToolTip("Import key");
- toolButton->setText("Import key from");
+ toolButton->setText("Import key from..");
toolButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
- editToolBar->addWidget(toolButton);
+ keyToolBar->addWidget(toolButton);
}
void MainWindow::createStatusBar()
@@ -786,45 +794,6 @@ void MainWindow::verify()
}
}
-void MainWindow::importKeyDialog()
-{
- QDialog *dialog = new QDialog();
-
- dialog->setWindowTitle(tr("Import Key"));
- dialog->setModal(true);
-
- QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-
- connect(buttonBox, SIGNAL(accepted()), dialog, SLOT(accept()));
- connect(buttonBox, SIGNAL(rejected()), dialog, SLOT(reject()));
-
- QGroupBox *groupBox = new QGroupBox(tr("Import Key From..."));
- QRadioButton *radio1 = new QRadioButton(tr("&File"));
- QRadioButton *radio2 = new QRadioButton(tr("&Editor"));
- QRadioButton *radio3 = new QRadioButton(tr("&Clipboard"));
- QRadioButton *radio4 = new QRadioButton(tr("&Keyserver"));
- radio1->setChecked(true);
-
- QVBoxLayout *vbox1 = new QVBoxLayout();
- vbox1->addWidget(radio1);
- vbox1->addWidget(radio2);
- vbox1->addWidget(radio3);
- vbox1->addWidget(radio4);
- groupBox->setLayout(vbox1);
-
- QVBoxLayout *vbox2 = new QVBoxLayout();
- vbox2->addWidget(groupBox);
- vbox2->addWidget(buttonBox);
- dialog->setLayout(vbox2);
-
- if (dialog->exec() == QDialog::Accepted) {
- if (radio1->isChecked()) keyMgmt->importKeyFromFile();
- if (radio2->isChecked()) importKeyFromEdit();
- if (radio3->isChecked()) keyMgmt->importKeyFromClipboard();
- if (radio4->isChecked()) keyMgmt->importKeyFromKeyServer();
- }
-}
-
/*
* Append the selected (not checked!) Key(s) To Textedit
*/
diff --git a/mainwindow.h b/mainwindow.h
index b73fec2..c90147f 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -112,11 +112,6 @@ private slots:
void importKeyFromEdit();
/**
- * @details Open a dialog, in which you can choose, where keys should be imported from.
- */
- void importKeyDialog();
-
- /**
* @details Append the selected keys to currently active textedit.
*/
void appendSelectedKeys();
@@ -236,7 +231,9 @@ private:
QMenu *viewMenu; /** View submenu */
QMenu *importKeyMenu; /** Sumenu for import operations */
QToolBar *cryptToolBar; /** Toolbar holding crypt actions */
+ QToolBar *fileToolBar; /** Toolbar holding file actions */
QToolBar *editToolBar; /** Toolbar holding edit actions */
+ QToolBar *specialEditToolBar; /** Toolbar holding special edit actions */
QToolBar *keyToolBar; /** Toolbar holding key operations */
QDockWidget *keylistDock; /** Encrypt Dock*/
QDockWidget *attachmentDock; /** Attachment Dock */
@@ -258,7 +255,6 @@ private:
QAction *decryptAct; /** Action to decrypt text */
QAction *signAct; /** Action to sign text */
QAction *verifyAct; /** Action to verify text */
- QAction *importKeyDialogAct; /** Action to open key dialog */
QAction *importKeyFromEditAct; /** Action to import key from edit */
QAction *cleanDoubleLinebreaksAct; /** Action to remove double line breaks */
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-09 03:09:55 +0000