[Libreoffice-commits] core.git: cui/source cui/uiconfig
Yousuf Philips
philipz85 at hotmail.com
Tue Sep 13 13:58:56 UTC 2016
cui/source/tabpages/frmdirlbox.src | 4 +--
cui/source/tabpages/paragrph.cxx | 2 -
cui/uiconfig/ui/paragalignpage.ui | 45 +++++++++----------------------------
3 files changed, 15 insertions(+), 36 deletions(-)
New commits:
commit a2d48a4eef92cf3b7a62c6bd6601337a01848b9d
Author: Yousuf Philips <philipz85 at hotmail.com>
Date: Sun Sep 4 08:07:09 2016 +0400
Adjust controls in sw paragraph dialog alignment tab
Change-Id: I87a07d9cd1c4ec3edb4022c4ed3a42c8a891acc0
Reviewed-on: https://gerrit.libreoffice.org/28656
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/source/tabpages/frmdirlbox.src b/cui/source/tabpages/frmdirlbox.src
index 2ae96d3..e2470a6 100644
--- a/cui/source/tabpages/frmdirlbox.src
+++ b/cui/source/tabpages/frmdirlbox.src
@@ -23,12 +23,12 @@
String RID_SVXSTR_FRAMEDIR_LTR
{
- Text [ en-US ] = "Left-to-right";
+ Text [ en-US ] = "Left-to-right (LTR)";
};
String RID_SVXSTR_FRAMEDIR_RTL
{
- Text [ en-US ] = "Right-to-left";
+ Text [ en-US ] = "Right-to-left (RTL)";
};
String RID_SVXSTR_FRAMEDIR_SUPER
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 5163fc6..de32a15 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1050,9 +1050,9 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet
m_pLastLineLB->SetSelectHdl( LINK( this, SvxParaAlignTabPage, LastLineHdl_Impl ) );
m_pTextDirectionLB->SetSelectHdl( LINK( this, SvxParaAlignTabPage, TextDirectionHdl_Impl ) );
+ m_pTextDirectionLB->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
m_pTextDirectionLB->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP );
m_pTextDirectionLB->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP );
- m_pTextDirectionLB->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT );
setPreviewsToSamePlace(pParent, this);
}
diff --git a/cui/uiconfig/ui/paragalignpage.ui b/cui/uiconfig/ui/paragalignpage.ui
index 5ac0b49..b94b73d 100644
--- a/cui/uiconfig/ui/paragalignpage.ui
+++ b/cui/uiconfig/ui/paragalignpage.ui
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <!-- interface-requires LibreOffice 1.0 -->
+ <requires lib="gtk+" version="3.0"/>
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkListStore" id="liststoreLB_LASTLINE">
<columns>
<!-- column-name gchararray1 -->
@@ -90,8 +91,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -130,8 +129,6 @@
<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>
@@ -148,8 +145,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -167,8 +162,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -185,8 +178,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -195,7 +186,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_left">22</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
@@ -204,8 +195,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -214,7 +203,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="margin_left">12</property>
+ <property name="margin_left">22</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -222,8 +211,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -235,16 +222,18 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">13</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="labelLB_LASTLINE">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
- <property name="xalign">0</property>
+ <property name="vexpand">True</property>
<property name="label" translatable="yes">_Last line:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">comboLB_LASTLINE</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -275,8 +264,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -313,8 +300,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">7</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -335,8 +320,6 @@
<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>
@@ -360,10 +343,11 @@
<object class="GtkLabel" id="labelFT_VERTALIGN">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="margin_right">12</property>
<property name="label" translatable="yes">_Alignment:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">comboLB_VERTALIGN</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -401,8 +385,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -426,10 +408,11 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="margin_right">12</property>
<property name="label" translatable="yes">_Text direction:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">comboLB_TEXTDIRECTION</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -468,16 +451,12 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">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>
More information about the Libreoffice-commits
mailing list