[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - sfx2/source sfx2/uiconfig

[Caolán McNamara]

 sfx2/source/dialog/alienwarn.cxx    |    2 +-
 sfx2/uiconfig/ui/alienwarndialog.ui |   17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit f53eb46109cfef8b2b666add0bed63d46f5eb917
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 8 12:21:36 2014 +0000

    swap button order in ui to match typical reality
    
    This has no effect on the rendering of this .ui as native button ordering is
    active. But it means that under the typical editing-under-GNOME that ones head
    is wrecked from the cognitive impedance of the editor and viewer not matching
    in order
    
    Change-Id: I8888d4263f05bcecff72496f4cf0ae67345dc644
    (cherry picked from commit bce7c9b0688c6f6f73311cc87ac094831489eedb)

diff --git a/sfx2/uiconfig/ui/alienwarndialog.ui b/sfx2/uiconfig/ui/alienwarndialog.ui
index 6513171..0e6141d 100644
--- a/sfx2/uiconfig/ui/alienwarndialog.ui
+++ b/sfx2/uiconfig/ui/alienwarndialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Wed Jan  8 12:08:58 2014 -->
+<!-- Generated with glade 3.16.0 on Wed Jan  8 12:15:41 2014 -->
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkMessageDialog" id="AlienWarnDialog">
@@ -23,14 +23,13 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="save">
-                <property name="label" translatable="yes">_Use %FORMATNAME Format</property>
+              <object class="GtkButton" id="cancel">
+                <property name="label" translatable="yes">Use _ODF Format</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_underline">True</property>
+                <property name="image_position">bottom</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -40,13 +39,14 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="cancel">
-                <property name="label" translatable="yes">Use _ODF Format</property>
+              <object class="GtkButton" id="save">
+                <property name="label" translatable="yes">_Use %FORMATNAME Format</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_underline">True</property>
-                <property name="image_position">bottom</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -82,8 +82,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="1">save</action-widget>
       <action-widget response="0">cancel</action-widget>
+      <action-widget response="1">save</action-widget>
     </action-widgets>
   </object>
 </interface>
commit 99798298f98ae510efb3edc7d28f8149d281439f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 8 12:14:04 2014 +0000

    tweak button order for alien warn dialog
    
    Change-Id: I6e51951df3bff0d1829bff8e2a436e4030247baf
    (cherry picked from commit 2e8a1e1121bc23d442bf7be27e2ae6c15d101980)

diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 0ec75af..ad5290e 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -28,7 +28,7 @@ SfxAlienWarningDialog::SfxAlienWarningDialog(Window* pParent, const OUString& _r
     : MessageDialog(pParent, "AlienWarnDialog", "sfx/ui/alienwarndialog.ui")
 {
     get(m_pWarningOnBox, "ask");
-    get(m_pKeepCurrentBtn, "ok");
+    get(m_pKeepCurrentBtn, "save");
 
     // replace formatname (text)
     OUString sInfoText = get_primary_text();
diff --git a/sfx2/uiconfig/ui/alienwarndialog.ui b/sfx2/uiconfig/ui/alienwarndialog.ui
index 5975d10..6513171 100644
--- a/sfx2/uiconfig/ui/alienwarndialog.ui
+++ b/sfx2/uiconfig/ui/alienwarndialog.ui
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Jan  8 12:08:58 2014 -->
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkMessageDialog" id="AlienWarnDialog">
@@ -22,7 +23,7 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="ok">
+              <object class="GtkButton" id="save">
                 <property name="label" translatable="yes">_Use %FORMATNAME Format</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -81,7 +82,7 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="1">ok</action-widget>
+      <action-widget response="1">save</action-widget>
       <action-widget response="0">cancel</action-widget>
     </action-widgets>
   </object>