Merge pull request #32 from saturneric/developv2.0.2

v2.0.2-beta.2

1 files changed, 1 insertions, 30 deletions

diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp
index 4499b9c8..a629057e 100644
--- a/src/ui/main_window/MainWindowUI.cpp
+++ b/src/ui/main_window/MainWindowUI.cpp
@@ -51,7 +51,7 @@ void MainWindow::createActions() {
   browserAct->setToolTip(_("Open a file browser"));
   connect(browserAct, SIGNAL(triggered()), this, SLOT(slotOpenFileTab()));
 
-  saveAct = new QAction(_("Save"), this);
+  saveAct = new QAction(_("Save File"), this);
   saveAct->setIcon(QIcon(":filesave.png"));
   saveAct->setShortcut(QKeySequence::Save);
   saveAct->setToolTip(_("Save the current File"));
@@ -179,28 +179,6 @@ void MainWindow::createActions() {
   connect(decryptVerifyAct, SIGNAL(triggered()), this,
           SLOT(slotDecryptVerify()));
 
-  /*
-   * File encryption submenu
-   */
-  fileEncryptAct = new QAction(_("Encrypt File"), this);
-  fileEncryptAct->setToolTip(_("Encrypt File"));
-  connect(fileEncryptAct, SIGNAL(triggered()), this,
-          SLOT(slotFileEncryptCustom()));
-
-  fileDecryptAct = new QAction(_("Decrypt File"), this);
-  fileDecryptAct->setToolTip(_("Decrypt File"));
-  connect(fileDecryptAct, SIGNAL(triggered()), this,
-          SLOT(slotFileDecryptCustom()));
-
-  fileSignAct = new QAction(_("Sign File"), this);
-  fileSignAct->setToolTip(_("Sign File"));
-  connect(fileSignAct, SIGNAL(triggered()), this, SLOT(slotFileSignCustom()));
-
-  fileVerifyAct = new QAction(_("Verify File"), this);
-  fileVerifyAct->setToolTip(_("Verify File"));
-  connect(fileVerifyAct, SIGNAL(triggered()), this,
-          SLOT(slotFileVerifyCustom()));
-
   signAct = new QAction(_("Sign"), this);
   signAct->setIcon(QIcon(":signature.png"));
   signAct->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_I));
@@ -363,12 +341,6 @@ void MainWindow::createMenus() {
   editMenu->addSeparator();
   editMenu->addAction(openSettingsAct);
 
-  fileEncMenu = new QMenu(_("File..."));
-  fileEncMenu->addAction(fileEncryptAct);
-  fileEncMenu->addAction(fileDecryptAct);
-  fileEncMenu->addAction(fileSignAct);
-  fileEncMenu->addAction(fileVerifyAct);
-
   cryptMenu = menuBar()->addMenu(_("Crypt"));
   cryptMenu->addAction(encryptAct);
   cryptMenu->addAction(encryptSignAct);
@@ -378,7 +350,6 @@ void MainWindow::createMenus() {
   cryptMenu->addAction(signAct);
   cryptMenu->addAction(verifyAct);
   cryptMenu->addSeparator();
-  cryptMenu->addMenu(fileEncMenu);
 
   keyMenu = menuBar()->addMenu(_("Keys"));
   importKeyMenu = keyMenu->addMenu(_("Import Key"));