[Libreoffice-commits] .: Branch 'feature/cmclayout' - 2 commits - vcl/qa vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Apr 5 12:44:17 PDT 2012
vcl/qa/cppunit/builder/demo.ui | 78 ++++++++++++++++++++++++++++++++++++++++-
vcl/source/window/builder.cxx | 22 +++++++++--
2 files changed, 95 insertions(+), 5 deletions(-)
New commits:
commit c53573ac477bbf0a1559cf1e58b67a1d8df93408
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 5 20:43:33 2012 +0100
import GtkGrid
diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index a22c17d..ed75074 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -55,6 +55,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
@@ -99,6 +101,7 @@
<property name="can_focus">True</property>
<property name="invisible_char">â—</property>
<property name="text" translatable="yes">an edit control</property>
+ <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -110,7 +113,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -246,6 +249,79 @@
<property name="position">4</property>
</packing>
</child>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">4</property>
+ <property name="column_spacing">2</property>
+ <property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="labelfoo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">cell 1.1</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="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">cell 3.3</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">A label that spans three rows</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
</object>
</child>
<action-widgets>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 07f8dcd..413e861 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -83,6 +83,10 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, bool b
else
pWindow = new VclHButtonBox(pParent);
}
+ else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkGrid")))
+ {
+ pWindow = new VclGrid(pParent);
+ }
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkButton")))
{
pWindow = new PushButton(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
@@ -357,6 +361,7 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
{
name = reader.getAttributeValue(false);
rtl::OString sKey(name.begin, name.length);
+ sKey = sKey.replace('_', '-');
reader.nextItem(
xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId);
rtl::OString sValue(name.begin, name.length);
@@ -371,10 +376,19 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
{
pCurrent->setChildProperty(sKey, static_cast<sal_uInt16>(sValue.toInt32()));
}
- else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("pack_type")))
+ else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("pack-type")))
{
sal_Int32 nPackType = (sValue[0] == 'e' || sValue[0] == 'e') ? VCL_PACK_END : VCL_PACK_START;
- pCurrent->setChildProperty(rtl::OString("pack-type"), nPackType);
+ pCurrent->setChildProperty(sKey, nPackType);
+ }
+ else if (
+ sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("left-attach")) ||
+ sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("top-attach")) ||
+ sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("width")) ||
+ sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("height"))
+ )
+ {
+ pCurrent->setChildProperty(sKey, sValue.toInt32());
}
else
fprintf(stderr, "unknown packing %s\n", sKey.getStr());
@@ -396,7 +410,7 @@ void VclBuilder::collectProperty(xmlreader::XmlReader &reader, stringmap &rMap)
reader.nextItem(
xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId);
rtl::OString sValue(name.begin, name.length);
- rMap[sProperty] = sValue;
+ rMap[sProperty] = sValue.replace('_', '-');;
}
}
}
commit c0aba0321b646c51cf0b09ff064d32dd32d41595
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 5 20:41:35 2012 +0100
follow theme by default for Dialogs
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 2780ddf..07f8dcd 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -67,7 +67,7 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, bool b
Window *pWindow = NULL;
if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkDialog")))
{
- pWindow = new Dialog(pParent, WB_SIZEMOVE);
+ pWindow = new Dialog(pParent, WB_SIZEMOVE|WB_3DLOOK);
}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkBox")))
{
More information about the Libreoffice-commits
mailing list