cui/uiconfig/ui/colorpage.ui | 28 ++++++++++++++++++++++------
uui/source/fltdlg.src | 2 +-
2 files changed, 23 insertions(+), 7 deletions(-)
New commits:
commit 613036b5a13d24eec395d32a0b5e9bfeb1197c14
Author: Herbert Dürr <h...@apache.org>
Date: Thu Jul 4 14:50:22 2013 +0000
Resolves: #i55152# the listbox in the filter selection dialog should be
sorted
(cherry picked from commit 47fc3a3278a7aac0ba2d8f47eb10a83c0a5f40c7)
Change-Id: I07215bb62dbedcb2d9baa0fd6d66a3ebe30f540e
diff --git a/uui/source/fltdlg.src b/uui/source/fltdlg.src
index a64b65b..3379f8c 100644
--- a/uui/source/fltdlg.src
+++ b/uui/source/fltdlg.src
@@ -45,7 +45,7 @@ ModalDialog DLG_FILTER_SELECT
Pos = MAP_APPFONT ( 6 , 19 ) ;
Size = MAP_APPFONT ( 182 , 175 ) ;
TabStop = TRUE ;
- Sort = FALSE ;
+ Sort = TRUE ;
AutoHScroll = TRUE;
};
commit 77de9a5ec5f234120a967fc003cd018e803e1afd
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jul 4 21:17:17 2013 +0100
tweak so buttons don't take on height of the combined extra load/save
widgets
Change-Id: Idc294a90f97cf1ae70109a04ad9963fe1e867f78
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 4a16e76..3481d58 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -204,15 +205,15 @@
<property name="halign">end</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
- <items>
- <item translatable="yes">RGB</item>
- <item translatable="yes">CMYK</item>
- </items>
<child internal-child="accessible">
<object class="AtkObject" id="modellb-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes">Color Mode</property>
</object>
</child>
+ <items>
+ <item translatable="yes">RGB</item>
+ <item translatable="yes">CMYK</item>
+ </items>
</object>
<packing>
<property name="left_attach">1</property>
@@ -559,6 +560,7 @@
<property name="tooltip_markup"
translatable="yes">Load Color List</property>
<property name="tooltip_text"
translatable="yes">Load Color List</property>
<property name="halign">center</property>
+ <property name="valign">end</property>
<property name="hexpand">True</property>
<property name="image">image1</property>
</object>
@@ -578,6 +580,7 @@
<property name="tooltip_markup"
translatable="yes">Save Color List</property>
<property name="tooltip_text"
translatable="yes">Save Color List</property>
<property name="halign">center</property>
+ <property name="valign">end</property>
<property name="hexpand">True</property>
<property name="image">image2</property>
</object>
@@ -588,19 +591,32 @@
<property name="height">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="embed">
<property name="label"
translatable="yes">Embed</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="valign">start</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
