diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | src/glade-catalog.c | 6 | ||||
-rw-r--r-- | widgets/Makefile.am | 2 | ||||
-rw-r--r-- | widgets/gtk+.xml.in (renamed from widgets/gtk+.catalog) | 149 |
4 files changed, 159 insertions, 7 deletions
@@ -1,5 +1,14 @@ 2005-01-05 Mikael Hallendal <micke@imendio.com> + * src/glade-catalog.c: (catalog_load_widgets), + (glade_catalog_load_all): + * widgets/Makefile.am: + * widgets/gtk+.catalog: Removed + * widgets/gtk+.xml: Added + - Revert and continue to call catalog files .xml + +2005-01-05 Mikael Hallendal <micke@imendio.com> + * src/glade-catalog.[ch]: - Removed need for the palette file, loads all .catalog files in catalog directory. diff --git a/src/glade-catalog.c b/src/glade-catalog.c index 8cdaa8d5..33d1133d 100644 --- a/src/glade-catalog.c +++ b/src/glade-catalog.c @@ -148,8 +148,8 @@ catalog_load_widgets (GladeCatalog *catalog, GladeXmlNode *widgets_node) if (strcmp (node_name, GLADE_TAG_GLADE_WIDGET_CLASS) != 0) continue; - widget_class = glade_widget_class_new_from_node (node, - catalog->library); + widget_class = glade_widget_class_new (node, + catalog->library); catalog->widget_classes = g_list_prepend (catalog->widget_classes, widget_class); @@ -264,7 +264,7 @@ glade_catalog_load_all (void) { gchar *catalog_filename; - if (!g_str_has_suffix (filename, ".catalog")) + if (!g_str_has_suffix (filename, ".xml")) continue; catalog_filename = g_build_filename (glade_catalogs_dir, diff --git a/widgets/Makefile.am b/widgets/Makefile.am index 087bfa50..9c0c329a 100644 --- a/widgets/Makefile.am +++ b/widgets/Makefile.am @@ -1,5 +1,5 @@ catalogs_DATA = \ - gtk+.catalog \ + gtk+.xml \ glade-palette.xml \ gtk-base.xml \ gtk-additional.xml \ diff --git a/widgets/gtk+.catalog b/widgets/gtk+.xml.in index 1be0fac2..f96e399c 100644 --- a/widgets/gtk+.catalog +++ b/widgets/gtk+.xml.in @@ -1,5 +1,6 @@ <GladeCatalog name="gtk+" library="gladegtk"> <GladeWidgets> + <!-- Gtk+ Base --> <GladeWidgetClass name="GtkWidget"> <Properties> <Property Common="True" Id="visible"> @@ -325,6 +326,121 @@ <Property Id="label" Default="Frame"/> </Properties> </GladeWidgetClass> + + <!-- Gtk+ Additional --> + <GladeWidgetClass name="GtkHScale" generic_name="hscale" title="Horizontal Scale"/> + + <GladeWidgetClass name="GtkVScale" generic_name="vscale" title="Vertical Scale"/> + + <GladeWidgetClass name="GtkCalendar" generic_name="calendar" title="Calendar"/> + + <GladeWidgetClass name="GtkMenu" generic_name="menu" title="Popup Menu"/> + + <GladeWidgetClass name="GtkHScrollbar" generic_name="hscrollbar" title="Horizontal Scrollbar"/> + + <GladeWidgetClass name="GtkVScrollbar" generic_name="vscrollbar" title="Vertical Scrollbar"/> + + <GladeWidgetClass name="GtkHButtonBox" generic_name="hbuttonbox" title="Horizontal Button Box"/> + + <GladeWidgetClass name="GtkVButtonBox" generic_name="vbuttonbox" title="Vertical Button Box"/> + + <GladeWidgetClass name="GtkHSeparator" generic_name="hseparator" title="Horizontal Separator"/> + + <GladeWidgetClass name="GtkVSeparator" generic_name="vseparator" title="Vertical Separator"/> + + <GladeWidgetClass name="GtkStatusbar" generic_name="statusbar" title="Status Bar"> + <Properties> + <Property Id="size" Disabled="TRUE" /> + <Property Id="has-resize-grip" Name="Has Resize Grip" Default="TRUE"> + <Type>Boolean</Type> + <Tooltip>Set if the statusbar has a resize grip or not</Tooltip> + <SetFunction>glade_gtk_statusbar_set_has_resize_grip</SetFunction> + <GetFunction>glade_gtk_statusbar_get_has_resize_grip</GetFunction> + </Property> + </Properties> + + <Children> + <Child> + <Type>GtkWidget</Type> + <FillEmptyFunction>empty</FillEmptyFunction> + </Child> + </Children> + </GladeWidgetClass> + + <GladeWidgetClass name="GtkArrow" generic_name="arrow" title="Arrow"/> + <GladeWidgetClass name="GtkLayout" generic_name="layout" title="Layout"/> + + <GladeWidgetClass name="GtkFixed" generic_name="fixed" title="Fixed"> + <PostCreateFunction>glade_gtk_fixed_post_create</PostCreateFunction> + + <Children> + <Child> + <Type>GtkWidget</Type> + <FillEmptyFunction>empty</FillEmptyFunction> + </Child> + </Children> + </GladeWidgetClass> + + <GladeWidgetClass name="GtkDrawingArea" generic_name="drawingarea" title="Drawing Area"/> + + <GladeWidgetClass name="GtkViewport" generic_name="viewport" title="Viewport"/> + + <GladeWidgetClass name="GtkScrolledWindow" generic_name="scrolledwindow" title="Scrolled Window"/> + + <!-- NOT AVAILABLES ON WIN32 + <GladeWidgetClass name="GtkPlug" generic_name="plug" title="Plug"/> + <GladeWidgetClass name="GtkSocket" generic_name="socket" title="Socket"/> + --> + + <!-- Gtk+ Dialogs --> + <GladeWidgetClass name="GtkColorSelectionDialog" generic_name="colorselectiondialog" title="Color Selection Dialog"/> + + <GladeWidgetClass name="GtkFileChooserDialog" generic_name="filechooserdialog" title="File Chooser Dialog"/> + + <GladeWidgetClass name="GtkFontSelectionDialog" generic_name="fontselectiondialog" title="Font Selection Dialog"/> + + <GladeWidgetClass name="GtkInputDialog" generic_name="inputdialog" title="Input Dialog"/> + + <GladeWidgetClass name="GtkMessageDialog" generic_name="messagedialog" title="Message Dialog"> + <PostCreateFunction>glade_gtk_message_dialog_post_create</PostCreateFunction> + + <Properties> + + <Property Id="modal"> + <SetFunction>ignore</SetFunction> + </Property> + <Property Id="default-width" Default="0" Optional="True" OptionalDefault="False"/> + <Property Id="default-height" Default="0" Optional="True" OptionalDefault="False"/> + + <Property Common="True" Id="sensitive"/> + <Property Common="True" Id="can-default"/> + <Property Common="True" Id="has-default"/> + <Property Common="True" Id="can-focus"/> + </Properties> + </GladeWidgetClass> + + <!-- Gtk+ Obsolete --> + <GladeWidgetClass name="GtkRuler"> + <Properties> + <Property Default="10.0" Id="upper"/> + <Property Default="5.0" Id="position"/> + <Property Default="10.0" Id="max-size"/> + </Properties> + </GladeWidgetClass> + + <GladeWidgetClass name="GtkHRuler" generic_name="hruler" title="Horizontal Ruler"/> + + <GladeWidgetClass name="GtkVRuler" generic_name="vruler" title="Vertical Ruler"/> + + <GladeWidgetClass name="GtkColorSelection" generic_name="colorselection" title="Color Selection"/> + + <GladeWidgetClass name="GtkFontSelection" generic_name="fontselection" title="Font Selection"/> + + <GladeWidgetClass name="GtkCurve" generic_name="curve" title="Curve"/> + + <GladeWidgetClass name="GtkGammaCurve" generic_name="gammacurve" title="Gamma Curve"/> + + <GladeWidgetClass name="GtkFileSelection" generic_name="fileselection" title="File Selection"/> </GladeWidgets> <GladeWidgetGroup name="gtk-base" title="Gtk+ Base"> @@ -356,13 +472,40 @@ </GladeWidgetGroup> <GladeWidgetGroup name="gtk-additional" title="Gtk+ Additional"> - <GladeWidgetClass name="GtkWindow"/> + <GladeWidgetClass name="GtkHScale"/> + <GladeWidgetClass name="GtkVScale"/> + <GladeWidgetClass name="GtkCalendar"/> + <GladeWidgetClass name="GtkMenu"/> + <GladeWidgetClass name="GtkHScrollbar"/> + <GladeWidgetClass name="GtkVScrollbar"/> + <GladeWidgetClass name="GtkHButtonBox"/> + <GladeWidgetClass name="GtkVButtonBox"/> + <GladeWidgetClass name="GtkHSeparator"/> + <GladeWidgetClass name="GtkVSeparator"/> + <GladeWidgetClass name="GtkStatusbar"/> + <GladeWidgetClass name="GtkArrow"/> + <GladeWidgetClass name="GtkLayout"/> + <GladeWidgetClass name="GtkFixed"/> + <GladeWidgetClass name="GtkDrawingArea"/> + <GladeWidgetClass name="GtkViewport"/> + <GladeWidgetClass name="GtkScrolledWindow"/> </GladeWidgetGroup> - <GladeWidgetGroup name="gtk-dialogs" title="Gtk+ Dialogs"> + <GladeWidgetGroup name="gtk-dialogs" title="Gtk+ Standard Dialogs"> + <GladeWidgetClass name="GtkColorSelectionDialog"/> + <GladeWidgetClass name="GtkFileChooserDialog"/> + <GladeWidgetClass name="GtkFontSelectionDialog"/> + <GladeWidgetClass name="GtkInputDialog"/> + <GladeWidgetClass name="GtkMessageDialog"/> </GladeWidgetGroup> <GladeWidgetGroup name="gtk-obsolete" title="Gtk+ Obsolete"> + <GladeWidgetClass name="GtkHRuler"/> + <GladeWidgetClass name="GtkVRuler"/> + <GladeWidgetClass name="GtkColorSelection"/> + <GladeWidgetClass name="GtkFontSelection"/> + <GladeWidgetClass name="GtkCurve"/> + <GladeWidgetClass name="GtkGammaCurve"/> + <GladeWidgetClass name="GtkFileSelection"/> </GladeWidgetGroup> - </GladeCatalog> |