diff options
Diffstat (limited to '')
| -rw-r--r-- | gpgfrontend.qrc | 5 | ||||
| -rw-r--r-- | resource/lfs/icons/clear.png | bin | 0 -> 3458 bytes | |||
| -rw-r--r-- | resource/lfs/icons/cloud_sync.png | bin | 0 -> 4251 bytes | |||
| -rw-r--r-- | resource/lfs/icons/copy.png | bin | 0 -> 2310 bytes | |||
| -rw-r--r-- | resource/lfs/icons/filesave.png | bin | 2348 -> 2848 bytes | |||
| -rw-r--r-- | resource/lfs/icons/key_generate.png | bin | 2708 -> 2219 bytes | |||
| -rw-r--r-- | resource/lfs/icons/none.png | bin | 0 -> 4780 bytes | |||
| -rw-r--r-- | resource/lfs/icons/refresh.png | bin | 6821 -> 3421 bytes | |||
| -rw-r--r-- | resource/lfs/icons/total_selection.png | bin | 0 -> 3087 bytes | |||
| -rw-r--r-- | src/core/GpgCoreInit.cpp | 8 | ||||
| -rw-r--r-- | src/init.cpp | 4 | ||||
| -rw-r--r-- | src/module/sdk/Log.cpp | 4 | ||||
| -rw-r--r-- | src/ui/main_window/MainWindowUI.cpp | 1 | ||||
| -rw-r--r-- | src/ui/widgets/InfoBoardWidget.cpp | 12 | ||||
| -rw-r--r-- | ui/FilePage.ui | 44 | ||||
| -rw-r--r-- | ui/InfoBoard.ui | 46 | ||||
| -rw-r--r-- | ui/KeyList.ui | 44 |
17 files changed, 105 insertions, 63 deletions
diff --git a/gpgfrontend.qrc b/gpgfrontend.qrc index cb7de350..2322e6e9 100644 --- a/gpgfrontend.qrc +++ b/gpgfrontend.qrc @@ -81,5 +81,10 @@ <file alias="password-generate.svg">resource/lfs/icons/password-generate.svg</file> <file alias="visibility.svg">resource/lfs/icons/visibility.svg</file> <file alias="new_directory.png">resource/lfs/icons/new_directory.png</file> + <file alias="copy.png">resource/lfs/icons/copy.png</file> + <file alias="none.png">resource/lfs/icons/none.png</file> + <file alias="clear.png">resource/lfs/icons/clear.png</file> + <file alias="cloud_sync.png">resource/lfs/icons/cloud_sync.png</file> + <file alias="total_selection.png">resource/lfs/icons/total_selection.png</file> </qresource> </RCC> diff --git a/resource/lfs/icons/clear.png b/resource/lfs/icons/clear.png Binary files differnew file mode 100644 index 00000000..f71e9163 --- /dev/null +++ b/resource/lfs/icons/clear.png diff --git a/resource/lfs/icons/cloud_sync.png b/resource/lfs/icons/cloud_sync.png Binary files differnew file mode 100644 index 00000000..caff0ed9 --- /dev/null +++ b/resource/lfs/icons/cloud_sync.png diff --git a/resource/lfs/icons/copy.png b/resource/lfs/icons/copy.png Binary files differnew file mode 100644 index 00000000..f75ee99b --- /dev/null +++ b/resource/lfs/icons/copy.png diff --git a/resource/lfs/icons/filesave.png b/resource/lfs/icons/filesave.png Binary files differindex ce80e05f..5744f7ea 100644 --- a/resource/lfs/icons/filesave.png +++ b/resource/lfs/icons/filesave.png diff --git a/resource/lfs/icons/key_generate.png b/resource/lfs/icons/key_generate.png Binary files differindex c67edd21..19f85076 100644 --- a/resource/lfs/icons/key_generate.png +++ b/resource/lfs/icons/key_generate.png diff --git a/resource/lfs/icons/none.png b/resource/lfs/icons/none.png Binary files differnew file mode 100644 index 00000000..47a95867 --- /dev/null +++ b/resource/lfs/icons/none.png diff --git a/resource/lfs/icons/refresh.png b/resource/lfs/icons/refresh.png Binary files differindex 54745560..ee9d47a6 100644 --- a/resource/lfs/icons/refresh.png +++ b/resource/lfs/icons/refresh.png diff --git a/resource/lfs/icons/total_selection.png b/resource/lfs/icons/total_selection.png Binary files differnew file mode 100644 index 00000000..9e737065 --- /dev/null +++ b/resource/lfs/icons/total_selection.png diff --git a/src/core/GpgCoreInit.cpp b/src/core/GpgCoreInit.cpp index dcda6b44..5a3b2d6d 100644 --- a/src/core/GpgCoreInit.cpp +++ b/src/core/GpgCoreInit.cpp @@ -28,18 +28,16 @@ #include "GpgCoreInit.h" #include <gpgme.h> -#include <spdlog/async.h> -#include <spdlog/common.h> -#include <spdlog/sinks/rotating_file_sink.h> -#include <spdlog/sinks/stdout_color_sinks.h> #include <boost/date_time.hpp> +#include "core/function/CoreSignalStation.h" #include "core/function/GlobalSettingStation.h" #include "core/function/basic/ChannelObject.h" #include "core/function/basic/SingletonStorage.h" #include "core/function/gpg/GpgAdvancedOperator.h" #include "core/function/gpg/GpgContext.h" +#include "core/function/gpg/GpgKeyGetter.h" #include "core/module/ModuleManager.h" #include "core/thread/Task.h" #include "core/thread/TaskRunner.h" @@ -47,8 +45,6 @@ #include "core/utils/CommonUtils.h" #include "core/utils/GpgUtils.h" #include "core/utils/MemoryUtils.h" -#include "function/CoreSignalStation.h" -#include "function/gpg/GpgKeyGetter.h" namespace GpgFrontend { diff --git a/src/init.cpp b/src/init.cpp index cc91c538..1b453cad 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -29,10 +29,6 @@ #include "init.h" #include <qcoreapplication.h> -#include <spdlog/async.h> -#include <spdlog/common.h> -#include <spdlog/sinks/rotating_file_sink.h> -#include <spdlog/sinks/stdout_color_sinks.h> #include <boost/date_time.hpp> #include <filesystem> diff --git a/src/module/sdk/Log.cpp b/src/module/sdk/Log.cpp index 7b0e4cca..384fac1d 100644 --- a/src/module/sdk/Log.cpp +++ b/src/module/sdk/Log.cpp @@ -28,10 +28,6 @@ #include "Log.h" -#include <spdlog/async.h> -#include <spdlog/common.h> -#include <spdlog/sinks/rotating_file_sink.h> -#include <spdlog/sinks/stdout_color_sinks.h> #include <stdexcept> diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp index 1a9500a5..e710081c 100644 --- a/src/ui/main_window/MainWindowUI.cpp +++ b/src/ui/main_window/MainWindowUI.cpp @@ -644,7 +644,6 @@ void MainWindow::create_tool_bars() { file_tool_bar_->setObjectName("fileToolBar"); file_tool_bar_->addAction(new_tab_act_); file_tool_bar_->addAction(open_act_); - file_tool_bar_->addAction(save_act_); file_tool_bar_->addAction(browser_act_); view_menu_->addAction(file_tool_bar_->toggleViewAction()); diff --git a/src/ui/widgets/InfoBoardWidget.cpp b/src/ui/widgets/InfoBoardWidget.cpp index b2ac0119..9043b668 100644 --- a/src/ui/widgets/InfoBoardWidget.cpp +++ b/src/ui/widgets/InfoBoardWidget.cpp @@ -42,15 +42,15 @@ InfoBoardWidget::InfoBoardWidget(QWidget* parent) ui_->setupUi(this); ui_->actionButtonLayout->addStretch(); - ui_->copyButton->setText(_("Copy")); - ui_->saveButton->setText(_("Save File")); - ui_->clearButton->setText(_("Clear")); + ui_->copyToolButton->setToolTip(_("Copy")); + ui_->saveToolButton->setToolTip(_("Save File")); + ui_->clearToolButton->setToolTip(_("Clear")); - connect(ui_->copyButton, &QPushButton::clicked, this, + connect(ui_->copyToolButton, &QToolButton::clicked, this, &InfoBoardWidget::slot_copy); - connect(ui_->saveButton, &QPushButton::clicked, this, + connect(ui_->saveToolButton, &QToolButton::clicked, this, &InfoBoardWidget::slot_save); - connect(ui_->clearButton, &QPushButton::clicked, this, + connect(ui_->clearToolButton, &QToolButton::clicked, this, &InfoBoardWidget::SlotReset); connect(UISignalStation::GetInstance(), diff --git a/ui/FilePage.ui b/ui/FilePage.ui index c42afb81..279c5cf3 100644 --- a/ui/FilePage.ui +++ b/ui/FilePage.ui @@ -54,7 +54,7 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0,0,0"> <property name="spacing"> - <number>0</number> + <number>5</number> </property> <property name="sizeConstraint"> <enum>QLayout::SetDefaultConstraint</enum> @@ -66,46 +66,43 @@ <number>5</number> </property> <item> - <widget class="QLineEdit" name="pathEdit"> + <widget class="QToolButton" name="newDirButton"> <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tabletTracking"> - <bool>false</bool> - </property> <property name="text"> <string/> </property> - <property name="clearButtonEnabled"> - <bool>false</bool> + <property name="icon"> + <iconset resource="../gpgfrontend.qrc"> + <normaloff>:/new_directory.png</normaloff>:/new_directory.png</iconset> </property> </widget> </item> <item> - <widget class="QPushButton" name="newDirButton"> + <widget class="QLineEdit" name="pathEdit"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="tabletTracking"> + <bool>false</bool> + </property> <property name="text"> <string/> </property> - <property name="icon"> - <iconset resource="../gpgfrontend.qrc"> - <normaloff>:/new_directory.png</normaloff>:/new_directory.png</iconset> - </property> - <property name="flat"> - <bool>true</bool> + <property name="clearButtonEnabled"> + <bool>false</bool> </property> </widget> </item> <item> - <widget class="QPushButton" name="refreshButton"> + <widget class="QToolButton" name="refreshButton"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -119,13 +116,10 @@ <iconset resource="../gpgfrontend.qrc"> <normaloff>:/refresh.png</normaloff>:/refresh.png</iconset> </property> - <property name="flat"> - <bool>true</bool> - </property> </widget> </item> <item> - <widget class="QPushButton" name="upPathButton"> + <widget class="QToolButton" name="upPathButton"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -139,12 +133,6 @@ <iconset resource="../gpgfrontend.qrc"> <normaloff>:/up.png</normaloff>:/up.png</iconset> </property> - <property name="default"> - <bool>false</bool> - </property> - <property name="flat"> - <bool>true</bool> - </property> </widget> </item> <item> @@ -163,7 +151,7 @@ <normaloff>:/configure.png</normaloff>:/configure.png</iconset> </property> <property name="popupMode"> - <enum>QToolButton::MenuButtonPopup</enum> + <enum>QToolButton::InstantPopup</enum> </property> <property name="toolButtonStyle"> <enum>Qt::ToolButtonIconOnly</enum> diff --git a/ui/InfoBoard.ui b/ui/InfoBoard.ui index 1c87974b..8f3bb1c8 100644 --- a/ui/InfoBoard.ui +++ b/ui/InfoBoard.ui @@ -29,11 +29,17 @@ </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_4"> + <property name="spacing"> + <number>-1</number> + </property> <property name="sizeConstraint"> <enum>QLayout::SetNoConstraint</enum> </property> <property name="leftMargin"> - <number>6</number> + <number>5</number> + </property> + <property name="rightMargin"> + <number>5</number> </property> <item alignment="Qt::AlignLeft"> <widget class="QWidget" name="horizontalWidget" native="true"> @@ -62,25 +68,49 @@ <property name="bottomMargin"> <number>0</number> </property> - <item alignment="Qt::AlignRight"> - <widget class="QPushButton" name="copyButton"> + <item> + <widget class="QToolButton" name="copyToolButton"> + <property name="toolTip"> + <string>Copy</string> + </property> <property name="text"> <string>Copy</string> </property> + <property name="icon"> + <iconset resource="../gpgfrontend.qrc"> + <normaloff>:/copy.png</normaloff>:/copy.png</iconset> + </property> + <property name="autoRaise"> + <bool>false</bool> + </property> </widget> </item> - <item alignment="Qt::AlignRight"> - <widget class="QPushButton" name="saveButton"> + <item> + <widget class="QToolButton" name="saveToolButton"> + <property name="toolTip"> + <string>Save</string> + </property> <property name="text"> <string>Save</string> </property> + <property name="icon"> + <iconset resource="../gpgfrontend.qrc"> + <normaloff>:/filesave.png</normaloff>:/filesave.png</iconset> + </property> </widget> </item> <item> - <widget class="QPushButton" name="clearButton"> + <widget class="QToolButton" name="clearToolButton"> + <property name="toolTip"> + <string>Clear</string> + </property> <property name="text"> <string>Clear</string> </property> + <property name="icon"> + <iconset resource="../gpgfrontend.qrc"> + <normaloff>:/clear.png</normaloff>:/clear.png</iconset> + </property> </widget> </item> </layout> @@ -109,6 +139,8 @@ </item> </layout> </widget> - <resources/> + <resources> + <include location="../gpgfrontend.qrc"/> + </resources> <connections/> </ui> diff --git a/ui/KeyList.ui b/ui/KeyList.ui index 87b68363..7aff96a5 100644 --- a/ui/KeyList.ui +++ b/ui/KeyList.ui @@ -37,30 +37,58 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QPushButton" name="refreshKeyListButton"> + <widget class="QToolButton" name="refreshKeyListButton"> + <property name="toolTip"> + <string>Refresh</string> + </property> <property name="text"> <string>Refresh</string> </property> + <property name="icon"> + <iconset resource="../gpgfrontend.qrc"> + <normaloff>:/refresh.png</normaloff>:/refresh.png</iconset> + </property> </widget> </item> <item> - <widget class="QPushButton" name="syncButton"> + <widget class="QToolButton" name="syncButton"> + <property name="toolTip"> + <string>Sync Public Key</string> + </property> <property name="text"> <string>Sync Public Key</string> </property> + <property name="icon"> + <iconset resource="../gpgfrontend.qrc"> + <normaloff>:/cloud_sync.png</normaloff>:/cloud_sync.png</iconset> + </property> </widget> </item> <item> - <widget class="QPushButton" name="uncheckButton"> + <widget class="QToolButton" name="checkALLButton"> + <property name="toolTip"> + <string>Check ALL</string> + </property> <property name="text"> - <string>Uncheck ALL</string> + <string>Check ALL</string> + </property> + <property name="icon"> + <iconset resource="../gpgfrontend.qrc"> + <normaloff>:/total_selection.png</normaloff>:/total_selection.png</iconset> </property> </widget> </item> <item> - <widget class="QPushButton" name="checkALLButton"> + <widget class="QToolButton" name="uncheckButton"> + <property name="toolTip"> + <string>Uncheck ALL</string> + </property> <property name="text"> - <string>Check ALL</string> + <string>Uncheck ALL</string> + </property> + <property name="icon"> + <iconset resource="../gpgfrontend.qrc"> + <normaloff>:/none.png</normaloff>:/none.png</iconset> </property> </widget> </item> @@ -119,6 +147,8 @@ </item> </layout> </widget> - <resources/> + <resources> + <include location="../gpgfrontend.qrc"/> + </resources> <connections/> </ui> |
