[Libreoffice-commits] core.git: cui/uiconfig
Adolfo Jayme Barrientos
fitojb at ubuntu.com
Mon Dec 1 01:21:50 PST 2014
cui/uiconfig/ui/cuiimapdlg.ui | 2
cui/uiconfig/ui/messbox.ui | 6
cui/uiconfig/ui/optionsdialog.ui | 1
cui/uiconfig/ui/optviewpage.ui | 1
cui/uiconfig/ui/shadowtabpage.ui | 2
cui/uiconfig/ui/specialcharacters.ui | 3
cui/uiconfig/ui/textanimtabpage.ui | 338 ++++++++++++++++-------------------
7 files changed, 166 insertions(+), 187 deletions(-)
New commits:
commit 38019e7c75102ab1a64c073ecea337ac3d04440a
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date: Sun Nov 30 00:33:18 2014 -0600
cui: More HIG fixes
Change-Id: I6e4c746de6c9393784ab831a39c3f19f0f380c07
Reviewed-on: https://gerrit.libreoffice.org/13204
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/uiconfig/ui/cuiimapdlg.ui b/cui/uiconfig/ui/cuiimapdlg.ui
index 8232d3b..355db5b 100644
--- a/cui/uiconfig/ui/cuiimapdlg.ui
+++ b/cui/uiconfig/ui/cuiimapdlg.ui
@@ -80,7 +80,7 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkBox" id="box6">
<property name="visible">True</property>
diff --git a/cui/uiconfig/ui/messbox.ui b/cui/uiconfig/ui/messbox.ui
index 0c09263..29913a9 100644
--- a/cui/uiconfig/ui/messbox.ui
+++ b/cui/uiconfig/ui/messbox.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="MessBox">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -10,7 +11,7 @@
<object class="GtkBox" id="dialog-vbox6">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">24</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area6">
<property name="can_focus">False</property>
@@ -71,6 +72,7 @@
<child>
<object class="GtkImage" id="mess_box_image">
<property name="can_focus">False</property>
+ <property name="halign">center</property>
<property name="valign">center</property>
<property name="stock">gtk-missing-image</property>
</object>
diff --git a/cui/uiconfig/ui/optionsdialog.ui b/cui/uiconfig/ui/optionsdialog.ui
index 43c0af1..e40815b 100644
--- a/cui/uiconfig/ui/optionsdialog.ui
+++ b/cui/uiconfig/ui/optionsdialog.ui
@@ -23,6 +23,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="spacing">6</property>
<child>
<object class="svtlo-SvTreeListBox" id="pages:border">
<property name="visible">True</property>
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 9ae54b3..a81d736 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -400,7 +400,6 @@
<object class="GtkComboBoxText" id="iconstyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
<property name="hexpand">True</property>
<items>
<item translatable="yes">Automatic</item>
diff --git a/cui/uiconfig/ui/shadowtabpage.ui b/cui/uiconfig/ui/shadowtabpage.ui
index b31e11d..de63629 100644
--- a/cui/uiconfig/ui/shadowtabpage.ui
+++ b/cui/uiconfig/ui/shadowtabpage.ui
@@ -151,6 +151,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
+ <property name="left_padding">12</property>
<child>
<object class="GtkLabel" id="FT_TRANSPARENT">
<property name="visible">True</property>
@@ -171,6 +172,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
+ <property name="left_padding">12</property>
<child>
<object class="GtkLabel" id="FT_SHADOW_COLOR">
<property name="visible">True</property>
diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui
index ae3bbfc..f7356ab 100644
--- a/cui/uiconfig/ui/specialcharacters.ui
+++ b/cui/uiconfig/ui/specialcharacters.ui
@@ -77,6 +77,7 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
@@ -178,7 +179,7 @@
</child>
<child>
<object class="svxlo-SvxShowCharSet" id="showcharset">
- <property name="width_request">600</property>
+ <property name="width_request">580</property>
<property name="height_request">250</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
diff --git a/cui/uiconfig/ui/textanimtabpage.ui b/cui/uiconfig/ui/textanimtabpage.ui
index f3058fc..971f616 100644
--- a/cui/uiconfig/ui/textanimtabpage.ui
+++ b/cui/uiconfig/ui/textanimtabpage.ui
@@ -74,220 +74,194 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="FL_EFFECT">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">18</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="halign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="FT_EFFECTS">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">E_ffect:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_EFFECT</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="LB_EFFECT">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="model">liststoreEFFECT</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</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="GtkBox" id="boxDIRECTION">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkLabel" id="FT_DIRECTION">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Direction:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">grid1</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="spacing">18</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkButton" id="BTN_UP">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_EFFECTS">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">E_ffect:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_EFFECT</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">To top</property>
+ <property name="tooltip_text" translatable="yes">To top</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="image">imageUP</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_UP-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Up</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <object class="GtkComboBox" id="LB_EFFECT">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="model">liststoreEFFECT</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="BTN_RIGHT">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">To right</property>
+ <property name="tooltip_text" translatable="yes">To right</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="image">imageRIGHT</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_RIGHT-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Right</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="boxDIRECTION">
+ <object class="GtkButton" id="BTN_LEFT">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">To left</property>
+ <property name="tooltip_text" translatable="yes">To left</property>
+ <property name="halign">center</property>
<property name="hexpand">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_DIRECTION">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Direction:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">grid1</property>
+ <property name="image">imageLEFT</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_LEFT-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Left</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">3</property>
- <child>
- <object class="GtkButton" id="BTN_UP">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">To top</property>
- <property name="tooltip_text" translatable="yes">To top</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="image">imageUP</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_UP-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Up</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="BTN_RIGHT">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">To right</property>
- <property name="tooltip_text" translatable="yes">To right</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="image">imageRIGHT</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_RIGHT-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Right</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="BTN_LEFT">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">To left</property>
- <property name="tooltip_text" translatable="yes">To left</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="image">imageLEFT</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_LEFT-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Left</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="BTN_DOWN">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">To bottom</property>
- <property name="tooltip_text" translatable="yes">To bottom</property>
- <property name="halign">center</property>
- <property name="hexpand">True</property>
- <property name="image">imageDOWN</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_DOWN-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Down</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="BTN_DOWN">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">To bottom</property>
+ <property name="tooltip_text" translatable="yes">To bottom</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="image">imageDOWN</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_DOWN-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Down</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Text Animation Effects</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
More information about the Libreoffice-commits
mailing list