aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/FilePage.ui150
-rw-r--r--ui/GeneralSettings.ui7
-rw-r--r--ui/GnuPGInfo.ui2
-rw-r--r--ui/InfoBoard.ui46
-rw-r--r--ui/KeyList.ui44
5 files changed, 137 insertions, 112 deletions
diff --git a/ui/FilePage.ui b/ui/FilePage.ui
index 184e6120..5ee3058e 100644
--- a/ui/FilePage.ui
+++ b/ui/FilePage.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>798</width>
- <height>476</height>
+ <width>858</width>
+ <height>64</height>
</rect>
</property>
<property name="sizePolicy">
@@ -52,12 +52,50 @@
<enum>QLayout::SetMaximumSize</enum>
</property>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0,0">
+ <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0,0,0">
+ <property name="spacing">
+ <number>5</number>
+ </property>
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
+ <number>5</number>
+ </property>
+ <item>
+ <widget class="QToolButton" name="newDirButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../gpgfrontend.qrc">
+ <normaloff>:/icons/new_directory.png</normaloff>:/icons/new_directory.png</iconset>
+ </property>
+ </widget>
+ </item>
<item>
<widget class="QLineEdit" name="pathEdit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="tabletTracking">
<bool>false</bool>
</property>
@@ -70,33 +108,36 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="refreshButton">
+ <widget class="QToolButton" name="refreshButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<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>
+ <normaloff>:/icons/refresh.png</normaloff>:/icons/refresh.png</iconset>
</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>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<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>
+ <normaloff>:/icons/up.png</normaloff>:/icons/up.png</iconset>
</property>
</widget>
</item>
@@ -113,10 +154,10 @@
</property>
<property name="icon">
<iconset resource="../gpgfrontend.qrc">
- <normaloff>:/configure.png</normaloff>:/configure.png</iconset>
+ <normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset>
</property>
<property name="popupMode">
- <enum>QToolButton::MenuButtonPopup</enum>
+ <enum>QToolButton::InstantPopup</enum>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonIconOnly</enum>
@@ -126,84 +167,13 @@
</layout>
</item>
<item>
- <widget class="QTreeView" name="fileTreeView">
- <property name="contextMenuPolicy">
- <enum>Qt::CustomContextMenu</enum>
- </property>
- <property name="acceptDrops">
- <bool>true</bool>
- </property>
- <property name="autoFillBackground">
- <bool>false</bool>
- </property>
- <property name="dragDropMode">
- <enum>QAbstractItemView::InternalMove</enum>
- </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>
+ <layout class="QVBoxLayout" name="trewViewLayout"/>
</item>
</layout>
</item>
</layout>
</item>
</layout>
- <action name="actionOpenFile">
- <property name="text">
- <string>OpenFile</string>
- </property>
- </action>
- <action name="actionRenameFile">
- <property name="text">
- <string>RenameFile</string>
- </property>
- </action>
- <action name="actionDeleteFile">
- <property name="text">
- <string>DeleteFile</string>
- </property>
- </action>
- <action name="actionCalculateHash">
- <property name="text">
- <string>CalculateHash</string>
- </property>
- </action>
- <action name="actionMakeDirectory">
- <property name="text">
- <string>MakeDirectory</string>
- </property>
- </action>
- <action name="actionCreateEmptyFile">
- <property name="text">
- <string>CreateEmptyFile</string>
- </property>
- </action>
- <action name="actionCompressFiles">
- <property name="text">
- <string>CompressFiles</string>
- </property>
- </action>
- <action name="actionOpenWithSystemDefaultApplication">
- <property name="text">
- <string>OpenWithSystemDefaultApplication</string>
- </property>
- <property name="toolTip">
- <string>OpenWithSystemDefaultApplication</string>
- </property>
- </action>
</widget>
<resources>
<include location="../gpgfrontend.qrc"/>
diff --git a/ui/GeneralSettings.ui b/ui/GeneralSettings.ui
index f5f8271b..958b956a 100644
--- a/ui/GeneralSettings.ui
+++ b/ui/GeneralSettings.ui
@@ -25,13 +25,6 @@
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <widget class="QCheckBox" name="saveCheckedKeysCheckBox">
- <property name="text">
- <string>Save checked keys in Key ToolBox on exit and restore them on next start.</string>
- </property>
- </widget>
- </item>
- <item>
<widget class="QCheckBox" name="clearGpgPasswordCacheCheckBox">
<property name="text">
<string>Clear gpg password cache when closing GpgFrontend.</string>
diff --git a/ui/GnuPGInfo.ui b/ui/GnuPGInfo.ui
index efb895af..0ea5385f 100644
--- a/ui/GnuPGInfo.ui
+++ b/ui/GnuPGInfo.ui
@@ -43,7 +43,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="../gpgfrontend.qrc">:/gnupg.png</pixmap>
+ <pixmap resource="../gpgfrontend.qrc">:/icons/gnupg.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
diff --git a/ui/InfoBoard.ui b/ui/InfoBoard.ui
index 1c87974b..9e50505d 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>:/icons/copy.png</normaloff>:/icons/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>:/icons/filesave.png</normaloff>:/icons/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>:/icons/clear.png</normaloff>:/icons/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..afccdcf6 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>:/icons/refresh.png</normaloff>:/icons/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>:/icons/cloud_sync.png</normaloff>:/icons/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>:/icons/total_selection.png</normaloff>:/icons/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>:/icons/none.png</normaloff>:/icons/none.png</iconset>
</property>
</widget>
</item>
@@ -119,6 +147,8 @@
</item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="../gpgfrontend.qrc"/>
+ </resources>
<connections/>
</ui>