From a5aa1b29d5fb9a8a3045ba36fa0de4a0718bed54 Mon Sep 17 00:00:00 2001
From: abdulmajeed ahmed <aalabdulrazzaq@kacst.edu.sa>
Date: Tue, 8 Oct 2013 14:51:40 +0300
Subject: Move WriteDirection buttons to paragraph sidebar fdo#67746

Change-Id: I7a49e1ba9eb08c2fa79b80d572ef86ac5f76b9ca
---
 svx/uiconfig/ui/sidebarparagraph.ui | 210 ++++++++++++++++++++++--------------
 svx/uiconfig/ui/sidebartextpanel.ui |  38 -------
 2 files changed, 130 insertions(+), 118 deletions(-)

(limited to 'svx/uiconfig/ui')

diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index 691ee14b17d1..d702d15f2e57 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -15,86 +15,6 @@
         <property name="row_spacing">6</property>
         <property name="column_spacing">6</property>
         <property name="column_homogeneous">True</property>
-        <child>
-          <object class="GtkToolbar" id="horizontalalignment">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_tooltip">True</property>
-            <property name="tooltip_markup" translatable="yes">Horizontal Alignment</property>
-            <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
-            <property name="halign">start</property>
-            <property name="show_arrow">False</property>
-            <child>
-              <object class="GtkToolButton" id="leftpara">
-                <property name="width_request">25</property>
-                <property name="height_request">25</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Align Left</property>
-                <property name="tooltip_text" translatable="yes">Align Left</property>
-                <property name="valign">start</property>
-                <property name="action_name">.uno:LeftPara</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="centerpara">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Align Center</property>
-                <property name="tooltip_text" translatable="yes">Align Center</property>
-                <property name="action_name">.uno:CenterPara</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="rightpara">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Align Right</property>
-                <property name="tooltip_text" translatable="yes">Align Right</property>
-                <property name="action_name">.uno:RightPara</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="substjustify">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Align Justified</property>
-                <property name="tooltip_text" translatable="yes">Align Justified</property>
-                <property name="action_name">.uno:JustifyPara</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkToolbar" id="verticalalignment">
             <property name="visible">True</property>
@@ -688,6 +608,136 @@
             <property name="height">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkToolbar" id="horizontalalignment">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Horizontal Alignment</property>
+                <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
+                <property name="halign">start</property>
+                <property name="show_arrow">False</property>
+                <child>
+                  <object class="GtkToolButton" id="leftpara">
+                    <property name="width_request">25</property>
+                    <property name="height_request">25</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Align Left</property>
+                    <property name="tooltip_text" translatable="yes">Align Left</property>
+                    <property name="valign">start</property>
+                    <property name="action_name">.uno:LeftPara</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="centerpara">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Align Center</property>
+                    <property name="tooltip_text" translatable="yes">Align Center</property>
+                    <property name="action_name">.uno:CenterPara</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="rightpara">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Align Right</property>
+                    <property name="tooltip_text" translatable="yes">Align Right</property>
+                    <property name="action_name">.uno:RightPara</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="substjustify">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Align Justified</property>
+                    <property name="tooltip_text" translatable="yes">Align Justified</property>
+                    <property name="action_name">.uno:JustifyPara</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sfxlo-SidebarToolBox" id="writedirection">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="show_arrow">False</property>
+                <child>
+                  <object class="GtkToolButton" id="lefttoright">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="is_important">True</property>
+                    <property name="action_name">.uno:ParaLeftToRight</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="righttoleft">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="is_important">True</property>
+                    <property name="action_name">.uno:ParaRightToLeft</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui b/svx/uiconfig/ui/sidebartextpanel.ui
index fd80e27dd6f7..ae9038b2ac3b 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -186,44 +186,6 @@
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="sfxlo-SidebarToolBox" id="writedirection">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="show_arrow">False</property>
-                <child>
-                  <object class="GtkToolButton" id="lefttoright">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="is_important">True</property>
-                    <property name="action_name">.uno:ParaLeftToRight</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="righttoleft">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="is_important">True</property>
-                    <property name="action_name">.uno:ParaRightToLeft</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-              </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>
-- 
cgit