Commit df83a51f authored by Chema Celorio's avatar Chema Celorio Committed by Jose Maria Celorio
Browse files

a lot of cleaning, added new files and converted old .xml files to use

2001-07-04  Chema Celorio  <chema@celorio.com>

	* 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)
parent 4c3303d3
2001-07-04 Chema Celorio <chema@celorio.com>
* 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 <chema@celorio.com>
* src/glade-project-window.c (gpw_copy_cb): add function names buts still with no content
......
......@@ -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
......
......@@ -6,6 +6,9 @@ pixmaps_DATA = \
hbox.xpm \
label.xpm \
table.xpm \
entry.xpm \
notebook.xpm \
frame.xpm \
\
selector.xpm \
placeholder.xpm
......
/* 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",
"+++++++++++++++++++++",
"+++++++++++++++++++++"
};
/* 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+",
"+++++++++++++++++++++"
};
/* 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................. +",
"+ +",
"+++++++++++++++++++++",
"+++++++++++++++++++++",
"+++++++++++++++++++++"
};
## Process this file with automake to produce Makefile.in
bin_PROGRAMS = glade2
bin_PROGRAMS = glade2
INCLUDES = \
$(GLADE_CFLAGS) \
......
......@@ -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;
......
......@@ -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)
<GladeCatalog>
<GladeWidget>gtkwindow</GladeWidget>
<GladeWidget>gtkmenubar</GladeWidget>
<GladeWidget>gtktoolbar</GladeWidget>
<!-- gtkhandle box ?? -->
<GladeWidget>gtklabel</GladeWidget>
<GladeWidget>gtkentry</GladeWidget>
<GladeWidget>gtkcombobox</GladeWidget>
<GladeWidget>gtkbutton</GladeWidget>
<GladeWidget>gtktogglebutton</GladeWidget>
<GladeWidget>gtkcheckbutton</GladeWidget>
<GladeWidget>gtklabel</GladeWidget>
<GladeWidget>gtkradiobutton</GladeWidget>
<GladeWidget>gtkhbox</GladeWidget>
<GladeWidget>gtkvbox</GladeWidget>
<GladeWidget>gtktable</GladeWidget>
<GladeWidget>gtknotebook</GladeWidget>
<GladeWidget>gtkframe</GladeWidget>
</GladeCatalog>
\ No newline at end of file
......@@ -7,29 +7,13 @@
<Properties>
<Property>
<Type>Integer</Type>
<Name>Border Width</Name>
<Tooltip>The width of the border arround the container</Tooltip>
<GtkArg>border</GtkArg>
<Parameters>
<Parameter Key="Min" Value="0"/>
<Parameter Key="Max" Value="10000"/>
<Parameter Key="Default" Value="0"/>
<Parameter Key="StepIncrement" Value="1"/>
<Parameter Key="PageIncrement" Value="10"/>
<Parameter Key="ClibmRate" Value="1"/>
</Parameters>
<Name>border</Name>
<ParamSpec/>
</Property>
<Property>
<Type>Text</Type>
<Name>Label</Name>
<Tooltip>The text to display</Tooltip>
<GtkArg>label</GtkArg>
<Parameters>
<Parameter Key="VisibleLines" Value="1"/>
<Parameter Key="Default" Value=""/>
</Parameters>
<Name>label</Name>
<ParamSpec/>
</Property>
<Property>
......
......@@ -7,29 +7,13 @@
<Properties>
<Property>
<Type>Integer</Type>
<Name>Border Width</Name>
<Tooltip>The width of the border arround the container</Tooltip>
<GtkArg>border</GtkArg>
<Parameters>
<Parameter Key="Min" Value="0"/>
<Parameter Key="Max" Value="10000"/>
<Parameter Key="Default" Value="0"/>
<Parameter Key="StepIncrement" Value="1"/>
<Parameter Key="PageIncrement" Value="10"/>
<Parameter Key="ClibmRate" Value="1"/>
</Parameters>
<Name>border</Name>
<ParamSpec/>
</Property>
<Property>
<Type>Text</Type>
<Name>Label</Name>
<Tooltip>The text to display</Tooltip>
<GtkArg>label</GtkArg>
<Parameters>
<Parameter Key="VisibleLines" Value="1"/>
<Parameter Key="Default" Value=""/>
</Parameters>
<Name>label</Name>
<ParamSpec/>
</Property>
<Property>
......
<GladeWidgetClass>
<Name>GtkEntry</Name>
<GetTypeFunction>gtk_entry_get_type</GetTypeFunction>
<GenericName>entry</GenericName>
<Toplevel>False</Toplevel>
<Icon>entry</Icon>
<Properties>
<Property>
<Name>editable</Name>
<ParamSpec/>
</Property>
<Property>
<Name>visibility</Name>
<ParamSpec/>
</Property>
<Property>
<Name>max-length</Name>
<ParamSpec/>
</Property>
</Properties>
</GladeWidgetClass>
\ No newline at end of file
<GladeWidgetClass>
<Name>GtkFrame</Name>
<GetTypeFunction>gtk_frame_get_type</GetTypeFunction>
<GenericName>frame</GenericName>
<Toplevel>False</Toplevel>
<Icon>frame</Icon>
<Properties>
<Property>
<Name>label</Name>
<ParamSpec/>
</Property>
</Properties>
</GladeWidgetClass>
\ No newline at end of file
......@@ -7,34 +7,15 @@
<Icon>hbox</Icon>
<Properties>
<Property>
<Type>Integer</Type>
<Name>Border Width</Name>
<Tooltip>The width of the border arround the container</Tooltip>
<GtkArg>border</GtkArg>
<Parameters>
<Parameter Key="Min" Value="0"/>
<Parameter Key="Max" Value="10000"/>
<Parameter Key="Default" Value="0"/>
<Parameter Key="StepIncrement" Value="1"/>
<Parameter Key="PageIncrement" Value="10"/>
<Parameter Key="ClibmRate" Value="1"/>
</Parameters>
<Name>border</Name>
<ParamSpec/>
</Property>
<Property>
<Type>Integer</Type>
<Name>Size</Name>
<Tooltip>Number of widgets in the box</Tooltip>
<GtkArg>size</GtkArg>
<Parameters>
<Parameter Key="Min" Value="0"/>
<Parameter Key="Max" Value="10000"/>
<Parameter Key="Default" Value="3"/>
<Parameter Key="StepIncrement" Value="1"/>
<Parameter Key="PageIncrement" Value="10"/>
<Parameter Key="ClibmRate" Value="1"/>
</Parameters>
<Name>size</Name>
<ParamSpec/>
<Query>
<WindowTitle>New vertical box</WindowTitle>
<Question>Number of rows</Question>
......@@ -42,19 +23,10 @@
</Property>
<Property>
<Type>Integer</Type>
<Name>Spacing</Name>
<Tooltip>The space between each child</Tooltip>
<GtkArg>spacing</GtkArg>
<Parameters>
<Parameter Key="Min" Value="0"/>
<Parameter Key="Max" Value="10000"/>
<Parameter Key="Default" Value="3"/>
<Parameter Key="StepIncrement" Value="1"/>
<Parameter Key="PageIncrement" Value="10"/>
<Parameter Key="ClibmRate" Value="1"/>
</Parameters>
<Name>spacing</Name>
<ParamSpec/>
</Property>
</Properties>
</GladeWidgetClass>
<GladeWidgetClass>
<Name>GtkLabel</Name>
<GetTypeFunction>gtk_label_get_type</GetTypeFunction>
<GenericName>label</GenericName>
<Toplevel>False</Toplevel>
<Icon>label</Icon>
<Properties>
<Property>
<Type>Text</Type>
<Name>label</Name>
<ParamSpec/>
<Parameters>
<Parameter Key="VisibleLines" Value="1"/>
</Parameters>
<Name>Label</Name>
<Tooltip>The text to disaplay</Tooltip>
<GtkArg>label</GtkArg>
</Property>
<Property>
<Name>justify</Name>
<ParamSpec/>
</Property>
<Property>
<Name>wrap</Name>
<ParamSpec/>
</Property>
<Property>
<Name>xalign</Name>
<ParamSpec/>
</Property>
<Property>
<Name>yalign</Name>
<ParamSpec/>
</Property>
<Property>
<Name>xpad</Name>
<ParamSpec/>
</Property>
<Property>
<Name>ypad</Name>
<ParamSpec/>
</Property>
</Properties>
</GladeWidgetClass>
<GladeWidgetClass>
<Name>GtkNotebook</Name>
<GetTypeFunction>gtk_notebook_get_type</GetTypeFunction>
<GenericName>notebook</GenericName>
<Toplevel>False</Toplevel>
<Icon>notebook</Icon>
<Properties>
<Property>
<Name>name</Name>
<ParamSpec/>
</Property>
</Properties>
</GladeWidgetClass>
\ No newline at end of file
......@@ -7,19 +7,10 @@
<Placeholder>True</Placeholder>
<Properties>
<Property>
<Type>Integer</Type>
<Name>Border Width</Name>
<Tooltip>The width of the border arround the container</Tooltip>
<GtkArg>border-width</GtkArg>
<Parameters>
<Parameter Key="Min" Value="0"/>
<Parameter Key="Max" Value="10000"/>
<Parameter Key="Default" Value="0"/>
<Parameter Key="StepIncrement" Value="1"/>
<Parameter Key="PageIncrement" Value="10"/>
<Parameter Key="ClibmRate" Value="1"/>
</Parameters>
<Name>border-width</Name>
<ParamSpec/>
</Property>
<Property>
......@@ -61,41 +52,20 @@
</Property>
<Property>
<Type>Boolean</Type>
<Name>Homogeneous</Name>
<Tooltip>If the children should be the same size</Tooltip>
<GtkArg>homogeneous</GtkArg>
<Name>homogeneous</Name>
<ParamSpec/>
</Property>
<Property>
<Type>Integer</Type>
<Name>Row Spacing</Name>
<Tooltip>The space between each row</Tooltip>
<GtkArg>row-spacing</GtkArg>
<Parameters>
<Parameter Key="Min" Value="0"/>
<Parameter Key="Max" Value="10000"/>
<Parameter Key="Default" Value="3"/>
<Parameter Key="StepIncrement" Value="1"/>
<Parameter Key="PageIncrement" Value="10"/>
<Parameter Key="ClibmRate" Value="1"/>
</Parameters>
<Name>row-spacing</Name>
<ParamSpec/>
</Property>
<Property>
<Type>Integer</Type>
<Name>Col Spacing</Name>
<Tooltip>The space between each column</Tooltip>
<GtkArg>column-spacing</GtkArg>
<Parameters>
<Parameter Key="Min" Value="0"/>
<Parameter Key="Max" Value="10000"/>
<Parameter Key="Default" Value="3"/>
<Parameter Key="StepIncrement" Value="1"/>
<Parameter Key="PageIncrement" Value="10"/>
<Parameter Key="ClibmRate" Value="1"/>
</Parameters>
<Name>column-spacing</Name>
<ParamSpec/>
</Property>
</Properties>
</GladeWidgetClass>
......@@ -7,34 +7,14 @@
<Placeholder>True</Placeholder>
<Properties>
<Property>
<Type>Integer</Type>
<Name>Border Width</Name>
<Tooltip>The width of the border arround the container</Tooltip>
<GtkArg>border-width</GtkArg>
<Parameters>
<Parameter Key="Min" Value="0"/>
<Parameter Key="Max" Value="10000"/>
<Parameter Key="Default" Value="0"/>
<Parameter Key="StepIncrement" Value="1"/>
<Parameter Key="PageIncrement" Value="10"/>
<Parameter Key="ClibmRate" Value="1"/>
</Parameters>
<Name>border-width</Name>
<ParamSpec/>
</Property>
<Property>
<Type>Integer</Type>
<Name>Size</Name>
<Tooltip>Number of widgets in the box</Tooltip>
<GtkArg>size</GtkArg>
<Parameters>
<Parameter Key="Min" Value="0"/>
<Parameter Key="Max" Value="10000"/>
<Parameter Key="Default" Value="3"/>
<Parameter Key="StepIncrement" Value="1"/>
<Parameter Key="PageIncrement" Value="10"/>
<Parameter Key="ClibmRate" Value="1"/>
</Parameters>
<Name>size</Name>
<Query>
<WindowTitle>New vertical box</WindowTitle>
<Question>Number of rows</Question>
......@@ -42,18 +22,8 @@
</Property>
<Property>
<Type>Integer</Type>
<Name>Spacing</Name>
<Tooltip>The space between each child</Tooltip>
<GtkArg>spacing</GtkArg>
<Parameters>
<Parameter Key="Min" Value="0"/>
<Parameter Key="Max" Value="10000"/>
<Parameter Key="Default" Value="3"/>
<Parameter Key="StepIncrement" Value="1"/>
<Parameter Key="PageIncrement" Value="10"/>
<Parameter Key="ClibmRate" Value="1"/>
</Parameters>
<Name>spacing</Name>
<ParamSpec/>
</Property>
</Properties>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment