vcl/qa/cppunit/builder/demo.ui | 114 ++++++++++++++++++++++++++--------------- vcl/source/window/builder.cxx | 18 +++--- 2 files changed, 84 insertions(+), 48 deletions(-)
New commits: commit bc610d9683619c1b9da62ba381f158dcd5ab6ad3 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Apr 4 09:30:41 2012 +0100 implement ListBox dropdown diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui index 0c0cb7c..a22c17d 100644 --- a/vcl/qa/cppunit/builder/demo.ui +++ b/vcl/qa/cppunit/builder/demo.ui @@ -228,6 +228,17 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkComboBox" id="combobox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 4d02ce3..2780ddf 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -28,12 +28,12 @@ #include <vcl/builder.hxx> #include <vcl/button.hxx> -#include <vcl/combobox.hxx> #include <vcl/dialog.hxx> #include <vcl/edit.hxx> +#include <vcl/field.hxx> #include <vcl/fixed.hxx> #include <vcl/layout.hxx> -#include <vcl/field.hxx> +#include <vcl/lstbox.hxx> VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUri) { @@ -85,31 +85,31 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, bool b } else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkButton"))) { - pWindow = new PushButton(pParent, WB_CENTER|WB_VCENTER); + pWindow = new PushButton(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); } else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkRadioButton"))) { - pWindow = new RadioButton(pParent, WB_CENTER|WB_VCENTER); + pWindow = new RadioButton(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); } else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkCheckButton"))) { - pWindow = new CheckBox(pParent, WB_CENTER|WB_VCENTER); + pWindow = new CheckBox(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); } else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkSpinButton"))) { - pWindow = new NumericField(pParent, WB_RIGHT|WB_SPIN|WB_BORDER); + pWindow = new NumericField(pParent, WB_RIGHT|WB_SPIN|WB_BORDER|WB_3DLOOK); } else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkComboBox"))) { - pWindow = new ComboBox(pParent, WB_CENTER|WB_VCENTER); + pWindow = new ListBox(pParent, WB_DROPDOWN|WB_CENTER|WB_VCENTER|WB_3DLOOK); } else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkLabel"))) { - pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER); + pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); } else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkEntry"))) { - pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER ); + pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK ); } else { commit a86bfdd3b3442996b69d9231444bd6753e73b1f4 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Apr 4 09:12:06 2012 +0100 rearrange demo to help glade out diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui index 985c866..0c0cb7c 100644 --- a/vcl/qa/cppunit/builder/demo.ui +++ b/vcl/qa/cppunit/builder/demo.ui @@ -10,69 +10,6 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> - <child> - <object class="GtkBox" id="box4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkSpinButton" id="spinbutton1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">â</property> - <property name="numeric">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkButton" id="button4"> - <property name="label" translatable="yes">EXPAND</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button5"> - <property name="label" translatable="yes">FILL</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> @@ -234,6 +171,70 @@ <property name="position">2</property> </packing> </child> + <child> + <object class="GtkBox" id="box3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkButton" id="button4"> + <property name="label" translatable="yes">EXPAND</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="button5"> + <property name="label" translatable="yes">FILL</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSpinButton" id="spinbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">â</property> + <property name="invisible_char_set">True</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> </object> </child> <action-widgets> commit acf0f6b9c9a93068b8686b5ae1aed7c71e575735 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Apr 4 09:11:38 2012 +0100 add border diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 377d753..4d02ce3 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -109,7 +109,7 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, bool b } else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkEntry"))) { - pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER ); + pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER ); } else { commit 53cc2f66d3980eb301a0937778c00e7153fd5fbf Author: Caolán McNamara <caol...@redhat.com> Date: Wed Apr 4 09:04:23 2012 +0100 implement GtkSpinButtons as NumericFields for now diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui index 044a45e..985c866 100644 --- a/vcl/qa/cppunit/builder/demo.ui +++ b/vcl/qa/cppunit/builder/demo.ui @@ -11,6 +11,30 @@ <property name="orientation">vertical</property> <property name="spacing">2</property> <child> + <object class="GtkBox" id="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkSpinButton" id="spinbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">â</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 71f9e04..377d753 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -33,7 +33,7 @@ #include <vcl/edit.hxx> #include <vcl/fixed.hxx> #include <vcl/layout.hxx> -#include <vcl/spin.hxx> +#include <vcl/field.hxx> VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUri) { @@ -97,7 +97,7 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, bool b } else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkSpinButton"))) { - pWindow = new SpinButton(pParent, WB_CENTER|WB_VCENTER); + pWindow = new NumericField(pParent, WB_RIGHT|WB_SPIN|WB_BORDER); } else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkComboBox"))) {
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits