aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt7
-rw-r--r--src/CMakeLists.txt10
-rw-r--r--src/ui/widgets/FilePage.h1
-rw-r--r--src/ui/widgets/KeyList.cpp1
-rw-r--r--ui/FilePage.ui130
5 files changed, 141 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9091340..59e0cef8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,7 +227,6 @@ set(ESAY_LOGGING_PP 1)
if (FULL_APPLICATION_BUILD)
message(STATUS "Build Full Application")
set(QT5_ENV_SUPPORT 1)
- set(QT_MOC_CONFIG 1)
set(GPG_CORE 1)
set(UI_CORE 1)
set(SMTP_SUPPORT 1)
@@ -238,7 +237,6 @@ if (FULL_APPLICATION_BUILD)
set(MULTI_LANG_SUPPORT 1)
elseif (MINIMUM_APPLICATION_BUILD)
set(QT5_ENV_SUPPORT 1)
- set(QT_MOC_CONFIG 1)
set(GPG_CORE 1)
set(UI_CORE 1)
set(APPLICATION_BUILD 1)
@@ -250,7 +248,6 @@ elseif (MINIMUM_APPLICATION_BUILD)
# endif ()
elseif (STABLE_APPLICATION_BUILD)
set(QT5_ENV_SUPPORT 1)
- set(QT_MOC_CONFIG 1)
set(GPG_CORE 1)
set(UI_CORE 1)
set(APPLICATION_BUILD 1)
@@ -281,6 +278,10 @@ if (QT5_ENV_SUPPORT)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
+
+ set(CMAKE_AUTORCC_OPTIONS "--compress;9")
+ set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_AUTOUIC_SEARCH_PATHS} ${CMAKE_SOURCE_DIR}/ui)
+
endif ()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 79eae6ea..42fb5119 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -154,9 +154,9 @@ endif ()
if (APPLICATION_BUILD)
if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
if (MINGW)
- add_executable(${AppName} WIN32 ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS})
+ add_executable(${AppName} WIN32 ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS} ${UI_HEADERS})
elseif (APPLE)
- add_executable(${AppName} MACOSX_BUNDLE ${ICON_RESOURCE} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS})
+ add_executable(${AppName} MACOSX_BUNDLE ${ICON_RESOURCE} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS} ${UI_HEADERS})
set_target_properties(${AppName} PROPERTIES
BUNDLE True
MACOSX_BUNDLE_GUI_IDENTIFIER pub.gpgfrontend.gpgfrontend
@@ -174,7 +174,7 @@ if (APPLICATION_BUILD)
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMENT "Copying Resources into App Bundle Resource")
elseif (LINUX)
- add_executable(${AppName} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS})
+ add_executable(${AppName} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS} ${UI_HEADERS})
add_custom_command(TARGET ${AppName} POST_BUILD
COMMAND /bin/mkdir -p ./gpgfrontend/usr/bin && /bin/mv -f ./${AppName} ./gpgfrontend/usr/bin/
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
@@ -184,10 +184,10 @@ if (APPLICATION_BUILD)
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMENT "Complement to build the required architecture")
else ()
- add_executable(${AppName} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS})
+ add_executable(${AppName} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS} ${UI_HEADERS})
endif ()
else ()
- add_executable(${AppName} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS})
+ add_executable(${AppName} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS} ${UI_HEADERS})
endif ()
# Make app build with resources
diff --git a/src/ui/widgets/FilePage.h b/src/ui/widgets/FilePage.h
index 2a9f5b57..247b5a08 100644
--- a/src/ui/widgets/FilePage.h
+++ b/src/ui/widgets/FilePage.h
@@ -29,6 +29,7 @@
#include "ui/GpgFrontendUI.h"
#include "ui/widgets/InfoBoardWidget.h"
+#include "ui_FilePage.h"
namespace GpgFrontend::UI {
diff --git a/src/ui/widgets/KeyList.cpp b/src/ui/widgets/KeyList.cpp
index 5931e337..02a12e80 100644
--- a/src/ui/widgets/KeyList.cpp
+++ b/src/ui/widgets/KeyList.cpp
@@ -46,6 +46,7 @@ void KeyList::init() {
mGroupTab = new QTabWidget();
mGroupTab->setMovable(true);
mGroupTab->setTabsClosable(false);
+ mGroupTab->setDocumentMode(true);
auto* layout = new QVBoxLayout;
layout->addWidget(mGroupTab);
diff --git a/ui/FilePage.ui b/ui/FilePage.ui
new file mode 100644
index 00000000..4e7e8993
--- /dev/null
+++ b/ui/FilePage.ui
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>FilePage</class>
+ <widget class="QWidget" name="FilePage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>523</width>
+ <height>370</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <widget class="QWidget" name="verticalLayoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>471</width>
+ <height>301</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0,0">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
+ </property>
+ <item>
+ <widget class="QLineEdit" name="pathEdit">
+ <property name="tabletTracking">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="clearButtonEnabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="refreshButton">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <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">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <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>
+ <widget class="QToolButton" name="optionsButton">
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../gpgfrontend.qrc">
+ <normaloff>:/configure.png</normaloff>:/configure.png</iconset>
+ </property>
+ <property name="popupMode">
+ <enum>QToolButton::MenuButtonPopup</enum>
+ </property>
+ <property name="toolButtonStyle">
+ <enum>Qt::ToolButtonIconOnly</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QTreeView" name="fileTreeView">
+ <property name="acceptDrops">
+ <bool>true</bool>
+ </property>
+ <property name="autoFillBackground">
+ <bool>false</bool>
+ </property>
+ <property name="uniformRowHeights">
+ <bool>true</bool>
+ </property>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ <property name="animated">
+ <bool>true</bool>
+ </property>
+ <attribute name="headerCascadingSectionResizes">
+ <bool>true</bool>
+ </attribute>
+ <attribute name="headerShowSortIndicator" stdset="0">
+ <bool>true</bool>
+ </attribute>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ <resources>
+ <include location="../gpgfrontend.qrc"/>
+ </resources>
+ <connections/>
+</ui>
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 11:27:16 +0000