cui/source/options/optaboutconfig.cxx | 2 +-
cui/uiconfig/ui/aboutconfigvaluedialog.ui | 10 ++++++----
extras/source/glade/libreoffice-catalog.xml.in | 3 +++
3 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 7bf2f528ef22f50aa167ba57f2e25d4452977060
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu Dec 12 10:32:13 2013 +0100
About config: Make the value box dialog a bit nicer.
Change-Id: I5e25401b76458e712070bc76c86083bbd9ae2daa
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 56b945a..08cfbc5 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -121,7 +121,7 @@ void CuiCustomMultilineEdit::KeyInput( const KeyEvent&
rKeyEvent )
Size CuiCustomMultilineEdit::GetOptimalSize() const
{
- return LogicToPixel(Size(150,30),MAP_APPFONT);
+ return LogicToPixel(Size(150, GetTextHeight()), MAP_APPFONT);
}
Size CuiAboutConfigTabPage::GetOptimalSize() const
diff --git a/cui/uiconfig/ui/aboutconfigvaluedialog.ui
b/cui/uiconfig/ui/aboutconfigvaluedialog.ui
index 8c359d7..8995bd5 100644
--- a/cui/uiconfig/ui/aboutconfigvaluedialog.ui
+++ b/cui/uiconfig/ui/aboutconfigvaluedialog.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="GtkDialog" id="AboutConfigValueDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -9,12 +10,12 @@
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="layout_style">start</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
@@ -72,6 +73,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
@@ -79,7 +81,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Value</property>
+ <property name="label" translatable="yes">Value:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -91,7 +93,7 @@
<object class="cuilo-CuiCustomMultilineEdit" id="valuebox">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="vexpand">True</property>
+ <property name="hexpand">True</property>
<property name="wrap_mode">char</property>
</object>
<packing>
commit b3708761fbecda222af806a9606c63ab4e340c0c
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu Dec 12 10:15:21 2013 +0100
Add CuiCustomMultilineEdit to the catalog.
Change-Id: I80cbd580e4fd59330a4f9b38dca5eb3fc0aec29a
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 7391791..157a34f 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -278,6 +278,9 @@
<glade-widget-class title="Address MultiLine Edit"
name="swuilo-AddressMultiLineEdit"
generic-name="AddressMultiLineEdit"
parent="GtkTextView"
icon-name="widget-gtk-textview"/>
+ <glade-widget-class title="Cui Custom MultiLine Edit"
name="cuilo-CuiCustomMultilineEdit"
+ generic-name="CuiCustomMultiLineEdit"
parent="GtkTextView"
+ icon-name="widget-gtk-textview"/>
<glade-widget-class title="LicenseView" name="deploymentgui-LicenseView"
generic-name="LicenseView" parent="GtkTextView"
icon-name="widget-gtk-textview"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
