move .ui to be consistent with the other ones

set one button as the default one
set the ??? placeholder texts as not for translation

Change-Id: I71928318e762c1e331a90b9bc865bca3dca56423

2 files changed, 59 insertions, 47 deletions

diff --git a/svx/UI_svx.mk b/svx/UI_svx.mk
index b7c3bb9316b8..ae1ccf87cea8 100644
--- a/svx/UI_svx.mk
+++ b/svx/UI_svx.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_UI_UI,svx))
 
 $(eval $(call gb_UI_add_uifiles,svx,\
-	svx/source/dialog/compressgraphicdialog \
+	svx/uiconfig/ui/compressgraphicdialog \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/svx/source/dialog/compressgraphicdialog.ui b/svx/uiconfig/ui/compressgraphicdialog.ui
index baaf5ea27a1c..dc0ef3214df8 100644
--- a/svx/source/dialog/compressgraphicdialog.ui
+++ b/svx/uiconfig/ui/compressgraphicdialog.ui
@@ -1,47 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkAdjustment" id="compression-adjustment">
-    <property name="lower">1</property>
-    <property name="upper">9</property>
-    <property name="value">9</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">1</property>
-  </object>
-  <object class="GtkAdjustment" id="height-adjustment">
-    <property name="lower">1</property>
-    <property name="upper">20000</property>
-    <property name="value">1</property>
-    <property name="step_increment">100</property>
-    <property name="page_increment">100</property>
-  </object>
-  <object class="GtkListStore" id="interpolation-method-store">
-    <columns>
-      <!-- column-name scale-method-name -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">None</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Bilinear</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Bicubic</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Lanczos</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkAdjustment" id="quality-adjustment">
-    <property name="lower">1</property>
-    <property name="upper">99</property>
-    <property name="value">90</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkDialog" id="CompressGraphicDialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -58,10 +17,13 @@
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -73,10 +35,11 @@
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -141,7 +104,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">???</property>
+                                <property name="label">???</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -201,7 +164,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">???</property>
+                                <property name="label">???</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -216,7 +179,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">???</property>
+                                <property name="label">???</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -231,7 +194,7 @@
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">???</property>
+                                <property name="label">???</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -243,9 +206,11 @@
                             <child>
                               <object class="GtkButton" id="calculate">
                                 <property name="label">Calculate</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -286,9 +251,11 @@
                 <child>
                   <object class="GtkRadioButton" id="radio-lossless">
                     <property name="label" translatable="yes">Lossless Compression</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="xalign">0</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
@@ -303,9 +270,11 @@
                 <child>
                   <object class="GtkCheckButton" id="checkbox-reduce-resolution">
                     <property name="label" translatable="yes">Reduce Image Resolution</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -366,9 +335,11 @@
                 <child>
                   <object class="GtkRadioButton" id="radio-jpeg">
                     <property name="label" translatable="yes">JPEG Compression</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                     <property name="group">radio-lossless</property>
@@ -608,6 +579,47 @@
       <action-widget response="0">cancel</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkAdjustment" id="compression-adjustment">
+    <property name="lower">1</property>
+    <property name="upper">9</property>
+    <property name="value">9</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="height-adjustment">
+    <property name="lower">1</property>
+    <property name="upper">20000</property>
+    <property name="value">1</property>
+    <property name="step_increment">100</property>
+    <property name="page_increment">100</property>
+  </object>
+  <object class="GtkListStore" id="interpolation-method-store">
+    <columns>
+      <!-- column-name scale-method-name -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Bilinear</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Bicubic</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Lanczos</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkAdjustment" id="quality-adjustment">
+    <property name="lower">1</property>
+    <property name="upper">99</property>
+    <property name="value">90</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkAdjustment" id="width-adjustment">
     <property name="lower">1</property>
     <property name="upper">20000</property>