[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - cui/uiconfig
Caolán McNamara
caolanm at redhat.com
Sun Nov 23 00:15:57 PST 2014
cui/uiconfig/ui/areatabpage.ui | 194 +++++++++++++++++--------------------
cui/uiconfig/ui/eventassignpage.ui | 35 +++++-
2 files changed, 122 insertions(+), 107 deletions(-)
New commits:
commit 298ca08e3f1d264e7abdf34eef52e7a8e83b2465
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 15 17:05:35 2014 +0000
Resolves: fdo#86222 hard-coded pixel dimensions are too high/wide
Change-Id: Ie6183a7e78b671a2d126127e4fcaa3b353d8a324
(cherry picked from commit a6db5e6a2a2ac7f92e6d15669693d991c9460998)
Related: fdo#86222 rework area graphic fill page for better height
(cherry picked from commit d7402886d42035873e7d7cb3a30582e9001217bf)
Conflicts:
cui/uiconfig/ui/areatabpage.ui
Change-Id: Ibd8e68a5a2ebd6ac2a829004c8918f9a449ef5d7
Reviewed-on: https://gerrit.libreoffice.org/12461
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/cui/uiconfig/ui/areatabpage.ui b/cui/uiconfig/ui/areatabpage.ui
index 96f2912..5d1c2c9 100644
--- a/cui/uiconfig/ui/areatabpage.ui
+++ b/cui/uiconfig/ui/areatabpage.ui
@@ -374,6 +374,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
+ <property name="homogeneous">True</property>
<child>
<object class="GtkBox" id="boxORIGINAL">
<property name="visible">True</property>
@@ -542,38 +543,11 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box3">
+ <object class="svxlo-SvxRectCtl" id="CTL_POSITION">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="svxlo-SvxRectCtl" id="CTL_POSITION">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="halign">start</property>
+ <property name="valign">start</property>
</object>
<packing>
<property name="expand">False</property>
@@ -585,32 +559,45 @@
<object class="GtkGrid" id="gridOFFSET">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
<property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
<child>
- <object class="GtkLabel" id="FT_Y_OFFSET">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Y Offset</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">MTR_FLD_Y_SIZE:0.00cm</property>
- </object>
- <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>
- <object class="GtkLabel" id="FT_X_OFFSET">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_X Offset</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">MTR_FLD_X_SIZE:0.00cm</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_X_OFFSET">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_X Offset</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MTR_FLD_X_SIZE:0.00cm</property>
+ </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="GtkSpinButton" id="MTR_FLD_X_OFFSET:0%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">adjustment2</property>
+ </object>
+ <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>
</object>
<packing>
<property name="left_attach">0</property>
@@ -620,12 +607,43 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="MTR_FLD_X_OFFSET:0%">
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment2</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_Y_OFFSET">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Y Offset</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MTR_FLD_Y_SIZE:0.00cm</property>
+ </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="GtkSpinButton" id="MTR_FLD_Y_OFFSET:0%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="invisible_char">•</property>
+ <property name="text" translatable="yes">0</property>
+ <property name="adjustment">adjustment2</property>
+ </object>
+ <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>
</object>
<packing>
<property name="left_attach">1</property>
@@ -634,21 +652,6 @@
<property name="height">1</property>
</packing>
</child>
- <child>
- <object class="GtkSpinButton" id="MTR_FLD_Y_OFFSET:0%">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -742,8 +745,9 @@
<object class="GtkGrid" id="gridOFFSET2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
+ <property name="row_spacing">1</property>
<property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
<child>
<object class="GtkRadioButton" id="RBT_ROW">
<property name="label" translatable="yes">Ro_w</property>
@@ -754,7 +758,6 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">RBT_COLUMN</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -764,42 +767,39 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="RBT_COLUMN">
- <property name="label" translatable="yes">Colu_mn</property>
+ <object class="GtkSpinButton" id="MTR_FLD_OFFSET:0%">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">RBT_ROW</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="invisible_char">•</property>
+ <property name="text" translatable="yes">0</property>
+ <property name="adjustment">adjustment2</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="MTR_FLD_OFFSET:0%">
+ <object class="GtkRadioButton" id="RBT_COLUMN">
+ <property name="label" translatable="yes">Colu_mn</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment2</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RBT_ROW</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -883,12 +883,4 @@
<widget name="gridX_Y"/>
</widgets>
</object>
- <object class="GtkSizeGroup" id="sizegroup3">
- <widgets>
- <widget name="FT_Y_OFFSET"/>
- <widget name="FT_X_OFFSET"/>
- <widget name="RBT_ROW"/>
- <widget name="RBT_COLUMN"/>
- </widgets>
- </object>
</interface>
diff --git a/cui/uiconfig/ui/eventassignpage.ui b/cui/uiconfig/ui/eventassignpage.ui
index 1122bfc..75d1adf 100644
--- a/cui/uiconfig/ui/eventassignpage.ui
+++ b/cui/uiconfig/ui/eventassignpage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Thu Jan 23 11:55:04 2014 -->
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkGrid" id="EventAssignPage">
<property name="visible">True</property>
@@ -14,21 +14,25 @@
<object class="GtkFrame" id="macroframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="cuilo-SfxConfigFunctionListBox" id="macros:border">
- <property name="width_request">280</property>
- <property name="height_request">300</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Tree List-selection"/>
</child>
@@ -59,21 +63,25 @@
<object class="GtkFrame" id="groupframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="cuilo-SfxConfigGroupListBox" id="libraries:border">
- <property name="width_request">280</property>
- <property name="height_request">300</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library List-selection"/>
</child>
@@ -112,18 +120,25 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child>
<object class="cuilo-MacroEventListBox" id="assignments:border">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Macro EventListBox-selection1"/>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -243,4 +258,12 @@
<widget name="groupframe"/>
</widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup2">
+ <property name="mode">vertical</property>
+ <widgets>
+ <widget name="macros:border"/>
+ <widget name="libraries:border"/>
+ <widget name="assignments:border"/>
+ </widgets>
+ </object>
</interface>
More information about the Libreoffice-commits
mailing list