summaryrefslogtreecommitdiff
path: root/resources/ui
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-10-04 13:00:55 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-10-04 13:00:55 +0200
commite9b06dcd5df3f22bc3a7acd5c57a4bfdf4ef38f5 (patch)
tree6e9494073395f49fb3eec61d2c5ae40f5f3de2af /resources/ui
parent19fe9cfe9a84ba453271d8d8e32f4aa9fe2be14e (diff)
parent7556967bf57453d412a8f18633599f38806f8620 (diff)
Merge tag 'upstream/0.6.7'
Upstream version 0.6.7
Diffstat (limited to 'resources/ui')
-rw-r--r--resources/ui/pie_options.ui4
-rw-r--r--resources/ui/preferences.ui27
-rw-r--r--resources/ui/slice_select.ui92
3 files changed, 109 insertions, 14 deletions
diff --git a/resources/ui/pie_options.ui b/resources/ui/pie_options.ui
index cc95f8f..0e0820b 100644
--- a/resources/ui/pie_options.ui
+++ b/resources/ui/pie_options.ui
@@ -49,7 +49,7 @@
</object>
<object class="GtkDialog" id="window">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Activation Settings</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
@@ -60,6 +60,7 @@
<property name="width_request">350</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -109,7 +110,6 @@
<object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
diff --git a/resources/ui/preferences.ui b/resources/ui/preferences.ui
index cd9879e..866836d 100644
--- a/resources/ui/preferences.ui
+++ b/resources/ui/preferences.ui
@@ -304,7 +304,7 @@
<object class="GtkImage" id="import_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">document-open</property>
+ <property name="icon_name">list-add-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
@@ -316,6 +316,27 @@
</packing>
</child>
<child>
+ <object class="GtkButton" id="theme-delete-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Delete the selected theme.</property>
+ <child>
+ <object class="GtkImage" id="delete_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">list-remove-symbolic</property>
+ <property name="icon_size">1</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkButton" id="theme-export-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -325,7 +346,7 @@
<object class="GtkImage" id="export_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">document-save-as</property>
+ <property name="icon_name">document-save-as-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
@@ -333,7 +354,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
diff --git a/resources/ui/slice_select.ui b/resources/ui/slice_select.ui
index 27559ad..14f5bd3 100644
--- a/resources/ui/slice_select.ui
+++ b/resources/ui/slice_select.ui
@@ -16,6 +16,7 @@
<property name="height_request">450</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -62,7 +63,6 @@
<object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
@@ -344,20 +344,55 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="quick-action-checkbutton">
- <property name="use_action_appearance">False</property>
+ <object class="GtkSwitch" id="quick-action-checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">This Slice will be executed when you click in the middle of the Pie.</property>
- <property name="tooltip_text" translatable="yes">This Slice will be executed when you click in the middle of the Pie.</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="clipboard-box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="label" translatable="yes">Clipboard history length</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="clipboard-scale">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="fill_level">24</property>
+ <property name="round_digits">1</property>
+ <property name="digits">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -365,7 +400,46 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="workspace-only-box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Current workspace only</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="workspace-only-checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">8</property>
</packing>
</child>
</object>