sc/source/ui/dbgui/sortkeydlg.cxx | 3
sc/uiconfig/scalc/ui/textimportcsv.ui | 153 +++++++++++++++++++++-------------
2 files changed, 98 insertions(+), 58 deletions(-)
New commits:
commit 0ac6c626287ee6789296172ddbe5d4e5dc5600ac
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 26 12:56:34 2013 +0000
make seperator editboxes stick to their labelling widgets
Change-Id: I434d10fb4a02c70deb3a4b88b00a9313c0f53b9d
diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui
b/sc/uiconfig/scalc/ui/textimportcsv.ui
index 5a2f1c8..afe12d5 100644
--- a/sc/uiconfig/scalc/ui/textimportcsv.ui
+++ b/sc/uiconfig/scalc/ui/textimportcsv.ui
@@ -347,8 +347,8 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="other">
- <property name="label"
translatable="yes">_Other</property>
+ <object class="GtkCheckButton"
id="semicolon">
+ <property name="label"
translatable="yes">S_emicolon</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -358,102 +358,135 @@
<property
name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">4</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="GtkEntry" id="inputother">
+ <object class="GtkCheckButton" id="space">
+ <property name="label"
translatable="yes">S_pace</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
<property name="hexpand">True</property>
- <property name="max_length">10</property>
- <property
name="invisible_char">â</property>
- <property name="width_chars">3</property>
+ <property
name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">5</property>
+ <property name="left_attach">3</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel"
id="texttextdelimiter">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Te_xt delimiter</property>
- <property
name="use_underline">True</property>
+ <property
name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton"
id="other">
+ <property name="label"
translatable="yes">_Other</property>
+ <property
name="visible">True</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>
+ <accessibility>
+ <relation type="label-for"
target="inputother"/>
+ </accessibility>
+ </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="GtkEntry" id="inputother">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="hexpand">True</property>
+ <property
name="max_length">10</property>
+ <property
name="invisible_char">â</property>
+ <property
name="width_chars">3</property>
+ <property
name="invisible_char_set">True</property>
+ <accessibility>
+ <relation type="labelled-by"
target="other"/>
+ </accessibility>
+ </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">4</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>
- <object class="GtkComboBoxText"
id="textdelimiter">
+ <object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="has_entry">True</property>
- <property
name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <child internal-child="entry">
- <object class="GtkEntry"
id="comboboxtext-entry">
+ <property
name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel"
id="texttextdelimiter">
+ <property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="invisible_char">â</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Te_xt delimiter</property>
+ <property
name="use_underline">True</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="GtkComboBoxText"
id="textdelimiter">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="hexpand">True</property>
+ <property
name="has_entry">True</property>
+ <property
name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <child internal-child="entry">
+ <object class="GtkEntry"
id="comboboxtext-entry">
+ <property
name="can_focus">False</property>
+ <property
name="invisible_char">â</property>
+ </object>
+ </child>
</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">5</property>
+ <property name="left_attach">4</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton"
id="semicolon">
- <property name="label"
translatable="yes">S_emicolon</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="hexpand">True</property>
- <property
name="use_underline">True</property>
- <property name="xalign">0</property>
- <property
name="draw_indicator">True</property>
- </object>
- <packing>
- <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="GtkCheckButton" id="space">
- <property name="label"
translatable="yes">S_pace</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="hexpand">True</property>
- <property
name="use_underline">True</property>
- <property name="xalign">0</property>
- <property
name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
</object>
</child>
</object>
@@ -674,4 +707,10 @@
<action-widget response="0">ok</action-widget>
</action-widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="other"/>
+ <widget name="texttextdelimiter"/>
+ </widgets>
+ </object>
</interface>
commit 89047448cb8841f43cff9af7fe935743c37b1a39
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 26 12:47:52 2013 +0000
whoops, de-break SOME BROKEN FOO
Change-Id: I9598c6762148ca4c1b1dccc3cc25741cf19cab24
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx
b/sc/source/ui/dbgui/sortkeydlg.cxx
index 11df6da..944ff42 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -29,6 +29,7 @@
#include "sortkeydlg.hxx"
#include "sortdlg.hxx"
#include "sortdlg.hrc"
+#include <vcl/layout.hxx>
// =======================================================================
@@ -45,7 +46,7 @@ ScSortKeyItem::ScSortKeyItem(Window* pParent)
long ScSortKeyItem::getItemHeight() const
{
- return m_pFrame->get_preferred_size().Height();
+ return VclContainer::getLayoutRequisition(*m_pFrame).Height();
}
void ScSortKeyItem::DisableField()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
