Commit 1c8d85ee authored by Arturo Espinosa's avatar Arturo Espinosa

1. Added the .h files for the various glade files that were missing it. 2.



1. Added the .h files for the various glade files that were missing it.
2. Added sheet-object-widget to add widgets to the spreadsheet (
   will move most of sheet-object-container there later).
3. test for the buttons.

Miguel.
parent 7820bfcf
......@@ -128,6 +128,8 @@ GNUMERIC_BASE_SOURCES = \
sheet-autofill.h \
sheet-object.c \
sheet-object.h \
sheet-object-widget.c \
sheet-object-widget.h \
sheet-object-graphic.c \
sheet-object-graphic.h \
sheet-view.c \
......
......@@ -32,6 +32,7 @@
<title>window1</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
......@@ -49,6 +50,10 @@
<widget>
<class>GtkEntry</class>
<name>font-style-entry</name>
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
......@@ -63,15 +68,17 @@
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
</widget>
<widget>
<class>GtkEntry</class>
<name>font-size-entry</name>
<width>60</width>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
......@@ -86,17 +93,18 @@
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<width>60</width>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
</widget>
<widget>
<class>GtkLabel</class>
<name>label1</name>
<label>Font:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
......@@ -111,18 +119,18 @@
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<label>Font:</label>
</widget>
<widget>
<class>GtkLabel</class>
<name>label2</name>
<label>Font style:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkLabel</class>
<name>label2</name>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
......@@ -137,18 +145,18 @@
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<label>Font style:</label>
</widget>
<widget>
<class>GtkLabel</class>
<name>label3</name>
<label>Size:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkLabel</class>
<name>label3</name>
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
......@@ -163,18 +171,15 @@
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<label>Size:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkEntry</class>
<name>font-name-entry</name>
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
......@@ -189,16 +194,15 @@
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
</widget>
<widget>
<class>GtkFrame</class>
<name>frame1</name>
<border_width>4</border_width>
<label>Preview:</label>
<label_xalign>0</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<child>
<left_attach>0</left_attach>
<right_attach>3</right_attach>
......@@ -213,9 +217,6 @@
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<label>Preview:</label>
<label_xalign>0</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<widget>
<class>GtkVBox</class>
......@@ -226,16 +227,16 @@
<widget>
<class>GtkEntry</class>
<name>preview-entry</name>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text>AaBbCcDdEe12345</text>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
</widget>
</widget>
</widget>
......@@ -243,6 +244,11 @@
<widget>
<class>GtkScrolledWindow</class>
<name>scrolledwindow1</name>
<height>120</height>
<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
......@@ -257,11 +263,6 @@
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<height>120</height>
<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<widget>
<class>GtkCList</class>
......@@ -291,6 +292,10 @@
<widget>
<class>GtkScrolledWindow</class>
<name>scrolledwindow2</name>
<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
......@@ -305,10 +310,6 @@
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<widget>
<class>GtkCList</class>
......@@ -338,6 +339,10 @@
<widget>
<class>GtkScrolledWindow</class>
<name>scrolledwindow3</name>
<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
......@@ -352,10 +357,6 @@
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<widget>
<class>GtkCList</class>
......
......@@ -28,41 +28,51 @@
<widget>
<class>GnomeDialog</class>
<name>hf-config</name>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>False</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox1</name>
<homogeneous>False</homogeneous>
<spacing>8</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<homogeneous>False</homogeneous>
<spacing>8</spacing>
<widget>
<class>GtkTable</class>
<name>table1</name>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<rows>3</rows>
<columns>3</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
<column_spacing>0</column_spacing>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkLabel</class>
<name>label1</name>
<label>Left section</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
......@@ -77,18 +87,18 @@
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<label>Left section</label>
</widget>
<widget>
<class>GtkLabel</class>
<name>label2</name>
<label>Center section:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkLabel</class>
<name>label2</name>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
......@@ -103,18 +113,18 @@
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<label>Center section:</label>
</widget>
<widget>
<class>GtkLabel</class>
<name>label3</name>
<label>Right section:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkLabel</class>
<name>label3</name>
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
......@@ -129,18 +139,18 @@
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<label>Right section:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkLabel</class>
<name>label4</name>
<label>Enter the format strings for each section:</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>2</ypad>
<child>
<left_attach>0</left_attach>
<right_attach>3</right_attach>
......@@ -155,18 +165,16 @@
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<label>Enter the format strings for each section:</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>2</ypad>
</widget>
<widget>
<class>GtkText</class>
<name>left-format</name>
<width>130</width>
<height>130</height>
<can_focus>True</can_focus>
<editable>True</editable>
<text></text>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
......@@ -181,16 +189,16 @@
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<width>130</width>
<height>130</height>
<can_focus>True</can_focus>
<editable>True</editable>
<text></text>
</widget>
<widget>
<class>GtkText</class>
<name>center-format</name>
<width>130</width>
<height>130</height>
<can_focus>True</can_focus>
<editable>True</editable>
<text></text>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
......@@ -205,16 +213,16 @@
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<width>130</width>
<height>130</height>
<can_focus>True</can_focus>
<editable>True</editable>
<text></text>
</widget>
<widget>
<class>GtkText</class>
<name>right-format</name>
<width>130</width>
<height>130</height>
<can_focus>True</can_focus>
<editable>True</editable>
<text></text>
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
......@@ -229,11 +237,6 @@
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<width>130</width>
<height>130</height>
<can_focus>True</can_focus>
<editable>True</editable>
<text></text>
</widget>
</widget>
......@@ -241,18 +244,18 @@
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area1</name>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<widget>
<class>GtkButton</class>
......
......@@ -4,7 +4,7 @@
* DO NOT compile it as part of your application.
*/
gchar *s = N_("Left section:");
gchar *s = N_("Left section");
gchar *s = N_("Center section:");
gchar *s = N_("Right section:");
gchar *s = N_("Enter the format strings for each section:");
......@@ -30,43 +30,41 @@
<name>import-dialog</name>
<border_width>2</border_width>
<visible>False</visible>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>False</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox</name>
<homogeneous>False</homogeneous>
<spacing>8</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<homogeneous>False</homogeneous>
<spacing>8</spacing>
<widget>
<class>GtkVBox</class>
<name>contents</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkLabel</class>
<name>label1</name>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<label>Choose an import filter for loading the file:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
......@@ -74,16 +72,16 @@
<yalign>0.5</yalign>
<xpad>5</xpad>
<ypad>5</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkCList</class>
<name>import-clist</name>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<height>113</height>
<can_focus>True</can_focus>
<columns>1</columns>
......@@ -91,6 +89,11 @@
<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<show_titles>False</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkLabel</class>
......@@ -111,18 +114,18 @@
<class>GtkHButtonBox</class>
<child_name>GnomeDialog:action_area</child_name>
<name>dialog-action_area1</name>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<layout_style>GTK_BUTTONBOX_END</layout_style>
<spacing>8</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<widget>
<class>GtkButton</class>
......
......@@ -2,6 +2,8 @@
<GTK-Interface>
<project>
<name>Dialogs</name>
<program_name>dialogs</program_name>
<directory></directory>
<source_directory>src</source_directory>
<pixmaps_directory>pixmaps</pixmaps_directory>
......@@ -19,41 +21,45 @@
<handler_header_file>callbacks.h</handler_header_file>
<support_source_file>support.c</support_source_file>
<support_header_file>support.h</support_header_file>
<translatable_strings_file></translatable_strings_file>
<output_translatable_strings>True</output_translatable_strings>
<translatable_strings_file>names.glade.h</translatable_strings_file>
</project>
<widget>
<class>GnomeDialog</class>
<name>NamesDialog</name>
<title>Define Name</title>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
<allow_grow>False</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_close>False</auto_close>
<hide_on_close>False</hide_on_close>
<widget>
<class>GtkVBox</class>
<child_name>GnomeDialog:vbox</child_name>
<name>dialog-vbox1</name>
<homogeneous>False</homogeneous>
<spacing>8</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<homogeneous>False</homogeneous>
<spacing>8</spacing>
<widget>
<class>GtkVBox</class>
<name>vbox2</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkHSeparator</class>
......@@ -68,11 +74,6 @@
<widget>
<class>GtkLabel</class>
<name>label3</name>
<child>
<padding>5</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<label>Names in workbook:</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
......@@ -80,25 +81,31 @@
<yalign>1</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>5</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkTable</class>
<name>table2</name>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<rows>6</rows>
<columns>2</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
<column_spacing>0</column_spacing>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkList</class>
<name>name_list</name>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
......@@ -113,12 +120,14 @@
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
</widget>
<widget>
<class>GtkButton</class>
<name>ok</name>
<has_default>True</has_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
......@@ -133,14 +142,14 @@
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<has_default>True</has_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>add</name>
<height>24</height>
<can_focus>True</can_focus>
<label>Add</label>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
......@@ -155,14 +164,13 @@
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<height>24</height>
<can_focus>True</can_focus>
<label>Add</label>
</widget>
<widget>
<class>GtkButton</class>
<name>close</name>