diff --git a/ChangeLog b/ChangeLog index 21a5c0bd..969656d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-07-04 Chema Celorio + + * widgets/gtk*.xml: a lot of cleaning, added new files and converted old .xml + files to use ParamSpec. + + * src/glade-property-class.c (glade_property_class_find_spec): dump the specs (temp) + 2001-07-02 Chema Celorio * src/glade-project-window.c (gpw_copy_cb): add function names buts still with no content diff --git a/TODO b/TODO index b0ed4be7..e20fce78 100644 --- a/TODO +++ b/TODO @@ -20,6 +20,9 @@ TAKEN ITEMS (someone is already working on) OPEN ITEMS [PLease let me know before starting working on any of this] ---------- +- Fix user query for properties that are loaded with paramspec. Take a look + at why gtktable query (non-ParamSpec) works and not vbox (Loading with + ParamSpec) - Implement glade_widget_delete inside glade-widget.c, delete can already be called from the popup menu. - Implement the popup menu option "Select", it needs to create submenus for diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index ba92d2ae..1b397c1c 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -6,6 +6,9 @@ pixmaps_DATA = \ hbox.xpm \ label.xpm \ table.xpm \ + entry.xpm \ + notebook.xpm \ + frame.xpm \ \ selector.xpm \ placeholder.xpm diff --git a/pixmaps/entry.xpm b/pixmaps/entry.xpm new file mode 100644 index 00000000..cb900413 --- /dev/null +++ b/pixmaps/entry.xpm @@ -0,0 +1,33 @@ +/* XPM */ +static char *entry_xpm[] = { +/* columns rows colors chars-per-pixel */ +"21 21 6 1", +" c Gray0", +". c #7b7b7b", +"X c #d6d6d6", +"o c #b3cece", +"O c Gray100", +"+ c None", +/* pixels */ +"+++++++++++++++++++++", +"+++++++++++++++++++++", +"....................O", +". XO", +". OOOOOOOOOOOOOOOOOXO", +". OOOOOOOOOOOOOOO OXO", +". OOOOOOOO OOOOOO OXO", +". OOOOOOOO OOOOOO OXO", +". OOO OO X OOO OXO", +". OO XOX O O. OO OXO", +". OOOOOO O OOO OO OXO", +". OOO O OOO OO OXO", +". OO XOO O OOO OO OXO", +". OO XOO O OO. OO OXO", +". OOO O OOO OXO", +". OOOOOOOOOOOOOOO OXO", +". OOOOOOOOOOOOOOOOOXO", +".XXXXXXXXXXXXXXXXXXXO", +"OOOOOOOOOOOOOOOOOOOOO", +"+++++++++++++++++++++", +"+++++++++++++++++++++" +}; diff --git a/pixmaps/frame.xpm b/pixmaps/frame.xpm new file mode 100644 index 00000000..c8c8b578 --- /dev/null +++ b/pixmaps/frame.xpm @@ -0,0 +1,33 @@ +/* XPM */ +static char *frame_xpm[] = { +/* columns rows colors chars-per-pixel */ +"21 21 6 1", +" c Gray0", +". c #7b7b7b", +"X c #d6d6d6", +"o c #b3cece", +"O c Gray100", +"+ c None", +/* pixels */ +"+++++++++++++++++++++", +"+++++ + +++++++++++", +"+...X X X X......O+", +"+.OOX X X XOOOOO.O+", +"+.OXX X X XXXXXX.O+", +"+.OXXXXXXXXXXXXXXX.O+", +"+.OXXXXXXXXXXXXXXX.O+", +"+.OXXXXXXXXXXXXXXX.O+", +"+.OXXXXXXXXXXXXXXX.O+", +"+.OXXXXXXXXXXXXXXX.O+", +"+.OXXXXXXXXXXXXXXX.O+", +"+.OXXXXXXXXXXXXXXX.O+", +"+.OXXXXXXXXXXXXXXX.O+", +"+.OXXXXXXXXXXXXXXX.O+", +"+.OXXXXXXXXXXXXXXX.O+", +"+.OXXXXXXXXXXXXXXX.O+", +"+.OXXXXXXXXXXXXXXX.O+", +"+.OXXXXXXXXXXXXXXX.O+", +"+..................O+", +"+OOOOOOOOOOOOOOOOOOO+", +"+++++++++++++++++++++" +}; diff --git a/pixmaps/notebook.xpm b/pixmaps/notebook.xpm new file mode 100644 index 00000000..77ac20d6 --- /dev/null +++ b/pixmaps/notebook.xpm @@ -0,0 +1,33 @@ +/* XPM */ +static char *notebook_xpm[] = { +/* columns rows colors chars-per-pixel */ +"21 21 6 1", +" c Gray0", +". c #7b7b7b", +"X c #d6d6d6", +"o c #b3cece", +"O c Gray100", +"+ c None", +/* pixels */ +"+++++++++++++++++++++", +"+++++++++++++++++++++", +"+++++++++++++++++++++", +"+OOOOOO.OOOO.OOOO.+++", +"+OXXXXX.X.X..X.X..+++", +"+OXXXXX..X.X..X.X.+++", +"+OXXXXX.X.X..X.X..+++", +"+OXXXXX.OOOOOOOOOOO +", +"+OXXXXXXXXXXXXXXXX. +", +"+OXXXXXXXXXXXXXXXX. +", +"+OXXXXXXXXXXXXXXXX. +", +"+OXXXXXXXXXXXXXXXX. +", +"+OXXXXXXXXXXXXXXXX. +", +"+OXXXXXXXXXXXXXXXX. +", +"+OXXXXXXXXXXXXXXXX. +", +"+OXXXXXXXXXXXXXXXX. +", +"+O................. +", +"+ +", +"+++++++++++++++++++++", +"+++++++++++++++++++++", +"+++++++++++++++++++++" +}; diff --git a/src/Makefile.am b/src/Makefile.am index ffb633cf..09012356 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -bin_PROGRAMS = glade2 +bin_PROGRAMS = glade2 INCLUDES = \ $(GLADE_CFLAGS) \ diff --git a/src/glade-property-class.c b/src/glade-property-class.c index e6346804..cc698651 100644 --- a/src/glade-property-class.c +++ b/src/glade-property-class.c @@ -158,6 +158,14 @@ glade_property_class_find_spec (GladeWidgetClass *class, const gchar *name) glade_property_class_get_specs (class, &specs, &n_specs); +#if 1 + g_print ("Dumping specs for %s\n\n", class->name); + for (i = 0; i < n_specs; i++) { + spec = specs[i]; + g_print ("%02d - %s\n", i, spec->name); + } +#endif + for (i = 0; i < n_specs; i++) { spec = specs[i]; @@ -191,7 +199,8 @@ glade_property_class_get_type_from_spec (GParamSpec *spec) case G_TYPE_PARAM_ENUM: return GLADE_PROPERTY_TYPE_CHOICE; default: - g_warning ("Could not determine GladePropertyType from spec"); + g_warning ("Could not determine GladePropertyType from spec (%d)", + G_PARAM_SPEC_TYPE (spec)); } return GLADE_PROPERTY_TYPE_ERROR; diff --git a/widgets/Makefile.am b/widgets/Makefile.am index 3ee89ebd..f79bfd23 100644 --- a/widgets/Makefile.am +++ b/widgets/Makefile.am @@ -6,6 +6,9 @@ widgets_DATA = \ gtklabel.xml \ gtkvbox.xml \ gtkhbox.xml \ - gtktable.xml + gtktable.xml \ + gtkframe.xml \ + gtknotebook.xml \ + gtkentry.xml EXTRA_DIST = $(widgets_DATA) diff --git a/widgets/catalog.xml b/widgets/catalog.xml index c203a805..80ae2a52 100644 --- a/widgets/catalog.xml +++ b/widgets/catalog.xml @@ -1,9 +1,23 @@ gtkwindow - gtkbutton - gtkcheckbutton + + gtkmenubar + gtktoolbar + gtklabel + gtkentry + gtkcombobox + + gtkbutton + gtktogglebutton + gtkcheckbutton + gtkradiobutton + gtkhbox gtkvbox gtktable + + gtknotebook + gtkframe + \ No newline at end of file diff --git a/widgets/gtkbutton.xml b/widgets/gtkbutton.xml index 38df4da0..e9f4cdb6 100644 --- a/widgets/gtkbutton.xml +++ b/widgets/gtkbutton.xml @@ -7,29 +7,13 @@ - Integer - Border Width - The width of the border arround the container - border - - - - - - - - + border + - Text - Label - The text to display - label - - - - + label + diff --git a/widgets/gtkcheckbutton.xml b/widgets/gtkcheckbutton.xml index aa3463f9..97015357 100644 --- a/widgets/gtkcheckbutton.xml +++ b/widgets/gtkcheckbutton.xml @@ -7,29 +7,13 @@ - Integer - Border Width - The width of the border arround the container - border - - - - - - - - + border + - Text - Label - The text to display - label - - - - + label + diff --git a/widgets/gtkentry.xml b/widgets/gtkentry.xml new file mode 100644 index 00000000..70cefbed --- /dev/null +++ b/widgets/gtkentry.xml @@ -0,0 +1,27 @@ + + + GtkEntry + gtk_entry_get_type + entry + False + entry + + + + editable + + + + + visibility + + + + + max-length + + + + + + \ No newline at end of file diff --git a/widgets/gtkframe.xml b/widgets/gtkframe.xml new file mode 100644 index 00000000..cd15e84d --- /dev/null +++ b/widgets/gtkframe.xml @@ -0,0 +1,17 @@ + + + GtkFrame + gtk_frame_get_type + frame + False + frame + + + + label + + + + + + \ No newline at end of file diff --git a/widgets/gtkhbox.xml b/widgets/gtkhbox.xml index 30f805f4..2d6508f8 100644 --- a/widgets/gtkhbox.xml +++ b/widgets/gtkhbox.xml @@ -7,34 +7,15 @@ hbox + - Integer - Border Width - The width of the border arround the container - border - - - - - - - - + border + - Integer - Size - Number of widgets in the box - size - - - - - - - - + size + New vertical box Number of rows @@ -42,19 +23,10 @@ - Integer - Spacing - The space between each child - spacing - - - - - - - - + spacing + + diff --git a/widgets/gtklabel.xml b/widgets/gtklabel.xml index ff61201d..9bd3b2d3 100644 --- a/widgets/gtklabel.xml +++ b/widgets/gtklabel.xml @@ -1,18 +1,50 @@ + GtkLabel gtk_label_get_type label False label + - Text + label + - Label - The text to disaplay - label + + + justify + + + + + wrap + + + + + xalign + + + + + yalign + + + + + xpad + + + + + ypad + + + + diff --git a/widgets/gtknotebook.xml b/widgets/gtknotebook.xml new file mode 100644 index 00000000..764013d0 --- /dev/null +++ b/widgets/gtknotebook.xml @@ -0,0 +1,17 @@ + + + GtkNotebook + gtk_notebook_get_type + notebook + False + notebook + + + + name + + + + + + \ No newline at end of file diff --git a/widgets/gtktable.xml b/widgets/gtktable.xml index 89354e34..4cac1070 100644 --- a/widgets/gtktable.xml +++ b/widgets/gtktable.xml @@ -7,19 +7,10 @@ True + - Integer - Border Width - The width of the border arround the container - border-width - - - - - - - - + border-width + @@ -61,41 +52,20 @@ - Boolean - Homogeneous - If the children should be the same size - homogeneous + homogeneous + - Integer - Row Spacing - The space between each row - row-spacing - - - - - - - - + row-spacing + - Integer - Col Spacing - The space between each column - column-spacing - - - - - - - - + column-spacing + + diff --git a/widgets/gtkvbox.xml b/widgets/gtkvbox.xml index 0672d28f..1f37f0f1 100644 --- a/widgets/gtkvbox.xml +++ b/widgets/gtkvbox.xml @@ -7,34 +7,14 @@ True + - Integer - Border Width - The width of the border arround the container - border-width - - - - - - - - + border-width + - Integer - Size - Number of widgets in the box - size - - - - - - - - + size New vertical box Number of rows @@ -42,18 +22,8 @@ - Integer - Spacing - The space between each child - spacing - - - - - - - - + spacing +