Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2017-01-24 12:16:10 +0300
committerMarkus Goetz <markus@woboq.com>2017-01-27 17:59:59 +0300
commitf854c5263beaf2932938e9cab70e286aeb14a7a5 (patch)
tree159216609d4eb3e624cb998d41405c738b2acefd /src/gui/generalsettings.ui
parent70da607e06f95458aa801a1cd368c9c75687a049 (diff)
Wizard: Add options to ask confirmation for external storage
Added two checkboxes in the Account Wizard in the advanced page to change the first options. Also added a checkbox in the general settings to ask for confirmation for external storages. Theme options allow to hide the checkboxes in the wizard. As described in issue #5340
Diffstat (limited to 'src/gui/generalsettings.ui')
-rw-r--r--src/gui/generalsettings.ui55
1 files changed, 31 insertions, 24 deletions
diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui
index 4bc4b9958..06b7aa034 100644
--- a/src/gui/generalsettings.ui
+++ b/src/gui/generalsettings.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>706</width>
+ <width>785</width>
<height>523</height>
</rect>
</property>
@@ -53,13 +53,6 @@
<string>Advanced</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QPushButton" name="ignoredFilesButton">
- <property name="text">
- <string>Edit &amp;Ignored Files</string>
- </property>
- </widget>
- </item>
<item row="0" column="1" colspan="2">
<spacer name="horizontalSpacer_4">
<property name="orientation">
@@ -73,12 +66,25 @@
</property>
</spacer>
</item>
+ <item row="3" column="0" colspan="2">
+ <widget class="QCheckBox" name="crashreporterCheckBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>S&amp;how crash reporter</string>
+ </property>
+ </widget>
+ </item>
<item row="1" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QCheckBox" name="newFolderLimitCheckBox">
<property name="text">
- <string>Ask &amp;confirmation before downloading folders larger than</string>
+ <string>Ask for confirmation before synchronizing folders larger than</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -98,7 +104,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
- <string>MB</string>
+ <string extracomment="Trailing part of &quot;Ask confirmation before syncing folder larger than&quot; ">MB</string>
</property>
</widget>
</item>
@@ -117,20 +123,7 @@
</item>
</layout>
</item>
- <item row="2" column="0" colspan="2">
- <widget class="QCheckBox" name="crashreporterCheckBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>S&amp;how crash reporter</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
+ <item row="3" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<spacer name="horizontalSpacer_5">
@@ -147,6 +140,20 @@
</item>
</layout>
</item>
+ <item row="0" column="0">
+ <widget class="QPushButton" name="ignoredFilesButton">
+ <property name="text">
+ <string>Edit &amp;Ignored Files</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="3">
+ <widget class="QCheckBox" name="newExternalStorage">
+ <property name="text">
+ <string>Ask for confirmation before synchronizing external storages</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>