summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElvis Angelaccio <elvis.angelaccio@kde.org>2016-11-17 18:26:31 (GMT)
committerElvis Angelaccio <elvis.angelaccio@kde.org>2016-11-17 18:26:31 (GMT)
commit5e3906ccf56dc54d373970fddae66fcdc35047b0 (patch)
treec6dcc4c7849b8cad8155d243333542b1eacd0428
parent1caeff2b888dbff865bd8c879e21b10f10aec940 (diff)
Move defaultOpenAction to General Settings page
This setting is about the default double-click behavior, so does not really belong to the Preview page. BUG: 357658 FIXED-IN: 16.12.0 Differential Revision: D3381
-rw-r--r--kerfuffle/ark.kcfg16
-rw-r--r--kerfuffle/generalsettings.ui43
-rw-r--r--kerfuffle/previewsettings.ui58
3 files changed, 51 insertions, 66 deletions
diff --git a/kerfuffle/ark.kcfg b/kerfuffle/ark.kcfg
index 2e8d2f4..2910cf7 100644
--- a/kerfuffle/ark.kcfg
+++ b/kerfuffle/ark.kcfg
@@ -9,6 +9,14 @@
<label>Whether to show a warning when creating zip archives with AES encryption.</label>
<default>true</default>
</entry>
+ <entry name="defaultOpenAction" type="Enum">
+ <label>Default action when opening archive entries.</label>
+ <choices>
+ <choice name="Preview"/>
+ <choice name="Open"/>
+ </choices>
+ <default>Preview</default>
+ </entry>
</group>
<group name="Extraction">
<entry name="openDestinationFolderAfterExtraction" type="Bool">
@@ -39,14 +47,6 @@
</entry>
</group>
<group name="Preview">
- <entry name="defaultOpenAction" type="Enum">
- <label>Default action when opening archive entries.</label>
- <choices>
- <choice name="Preview"/>
- <choice name="Open"/>
- </choices>
- <default>Preview</default>
- </entry>
<entry name="limitPreviewFileSize" type="Bool">
<label>Whether to limit the preview according to file size.</label>
<default>true</default>
diff --git a/kerfuffle/generalsettings.ui b/kerfuffle/generalsettings.ui
index 7cdd529..95e6829 100644
--- a/kerfuffle/generalsettings.ui
+++ b/kerfuffle/generalsettings.ui
@@ -12,6 +12,49 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>When clicking a file in an archive or pressing the Return key:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="kcfg_defaultOpenAction">
+ <property name="title">
+ <string/>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QRadioButton" name="radioButton">
+ <property name="text">
+ <string>Pre&amp;view the file with internal previewer</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioButton_2">
+ <property name="text">
+ <string>Ope&amp;n the file with associated application</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QCheckBox" name="kcfg_showEncryptionWarning">
<property name="text">
<string>Show a warning when creating zip archives with AES encryption</string>
diff --git a/kerfuffle/previewsettings.ui b/kerfuffle/previewsettings.ui
index b2430fd..64852e6 100644
--- a/kerfuffle/previewsettings.ui
+++ b/kerfuffle/previewsettings.ui
@@ -12,64 +12,6 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>When clicking a file in an archive or pressing the Return key:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="kcfg_defaultOpenAction">
- <property name="title">
- <string/>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- <property name="checkable">
- <bool>false</bool>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <widget class="QRadioButton" name="Preview">
- <property name="text">
- <string>Pre&amp;view the file with internal previewer</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="Open">
- <property name="text">
- <string>Ope&amp;n the file with associated application</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="Line" name="line">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="kcfg_limitPreviewFileSize">