Merge Upstream Release

5 files changed, 9 insertions, 6 deletions

diff --git a/resources/ui/icon_select.ui b/resources/ui/icon_select.ui
index b39ea2a..3aae9f7 100644
--- a/resources/ui/icon_select.ui
+++ b/resources/ui/icon_select.ui
@@ -6,7 +6,7 @@
     <property name="height_request">425</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Select an icon</property>
-    <property name="resizable">False</property>
+    <property name="resizable">True</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
diff --git a/resources/ui/preferences.ui b/resources/ui/preferences.ui
index 8ee988c..d6a5686 100644
--- a/resources/ui/preferences.ui
+++ b/resources/ui/preferences.ui
@@ -6,7 +6,7 @@
     <property name="height_request">475</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Gnome-Pie Settings</property>
-    <property name="resizable">False</property>
+    <property name="resizable">True</property>
     <property name="window_position">center</property>
     <property name="has_resize_grip">False</property>
     <child>
@@ -260,7 +260,7 @@
                                     <property name="ypad">6</property>
                                     <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt;This Pie is empty!&lt;/big&gt;
 
-Start adding Slices to it!&lt;/b&gt; This can be done by dragging stuff to the plus sign below. You can try a lot! For example application launchers or folders. Even URLs from your browser are possible... 
+Start adding Slices to it!&lt;/b&gt; This can be done by dragging stuff to the plus sign below. You can try a lot! For example application launchers or folders. Even URLs from your browser are possible...
 
 For manual and advanced configuration click on the plus sign.</property>
                                     <property name="use_markup">True</property>
diff --git a/resources/ui/settings.ui b/resources/ui/settings.ui
index 77e3403..21d1fb5 100644
--- a/resources/ui/settings.ui
+++ b/resources/ui/settings.ui
@@ -7,7 +7,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">General Settings</property>
-    <property name="resizable">False</property>
+    <property name="resizable">True</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
diff --git a/resources/ui/slice_select.ui b/resources/ui/slice_select.ui
index 6ea5087..c09adac 100644
--- a/resources/ui/slice_select.ui
+++ b/resources/ui/slice_select.ui
@@ -4,10 +4,12 @@
   <object class="GtkDialog" id="window">
     <property name="width_request">550</property>
     <property name="height_request">450</property>
+    <property name="default_width">550</property>
+    <property name="default_height">450</property>
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Slice Options</property>
-    <property name="resizable">False</property>
+    <property name="resizable">True</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
diff --git a/resources/ui/trigger_select.ui b/resources/ui/trigger_select.ui
index 9967997..6ffa4a7 100644
--- a/resources/ui/trigger_select.ui
+++ b/resources/ui/trigger_select.ui
@@ -3,10 +3,11 @@
   <requires lib="gtk+" version="2.20"/>
   <object class="GtkDialog" id="window">
     <property name="width_request">350</property>
+    <property name="default_width">350</property>
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Activation Settings</property>
-    <property name="resizable">False</property>
+    <property name="resizable">True</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>