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

[Caolán McNamara]

 cui/UIConfig_cui.mk                   |    1 
 cui/source/dialogs/SpellDialog.cxx    |    2 
 cui/uiconfig/ui/spelloptionsdialog.ui |   81 ++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)

New commits:
commit d517ac379f0fa6ee77bdbb3940c6ffb840032c0b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 4 12:17:21 2013 +0000

    Related: fdo#72258 re-orient dialog vertically
    
    Change-Id: I9f703e2ab5c787641e9cc62f223f39dbd5d02529
    (cherry picked from commit cce14c9717e3c21a61bbd4ce620d17fa23feafa2)

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index d985912..3f78962 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -125,6 +125,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/slantcornertabpage \
 	cui/uiconfig/ui/specialcharacters \
 	cui/uiconfig/ui/spellingdialog \
+	cui/uiconfig/ui/spelloptionsdialog \
 	cui/uiconfig/ui/splitcellsdialog \
 	cui/uiconfig/ui/storedwebconnectiondialog \
 	cui/uiconfig/ui/swpossizepage \
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 5264750..5eb92a3 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -503,7 +503,7 @@ void SpellDialog::StartSpellOptDlg_Impl()
     SfxItemSet aSet( SFX_APP()->GetPool(), aSpellInfos);
     aSet.Put(SfxSpellCheckItem( xSpell, SID_ATTR_SPELL ));
     SfxSingleTabDialog* pDlg =
-        new SfxSingleTabDialog(this, aSet);
+        new SfxSingleTabDialog(this, aSet, "SpellOptionsDialog", "cui/ui/spelloptionsdialog.ui");
     SfxTabPage* pPage = SvxLinguTabPage::Create( pDlg->get_content_area(), aSet );
     ( (SvxLinguTabPage*)pPage )->HideGroups( GROUP_MODULES );
     pDlg->setTabPage( pPage );
diff --git a/cui/uiconfig/ui/spelloptionsdialog.ui b/cui/uiconfig/ui/spelloptionsdialog.ui
new file mode 100644
index 0000000..1d013cd
--- /dev/null
+++ b/cui/uiconfig/ui/spelloptionsdialog.ui
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkDialog" id="SpellOptionsDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Options</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</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_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">ok</action-widget>
+      <action-widget response="0">cancel</action-widget>
+      <action-widget response="0">help</action-widget>
+    </action-widgets>
+  </object>
+</interface>