diff options
-rw-r--r-- | src/ui/widgets/FilePage.cpp | 68 | ||||
-rw-r--r-- | src/ui/widgets/FilePage.h | 30 | ||||
-rw-r--r-- | ui/FilePage.ui | 32 |
3 files changed, 5 insertions, 125 deletions
diff --git a/src/ui/widgets/FilePage.cpp b/src/ui/widgets/FilePage.cpp index 8c22affd..7615c05f 100644 --- a/src/ui/widgets/FilePage.cpp +++ b/src/ui/widgets/FilePage.cpp @@ -210,24 +210,6 @@ void FilePage::create_popup_menu() { connect(ui_->actionDeleteFile, &QAction::triggered, this, &FilePage::slot_delete_item); - ui_->actionEncrypt->setText(_("Encrypt")); - connect(ui_->actionEncrypt, &QAction::triggered, this, - &FilePage::slot_encrypt_item); - ui_->actionEncryptSign->setText(_("Encrypt Sign")); - connect(ui_->actionEncryptSign, &QAction::triggered, this, - &FilePage::slot_encrypt_sign_item); - ui_->actionDecrypt->setText(QString(_("Decrypt Verify")) + " " + - _("(.gpg .asc)")); - connect(ui_->actionDecrypt, &QAction::triggered, this, - &FilePage::slot_decrypt_item); - ui_->actionSign->setText(_("Sign")); - connect(ui_->actionSign, &QAction::triggered, this, - &FilePage::slot_sign_item); - ui_->actionVerify->setText(QString(_("Verify")) + " " + - _("(.sig .gpg .asc)")); - connect(ui_->actionVerify, &QAction::triggered, this, - &FilePage::slot_verify_item); - ui_->actionCalculateHash->setText(_("Calculate Hash")); connect(ui_->actionCalculateHash, &QAction::triggered, this, &FilePage::slot_calculate_hash); @@ -244,12 +226,6 @@ void FilePage::create_popup_menu() { popup_menu_->addAction(ui_->actionRenameFile); popup_menu_->addAction(ui_->actionDeleteFile); popup_menu_->addSeparator(); - popup_menu_->addAction(ui_->actionEncrypt); - popup_menu_->addAction(ui_->actionEncryptSign); - popup_menu_->addAction(ui_->actionDecrypt); - popup_menu_->addAction(ui_->actionSign); - popup_menu_->addAction(ui_->actionVerify); - popup_menu_->addSeparator(); popup_menu_->addAction(ui_->actionMakeDirectory); popup_menu_->addAction(ui_->actionCreateEmptyFile); popup_menu_->addAction(ui_->actionCalculateHash); @@ -292,31 +268,12 @@ void FilePage::onCustomContextMenu(const QPoint& point) { ui_->actionDeleteFile->setEnabled(true); QFileInfo info(QString::fromStdString(selected_path_.string())); - ui_->actionEncrypt->setEnabled(info.isFile() && (info.suffix() != "gpg" && - info.suffix() != "sig" && - info.suffix() != "asc")); - ui_->actionEncryptSign->setEnabled( - info.isFile() && (info.suffix() != "gpg" && info.suffix() != "sig" && - info.suffix() != "asc")); - ui_->actionDecrypt->setEnabled( - info.isFile() && (info.suffix() == "gpg" || info.suffix() == "asc")); - ui_->actionSign->setEnabled(info.isFile() && (info.suffix() != "gpg" && - info.suffix() != "sig" && - info.suffix() != "asc")); - ui_->actionVerify->setEnabled(info.isFile() && (info.suffix() == "sig" || - info.suffix() == "gpg" || - info.suffix() == "asc")); ui_->actionCalculateHash->setEnabled(info.isFile() && info.isReadable()); } else { ui_->actionOpenFile->setEnabled(false); ui_->actionRenameFile->setEnabled(false); ui_->actionDeleteFile->setEnabled(false); - ui_->actionEncrypt->setEnabled(false); - ui_->actionEncryptSign->setEnabled(false); - ui_->actionDecrypt->setEnabled(false); - ui_->actionSign->setEnabled(false); - ui_->actionVerify->setEnabled(false); ui_->actionCalculateHash->setEnabled(false); } popup_menu_->exec(ui_->fileTreeView->viewport()->mapToGlobal(point)); @@ -389,31 +346,6 @@ void FilePage::slot_delete_item() { } } -void FilePage::slot_encrypt_item() { - auto main_window = qobject_cast<MainWindow*>(first_parent_); - if (main_window != nullptr) main_window->SlotFileEncrypt(); -} - -void FilePage::slot_encrypt_sign_item() { - auto main_window = qobject_cast<MainWindow*>(first_parent_); - if (main_window != nullptr) main_window->SlotFileEncryptSign(); -} - -void FilePage::slot_decrypt_item() { - auto main_window = qobject_cast<MainWindow*>(first_parent_); - if (main_window != nullptr) main_window->SlotFileDecryptVerify(); -} - -void FilePage::slot_sign_item() { - auto main_window = qobject_cast<MainWindow*>(first_parent_); - if (main_window != nullptr) main_window->SlotFileSign(); -} - -void FilePage::slot_verify_item() { - auto main_window = qobject_cast<MainWindow*>(first_parent_); - if (main_window != nullptr) main_window->SlotFileVerify(); -} - void FilePage::slot_calculate_hash() { // Returns empty QByteArray() on failure. QFileInfo info(QString::fromStdString(selected_path_.string())); diff --git a/src/ui/widgets/FilePage.h b/src/ui/widgets/FilePage.h index c99aeab6..e8ee3f25 100644 --- a/src/ui/widgets/FilePage.h +++ b/src/ui/widgets/FilePage.h @@ -128,36 +128,6 @@ class FilePage : public QWidget { * @brief * */ - void slot_encrypt_item(); - - /** - * @brief - * - */ - void slot_encrypt_sign_item(); - - /** - * @brief - * - */ - void slot_decrypt_item(); - - /** - * @brief - * - */ - void slot_sign_item(); - - /** - * @brief - * - */ - void slot_verify_item(); - - /** - * @brief - * - */ void slot_calculate_hash(); /** diff --git a/ui/FilePage.ui b/ui/FilePage.ui index 4467e154..1fe9183d 100644 --- a/ui/FilePage.ui +++ b/ui/FilePage.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>1041</width> - <height>619</height> + <width>798</width> + <height>476</height> </rect> </property> <property name="sizePolicy"> @@ -136,6 +136,9 @@ <property name="autoFillBackground"> <bool>false</bool> </property> + <property name="dragDropMode"> + <enum>QAbstractItemView::InternalMove</enum> + </property> <property name="uniformRowHeights"> <bool>true</bool> </property> @@ -158,31 +161,6 @@ </layout> </item> </layout> - <action name="actionEncrypt"> - <property name="text"> - <string>Encrypt</string> - </property> - </action> - <action name="actionEncryptSign"> - <property name="text"> - <string>EncryptSign</string> - </property> - </action> - <action name="actionDecrypt"> - <property name="text"> - <string>Decrypt</string> - </property> - </action> - <action name="actionSign"> - <property name="text"> - <string>Sign</string> - </property> - </action> - <action name="actionVerify"> - <property name="text"> - <string>Verify</string> - </property> - </action> <action name="actionOpenFile"> <property name="text"> <string>OpenFile</string> |