Date: Friday February 13, 2004 @ 23:28 Author: cameron Update of /home/netrek/cvsroot/Vanilla/gum In directory swashbuckler.real-time.com:/var/tmp/cvs-serv4659 Modified Files: ChangeLog gum.xml main.c support.c Log Message: add pret support to server admin gui (main.c and support.c are generated code from glade) **************************************** Index: Vanilla/gum/ChangeLog diff -u Vanilla/gum/ChangeLog:1.12 Vanilla/gum/ChangeLog:1.13 --- Vanilla/gum/ChangeLog:1.12 Fri Feb 13 22:03:37 2004 +++ Vanilla/gum/ChangeLog Fri Feb 13 23:28:14 2004 @@ -1,3 +1,8 @@ +Sat Feb 14 16:24:06 2004 James Cameron <quozl at us.netrek.org> + + * gum.xml: add PRET support following untracked change to + sysdefaults.h. + Sat Feb 14 15:00:16 2004 James Cameron <quozl at us.netrek.org> * Makefile.am (install-data-local): add DESTDIR support for @@ -81,6 +86,6 @@ * signals.c (on_About_activate): revise about screen to show who to complain to. - $Id: ChangeLog,v 1.12 2004/02/14 04:03:37 cameron Exp $ + $Id: ChangeLog,v 1.13 2004/02/14 05:28:14 cameron Exp $ Index: Vanilla/gum/gum.xml diff -u Vanilla/gum/gum.xml:1.12 Vanilla/gum/gum.xml:1.13 --- Vanilla/gum/gum.xml:1.12 Thu May 10 20:45:59 2001 +++ Vanilla/gum/gum.xml Fri Feb 13 23:28:14 2004 @@ -10,17 +10,11 @@ <language>C</language> <gnome_support>False</gnome_support> <gettext_support>False</gettext_support> - <use_widget_names>False</use_widget_names> <output_main_file>False</output_main_file> - <output_support_files>True</output_support_files> - <output_build_files>True</output_build_files> - <backup_source_files>True</backup_source_files> <main_source_file>main.c</main_source_file> <main_header_file>main.h</main_header_file> <handler_source_file>signals.c</handler_source_file> <handler_header_file>signals.h</handler_header_file> - <support_source_file>support.c</support_source_file> - <support_header_file>support.h</support_header_file> </project> <widget> @@ -699,6 +693,7 @@ <last_modification_time>Tue, 09 Feb 1999 23:22:27 GMT</last_modification_time> </signal> <label>Add</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -712,6 +707,7 @@ <last_modification_time>Wed, 10 Feb 1999 13:01:48 GMT</last_modification_time> </signal> <label>Update</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -726,6 +722,7 @@ <last_modification_time>Tue, 09 Feb 1999 23:22:40 GMT</last_modification_time> </signal> <label>Delete</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -740,6 +737,7 @@ <last_modification_time>Tue, 09 Feb 1999 23:22:55 GMT</last_modification_time> </signal> <label>Save</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> </widget> @@ -756,7 +754,7 @@ <widget> <class>GtkLabel</class> <name>label139</name> - <label>Listener Process Commands</label> + <label>netrekd - Listener Process Commands</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> @@ -826,6 +824,7 @@ <last_modification_time>Tue, 09 Feb 1999 23:23:58 GMT</last_modification_time> </signal> <label>Enable</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -840,6 +839,7 @@ <last_modification_time>Tue, 09 Feb 1999 23:24:23 GMT</last_modification_time> </signal> <label>Start</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -854,6 +854,7 @@ <last_modification_time>Tue, 09 Feb 1999 23:24:32 GMT</last_modification_time> </signal> <label>Restart</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -868,6 +869,7 @@ <last_modification_time>Tue, 09 Feb 1999 23:24:44 GMT</last_modification_time> </signal> <label>Stop</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> </widget> </widget> @@ -1840,6 +1842,7 @@ <last_modification_time>Tue, 25 May 1999 06:55:47 GMT</last_modification_time> </signal> <label>Add</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -1852,6 +1855,7 @@ <last_modification_time>Tue, 25 May 1999 06:55:53 GMT</last_modification_time> </signal> <label>Update</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -1864,6 +1868,7 @@ <last_modification_time>Tue, 25 May 1999 06:56:10 GMT</last_modification_time> </signal> <label>Delete</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -1876,6 +1881,7 @@ <last_modification_time>Tue, 25 May 1999 06:56:19 GMT</last_modification_time> </signal> <label>Save</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> </widget> </widget> @@ -2048,6 +2054,7 @@ <last_modification_time>Thu, 14 Jan 1999 16:22:13 GMT</last_modification_time> </signal> <label>Select File...</label> + <relief>GTK_RELIEF_NORMAL</relief> <child> <padding>0</padding> <expand>True</expand> @@ -3045,6 +3052,7 @@ <name>WEAPONS_PLASMA</name> <can_focus>True</can_focus> <label>PLASMA</label> + <relief>GTK_RELIEF_NORMAL</relief> <active>True</active> <child> <padding>0</padding> @@ -3058,6 +3066,7 @@ <name>WEAPONS_TRACTOR</name> <can_focus>True</can_focus> <label>TRACTOR</label> + <relief>GTK_RELIEF_NORMAL</relief> <active>True</active> <child> <padding>0</padding> @@ -5900,9 +5909,9 @@ <widget> <class>GtkTable</class> - <name>table7</name> + <name>table16</name> <border_width>6</border_width> - <rows>4</rows> + <rows>5</rows> <columns>2</columns> <homogeneous>False</homogeneous> <row_spacing>6</row_spacing> @@ -5910,8 +5919,8 @@ <widget> <class>GtkLabel</class> - <name>label126</name> - <label>Base Practice Mode Settings + <name>label1395</name> + <label>Newbie Mode Settings </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -5937,8 +5946,8 @@ <widget> <class>GtkLabel</class> - <name>BASEPRACTICE_LABEL</name> - <label>BASEPRACTICE:</label> + <name>NEWBIE_LABEL</name> + <label>NEWBIE:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> @@ -5962,9 +5971,113 @@ </widget> <widget> + <class>GtkHBox</class> + <name>hbox56</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> + <child> + <left_attach>1</left_attach> + <right_attach>2</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> + </child> + + <widget> + <class>GtkRadioButton</class> + <name>NEWBIE_0</name> + <can_focus>True</can_focus> + <label>No</label> + <active>False</active> + <draw_indicator>True</draw_indicator> + <group>NEWBIE</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>NEWBIE_1</name> + <can_focus>True</can_focus> + <label>Yes</label> + <active>False</active> + <draw_indicator>True</draw_indicator> + <group>NEWBIE</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> + </widget> + + <widget> <class>GtkLabel</class> - <name>ROBOTHOST_LABEL</name> - <label>ROBOTHOST:</label> + <name>label1397</name> + <label></label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <child> + <left_attach>0</left_attach> + <right_attach>2</right_attach> + <top_attach>4</top_attach> + <bottom_attach>5</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>True</xexpand> + <yexpand>True</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> + </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1398</name> + <label>Pre-T-mode Entertainment Settings +</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <child> + <left_attach>0</left_attach> + <right_attach>2</right_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>False</yfill> + </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>PRET_LABEL</name> + <label>PRET:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> @@ -5974,8 +6087,8 @@ <child> <left_attach>0</left_attach> <right_attach>1</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> + <top_attach>3</top_attach> + <bottom_attach>4</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -5983,20 +6096,20 @@ <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> - <yfill>True</yfill> + <yfill>False</yfill> </child> </widget> <widget> <class>GtkHBox</class> - <name>hbox42</name> + <name>hbox59</name> <homogeneous>False</homogeneous> <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> + <top_attach>3</top_attach> + <bottom_attach>4</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -6009,12 +6122,12 @@ <widget> <class>GtkRadioButton</class> - <name>BASEPRACTICE_0</name> + <name>PRET_0</name> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> - <group>BASEPRACTICE</group> + <group>PRET</group> <child> <padding>0</padding> <expand>False</expand> @@ -6024,12 +6137,12 @@ <widget> <class>GtkRadioButton</class> - <name>BASEPRACTICE_1</name> + <name>PRET_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> - <group>BASEPRACTICE</group> + <group>PRET</group> <child> <padding>0</padding> <expand>False</expand> @@ -6037,17 +6150,41 @@ </child> </widget> </widget> + </widget> + + <widget> + <class>GtkLabel</class> + <child_name>Notebook:tab</child_name> + <name>label1392</name> + <label>Robots</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + </widget> + + <widget> + <class>GtkTable</class> + <name>table9</name> + <border_width>6</border_width> + <rows>4</rows> + <columns>2</columns> + <homogeneous>False</homogeneous> + <row_spacing>6</row_spacing> + <column_spacing>6</column_spacing> <widget> <class>GtkHBox</class> - <name>hbox43</name> + <name>hbox45</name> <homogeneous>False</homogeneous> <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -6059,25 +6196,41 @@ </child> <widget> - <class>GtkEntry</class> - <name>ROBOTHOST</name> + <class>GtkRadioButton</class> + <name>INL_0</name> <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> + <label>No</label> + <active>False</active> + <draw_indicator>True</draw_indicator> + <group>INL</group> <child> <padding>0</padding> - <expand>True</expand> - <fill>True</fill> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>INL_1</name> + <can_focus>True</can_focus> + <label>Yes</label> + <active>False</active> + <draw_indicator>True</draw_indicator> + <group>INL</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> </child> </widget> </widget> <widget> <class>GtkLabel</class> - <name>label127</name> - <label></label> + <name>inl</name> + <label>INL Server Settings +</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> @@ -6087,48 +6240,23 @@ <child> <left_attach>0</left_attach> <right_attach>2</right_attach> - <top_attach>3</top_attach> - <bottom_attach>4</bottom_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> - <yexpand>True</yexpand> + <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> <yfill>True</yfill> </child> </widget> - </widget> - - <widget> - <class>GtkLabel</class> - <child_name>Notebook:tab</child_name> - <name>label51</name> - <label>Base Practice</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - </widget> - - <widget> - <class>GtkTable</class> - <name>table16</name> - <border_width>6</border_width> - <rows>3</rows> - <columns>2</columns> - <homogeneous>False</homogeneous> - <row_spacing>6</row_spacing> - <column_spacing>6</column_spacing> <widget> <class>GtkLabel</class> - <name>label1395</name> - <label>Newbie Mode Settings -</label> + <name>label130</name> + <label></label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> @@ -6138,12 +6266,12 @@ <child> <left_attach>0</left_attach> <right_attach>2</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> + <top_attach>3</top_attach> + <bottom_attach>4</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>True</xexpand> - <yexpand>False</yexpand> + <yexpand>True</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> @@ -6153,8 +6281,8 @@ <widget> <class>GtkLabel</class> - <name>NEWBIE_LABEL</name> - <label>NEWBIE:</label> + <name>INL_LABEL</name> + <label>INL:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> @@ -6168,7 +6296,33 @@ <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>False</xexpand> + <xexpand>True</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> + </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>INL_RECORD_LABEL</name> + <label>INL_RECORD:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> + <child> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>True</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> @@ -6179,17 +6333,17 @@ <widget> <class>GtkHBox</class> - <name>hbox56</name> + <name>hbox55</name> <homogeneous>False</homogeneous> <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>False</xexpand> + <xexpand>True</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> @@ -6199,12 +6353,12 @@ <widget> <class>GtkRadioButton</class> - <name>NEWBIE_0</name> + <name>INL_RECORD_0</name> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> - <group>NEWBIE</group> + <group>INL_RECORD</group> <child> <padding>0</padding> <expand>False</expand> @@ -6214,12 +6368,12 @@ <widget> <class>GtkRadioButton</class> - <name>NEWBIE_1</name> + <name>INL_RECORD_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> - <group>NEWBIE</group> + <group>INL_RECORD</group> <child> <padding>0</padding> <expand>False</expand> @@ -6227,39 +6381,13 @@ </child> </widget> </widget> - - <widget> - <class>GtkLabel</class> - <name>label1397</name> - <label></label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <child> - <left_attach>0</left_attach> - <right_attach>2</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>True</xexpand> - <yexpand>True</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>True</yfill> - </child> - </widget> </widget> <widget> <class>GtkLabel</class> <child_name>Notebook:tab</child_name> - <name>label1392</name> - <label>Newbie</label> + <name>INL_NOTEBOOK_LABEL</name> + <label>INL</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> @@ -6270,9 +6398,9 @@ <widget> <class>GtkTable</class> - <name>table8</name> + <name>table7</name> <border_width>6</border_width> - <rows>3</rows> + <rows>4</rows> <columns>2</columns> <homogeneous>False</homogeneous> <row_spacing>6</row_spacing> @@ -6280,8 +6408,8 @@ <widget> <class>GtkLabel</class> - <name>label128</name> - <label>Hockey Mode Settings + <name>label126</name> + <label>Base Practice Mode Settings </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -6307,38 +6435,17 @@ <widget> <class>GtkLabel</class> - <name>HOCKEY_LABEL</name> - <label>HOCKEY:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> - <child> - <left_attach>0</left_attach> - <right_attach>1</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>True</yfill> - </child> - </widget> - - <widget> - <class>GtkHBox</class> - <name>hbox44</name> - <homogeneous>False</homogeneous> - <spacing>0</spacing> + <name>BASEPRACTICE_LABEL</name> + <label>BASEPRACTICE:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> - <left_attach>1</left_attach> - <right_attach>2</right_attach> + <left_attach>0</left_attach> + <right_attach>1</right_attach> <top_attach>1</top_attach> <bottom_attach>2</bottom_attach> <xpad>0</xpad> @@ -6350,91 +6457,37 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - - <widget> - <class>GtkRadioButton</class> - <name>HOCKEY_0</name> - <can_focus>True</can_focus> - <label>No</label> - <active>False</active> - <draw_indicator>True</draw_indicator> - <group>HOCKEY</group> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>HOCKEY_1</name> - <can_focus>True</can_focus> - <label>Yes</label> - <active>False</active> - <draw_indicator>True</draw_indicator> - <group>HOCKEY</group> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> </widget> <widget> <class>GtkLabel</class> - <name>label131</name> - <label></label> + <name>ROBOTHOST_LABEL</name> + <label>ROBOTHOST:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> - <xalign>0.5</xalign> + <xalign>1</xalign> <yalign>0.5</yalign> - <xpad>0</xpad> + <xpad>10</xpad> <ypad>0</ypad> <child> <left_attach>0</left_attach> - <right_attach>2</right_attach> + <right_attach>1</right_attach> <top_attach>2</top_attach> <bottom_attach>3</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>True</xexpand> - <yexpand>True</yexpand> + <xexpand>False</xexpand> + <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> <yfill>True</yfill> </child> </widget> - </widget> - - <widget> - <class>GtkLabel</class> - <child_name>Notebook:tab</child_name> - <name>label54</name> - <label>Hockey</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - </widget> - - <widget> - <class>GtkTable</class> - <name>table9</name> - <border_width>6</border_width> - <rows>4</rows> - <columns>2</columns> - <homogeneous>False</homogeneous> - <row_spacing>6</row_spacing> - <column_spacing>6</column_spacing> <widget> <class>GtkHBox</class> - <name>hbox45</name> + <name>hbox42</name> <homogeneous>False</homogeneous> <spacing>0</spacing> <child> @@ -6454,12 +6507,12 @@ <widget> <class>GtkRadioButton</class> - <name>INL_0</name> + <name>BASEPRACTICE_0</name> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> - <group>INL</group> + <group>BASEPRACTICE</group> <child> <padding>0</padding> <expand>False</expand> @@ -6469,12 +6522,12 @@ <widget> <class>GtkRadioButton</class> - <name>INL_1</name> + <name>BASEPRACTICE_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> - <group>INL</group> + <group>BASEPRACTICE</group> <child> <padding>0</padding> <expand>False</expand> @@ -6484,21 +6537,15 @@ </widget> <widget> - <class>GtkLabel</class> - <name>inl</name> - <label>INL Server Settings -</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> + <class>GtkHBox</class> + <name>hbox43</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> - <left_attach>0</left_attach> + <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -6508,11 +6555,26 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + + <widget> + <class>GtkEntry</class> + <name>ROBOTHOST</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> + </widget> </widget> <widget> <class>GtkLabel</class> - <name>label130</name> + <name>label127</name> <label></label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -6527,7 +6589,7 @@ <bottom_attach>4</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>True</xexpand> + <xexpand>False</xexpand> <yexpand>True</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> @@ -6535,22 +6597,47 @@ <yfill>True</yfill> </child> </widget> + </widget> + + <widget> + <class>GtkLabel</class> + <child_name>Notebook:tab</child_name> + <name>label51</name> + <label>Base Practice</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + </widget> + + <widget> + <class>GtkTable</class> + <name>table8</name> + <border_width>6</border_width> + <rows>3</rows> + <columns>2</columns> + <homogeneous>False</homogeneous> + <row_spacing>6</row_spacing> + <column_spacing>6</column_spacing> <widget> <class>GtkLabel</class> - <name>INL_LABEL</name> - <label>INL:</label> + <name>label128</name> + <label>Hockey Mode Settings +</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> - <xalign>1</xalign> + <xalign>0.5</xalign> <yalign>0.5</yalign> - <xpad>10</xpad> + <xpad>0</xpad> <ypad>0</ypad> <child> <left_attach>0</left_attach> - <right_attach>1</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> + <right_attach>2</right_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>True</xexpand> @@ -6564,8 +6651,8 @@ <widget> <class>GtkLabel</class> - <name>INL_RECORD_LABEL</name> - <label>INL_RECORD:</label> + <name>HOCKEY_LABEL</name> + <label>HOCKEY:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> @@ -6575,11 +6662,11 @@ <child> <left_attach>0</left_attach> <right_attach>1</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>True</xexpand> + <xexpand>False</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> @@ -6590,17 +6677,17 @@ <widget> <class>GtkHBox</class> - <name>hbox55</name> + <name>hbox44</name> <homogeneous>False</homogeneous> <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>True</xexpand> + <xexpand>False</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> @@ -6610,12 +6697,12 @@ <widget> <class>GtkRadioButton</class> - <name>INL_RECORD_0</name> + <name>HOCKEY_0</name> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> - <group>INL_RECORD</group> + <group>HOCKEY</group> <child> <padding>0</padding> <expand>False</expand> @@ -6625,12 +6712,12 @@ <widget> <class>GtkRadioButton</class> - <name>INL_RECORD_1</name> + <name>HOCKEY_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> - <group>INL_RECORD</group> + <group>HOCKEY</group> <child> <padding>0</padding> <expand>False</expand> @@ -6638,13 +6725,39 @@ </child> </widget> </widget> + + <widget> + <class>GtkLabel</class> + <name>label131</name> + <label></label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <child> + <left_attach>0</left_attach> + <right_attach>2</right_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>True</xexpand> + <yexpand>True</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> + </child> + </widget> </widget> <widget> <class>GtkLabel</class> <child_name>Notebook:tab</child_name> - <name>INL_NOTEBOOK_LABEL</name> - <label>INL</label> + <name>label54</name> + <label>Hockey</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> @@ -7500,6 +7613,7 @@ <last_modification_time>Thu, 14 Jan 1999 02:35:18 GMT</last_modification_time> </signal> <label>Reload</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -7512,6 +7626,7 @@ <last_modification_time>Thu, 14 Jan 1999 02:35:33 GMT</last_modification_time> </signal> <label>Save</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -7524,6 +7639,7 @@ <last_modification_time>Thu, 14 Jan 1999 02:35:43 GMT</last_modification_time> </signal> <label>Quit</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> </widget> </widget> @@ -7562,6 +7678,7 @@ <last_modification_time>Thu, 14 Jan 1999 15:51:20 GMT</last_modification_time> </signal> <label>OK</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -7576,6 +7693,7 @@ <last_modification_time>Thu, 14 Jan 1999 15:51:43 GMT</last_modification_time> </signal> <label>Cancel</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> </widget> @@ -7606,23 +7724,6 @@ <spacing>0</spacing> <widget> - <class>GtkLabel</class> - <name>message_label</name> - <label>unset label</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> <class>GtkHBox</class> <child_name>Dialog:action_area</child_name> <name>dialog-action_area1</name> @@ -7664,9 +7765,27 @@ <last_modification_time>Thu, 21 Jan 1999 13:13:58 GMT</last_modification_time> </signal> <label>OK</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> </widget> </widget> + + <widget> + <class>GtkLabel</class> + <name>message_label</name> + <label>unset label</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> </widget> </widget> @@ -7702,6 +7821,7 @@ <last_modification_time>Thu, 14 Jan 1999 15:48:14 GMT</last_modification_time> </signal> <label>OK</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -7716,6 +7836,7 @@ <last_modification_time>Thu, 14 Jan 1999 15:51:59 GMT</last_modification_time> </signal> <label>Cancel</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> </widget> @@ -7751,6 +7872,7 @@ <last_modification_time>Thu, 14 Jan 1999 15:51:07 GMT</last_modification_time> </signal> <label>OK</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> <widget> @@ -7765,6 +7887,7 @@ <last_modification_time>Thu, 14 Jan 1999 15:50:59 GMT</last_modification_time> </signal> <label>Cancel</label> + <relief>GTK_RELIEF_NORMAL</relief> </widget> </widget> Index: Vanilla/gum/main.c diff -u Vanilla/gum/main.c:1.11 Vanilla/gum/main.c:1.12 --- Vanilla/gum/main.c:1.11 Thu May 10 20:45:59 2001 +++ Vanilla/gum/main.c Fri Feb 13 23:28:14 2004 @@ -353,18 +353,6 @@ GtkWidget *MAX_POP; GtkWidget *label116; GtkWidget *label17; - GtkWidget *table7; - GtkWidget *label126; - GtkWidget *BASEPRACTICE_LABEL; - GtkWidget *ROBOTHOST_LABEL; - GtkWidget *hbox42; - GSList *BASEPRACTICE_group = NULL; - GtkWidget *BASEPRACTICE_0; - GtkWidget *BASEPRACTICE_1; - GtkWidget *hbox43; - GtkWidget *ROBOTHOST; - GtkWidget *label127; - GtkWidget *label51; GtkWidget *table16; GtkWidget *label1395; GtkWidget *NEWBIE_LABEL; @@ -373,16 +361,13 @@ GtkWidget *NEWBIE_0; GtkWidget *NEWBIE_1; GtkWidget *label1397; + GtkWidget *label1398; + GtkWidget *PRET_LABEL; + GtkWidget *hbox59; + GSList *PRET_group = NULL; + GtkWidget *PRET_0; + GtkWidget *PRET_1; GtkWidget *label1392; - GtkWidget *table8; - GtkWidget *label128; - GtkWidget *HOCKEY_LABEL; - GtkWidget *hbox44; - GSList *HOCKEY_group = NULL; - GtkWidget *HOCKEY_0; - GtkWidget *HOCKEY_1; - GtkWidget *label131; - GtkWidget *label54; GtkWidget *table9; GtkWidget *hbox45; GSList *INL_group = NULL; @@ -397,6 +382,27 @@ GtkWidget *INL_RECORD_0; GtkWidget *INL_RECORD_1; GtkWidget *INL_NOTEBOOK_LABEL; + GtkWidget *table7; + GtkWidget *label126; + GtkWidget *BASEPRACTICE_LABEL; + GtkWidget *ROBOTHOST_LABEL; + GtkWidget *hbox42; + GSList *BASEPRACTICE_group = NULL; + GtkWidget *BASEPRACTICE_0; + GtkWidget *BASEPRACTICE_1; + GtkWidget *hbox43; + GtkWidget *ROBOTHOST; + GtkWidget *label127; + GtkWidget *label51; + GtkWidget *table8; + GtkWidget *label128; + GtkWidget *HOCKEY_LABEL; + GtkWidget *hbox44; + GSList *HOCKEY_group = NULL; + GtkWidget *HOCKEY_0; + GtkWidget *HOCKEY_1; + GtkWidget *label131; + GtkWidget *label54; GtkWidget *table10; GtkWidget *label124; GtkWidget *DOGFIGHT_LABEL; @@ -828,7 +834,7 @@ gtk_widget_show (hseparator2); gtk_box_pack_start (GTK_BOX (vbox2), hseparator2, FALSE, TRUE, 6); - label139 = gtk_label_new ("Listener Process Commands"); + label139 = gtk_label_new ("netrekd - Listener Process Commands"); gtk_widget_ref (label139); gtk_object_set_data_full (GTK_OBJECT (gum), "label139", label139, (GtkDestroyNotify) gtk_widget_unref); @@ -3283,105 +3289,7 @@ gtk_widget_show (label17); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 6), label17); - table7 = gtk_table_new (4, 2, FALSE); - gtk_widget_ref (table7); - gtk_object_set_data_full (GTK_OBJECT (gum), "table7", table7, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (table7); - gtk_container_add (GTK_CONTAINER (notebook1), table7); - gtk_container_set_border_width (GTK_CONTAINER (table7), 6); - gtk_table_set_row_spacings (GTK_TABLE (table7), 6); - gtk_table_set_col_spacings (GTK_TABLE (table7), 6); - - label126 = gtk_label_new ("Base Practice Mode Settings\n"); - gtk_widget_ref (label126); - gtk_object_set_data_full (GTK_OBJECT (gum), "label126", label126, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label126); - gtk_table_attach (GTK_TABLE (table7), label126, 0, 2, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); - - BASEPRACTICE_LABEL = gtk_label_new ("BASEPRACTICE:"); - gtk_widget_ref (BASEPRACTICE_LABEL); - gtk_object_set_data_full (GTK_OBJECT (gum), "BASEPRACTICE_LABEL", BASEPRACTICE_LABEL, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (BASEPRACTICE_LABEL); - gtk_table_attach (GTK_TABLE (table7), BASEPRACTICE_LABEL, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_misc_set_alignment (GTK_MISC (BASEPRACTICE_LABEL), 1, 0.5); - gtk_misc_set_padding (GTK_MISC (BASEPRACTICE_LABEL), 10, 0); - - ROBOTHOST_LABEL = gtk_label_new ("ROBOTHOST:"); - gtk_widget_ref (ROBOTHOST_LABEL); - gtk_object_set_data_full (GTK_OBJECT (gum), "ROBOTHOST_LABEL", ROBOTHOST_LABEL, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (ROBOTHOST_LABEL); - gtk_table_attach (GTK_TABLE (table7), ROBOTHOST_LABEL, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_misc_set_alignment (GTK_MISC (ROBOTHOST_LABEL), 1, 0.5); - gtk_misc_set_padding (GTK_MISC (ROBOTHOST_LABEL), 10, 0); - - hbox42 = gtk_hbox_new (FALSE, 0); - gtk_widget_ref (hbox42); - gtk_object_set_data_full (GTK_OBJECT (gum), "hbox42", hbox42, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (hbox42); - gtk_table_attach (GTK_TABLE (table7), hbox42, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); - - BASEPRACTICE_0 = gtk_radio_button_new_with_label (BASEPRACTICE_group, "No"); - BASEPRACTICE_group = gtk_radio_button_group (GTK_RADIO_BUTTON (BASEPRACTICE_0)); - gtk_widget_ref (BASEPRACTICE_0); - gtk_object_set_data_full (GTK_OBJECT (gum), "BASEPRACTICE_0", BASEPRACTICE_0, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (BASEPRACTICE_0); - gtk_box_pack_start (GTK_BOX (hbox42), BASEPRACTICE_0, FALSE, FALSE, 0); - - BASEPRACTICE_1 = gtk_radio_button_new_with_label (BASEPRACTICE_group, "Yes"); - BASEPRACTICE_group = gtk_radio_button_group (GTK_RADIO_BUTTON (BASEPRACTICE_1)); - gtk_widget_ref (BASEPRACTICE_1); - gtk_object_set_data_full (GTK_OBJECT (gum), "BASEPRACTICE_1", BASEPRACTICE_1, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (BASEPRACTICE_1); - gtk_box_pack_start (GTK_BOX (hbox42), BASEPRACTICE_1, FALSE, FALSE, 0); - - hbox43 = gtk_hbox_new (FALSE, 0); - gtk_widget_ref (hbox43); - gtk_object_set_data_full (GTK_OBJECT (gum), "hbox43", hbox43, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (hbox43); - gtk_table_attach (GTK_TABLE (table7), hbox43, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); - - ROBOTHOST = gtk_entry_new (); - gtk_widget_ref (ROBOTHOST); - gtk_object_set_data_full (GTK_OBJECT (gum), "ROBOTHOST", ROBOTHOST, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (ROBOTHOST); - gtk_box_pack_start (GTK_BOX (hbox43), ROBOTHOST, TRUE, TRUE, 0); - - label127 = gtk_label_new (""); - gtk_widget_ref (label127); - gtk_object_set_data_full (GTK_OBJECT (gum), "label127", label127, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label127); - gtk_table_attach (GTK_TABLE (table7), label127, 0, 2, 3, 4, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); - - label51 = gtk_label_new ("Base Practice"); - gtk_widget_ref (label51); - gtk_object_set_data_full (GTK_OBJECT (gum), "label51", label51, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label51); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 7), label51); - - table16 = gtk_table_new (3, 2, FALSE); + table16 = gtk_table_new (5, 2, FALSE); gtk_widget_ref (table16); gtk_object_set_data_full (GTK_OBJECT (gum), "table16", table16, (GtkDestroyNotify) gtk_widget_unref); @@ -3441,87 +3349,61 @@ gtk_object_set_data_full (GTK_OBJECT (gum), "label1397", label1397, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1397); - gtk_table_attach (GTK_TABLE (table16), label1397, 0, 2, 2, 3, + gtk_table_attach (GTK_TABLE (table16), label1397, 0, 2, 4, 5, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); - label1392 = gtk_label_new ("Newbie"); - gtk_widget_ref (label1392); - gtk_object_set_data_full (GTK_OBJECT (gum), "label1392", label1392, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label1392); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 8), label1392); - - table8 = gtk_table_new (3, 2, FALSE); - gtk_widget_ref (table8); - gtk_object_set_data_full (GTK_OBJECT (gum), "table8", table8, + label1398 = gtk_label_new ("Pre-T-mode Entertainment Settings\n"); + gtk_widget_ref (label1398); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1398", label1398, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (table8); - gtk_container_add (GTK_CONTAINER (notebook1), table8); - gtk_container_set_border_width (GTK_CONTAINER (table8), 6); - gtk_table_set_row_spacings (GTK_TABLE (table8), 6); - gtk_table_set_col_spacings (GTK_TABLE (table8), 6); - - label128 = gtk_label_new ("Hockey Mode Settings\n"); - gtk_widget_ref (label128); - gtk_object_set_data_full (GTK_OBJECT (gum), "label128", label128, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label128); - gtk_table_attach (GTK_TABLE (table8), label128, 0, 2, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_widget_show (label1398); + gtk_table_attach (GTK_TABLE (table16), label1398, 0, 2, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); - HOCKEY_LABEL = gtk_label_new ("HOCKEY:"); - gtk_widget_ref (HOCKEY_LABEL); - gtk_object_set_data_full (GTK_OBJECT (gum), "HOCKEY_LABEL", HOCKEY_LABEL, + PRET_LABEL = gtk_label_new ("PRET:"); + gtk_widget_ref (PRET_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "PRET_LABEL", PRET_LABEL, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (HOCKEY_LABEL); - gtk_table_attach (GTK_TABLE (table8), HOCKEY_LABEL, 0, 1, 1, 2, + gtk_widget_show (PRET_LABEL); + gtk_table_attach (GTK_TABLE (table16), PRET_LABEL, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_misc_set_alignment (GTK_MISC (HOCKEY_LABEL), 1, 0.5); - gtk_misc_set_padding (GTK_MISC (HOCKEY_LABEL), 10, 0); + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (PRET_LABEL), 1, 0.5); + gtk_misc_set_padding (GTK_MISC (PRET_LABEL), 10, 0); - hbox44 = gtk_hbox_new (FALSE, 0); - gtk_widget_ref (hbox44); - gtk_object_set_data_full (GTK_OBJECT (gum), "hbox44", hbox44, + hbox59 = gtk_hbox_new (FALSE, 0); + gtk_widget_ref (hbox59); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox59", hbox59, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (hbox44); - gtk_table_attach (GTK_TABLE (table8), hbox44, 1, 2, 1, 2, + gtk_widget_show (hbox59); + gtk_table_attach (GTK_TABLE (table16), hbox59, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - HOCKEY_0 = gtk_radio_button_new_with_label (HOCKEY_group, "No"); - HOCKEY_group = gtk_radio_button_group (GTK_RADIO_BUTTON (HOCKEY_0)); - gtk_widget_ref (HOCKEY_0); - gtk_object_set_data_full (GTK_OBJECT (gum), "HOCKEY_0", HOCKEY_0, - (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (HOCKEY_0); - gtk_box_pack_start (GTK_BOX (hbox44), HOCKEY_0, FALSE, FALSE, 0); - - HOCKEY_1 = gtk_radio_button_new_with_label (HOCKEY_group, "Yes"); - HOCKEY_group = gtk_radio_button_group (GTK_RADIO_BUTTON (HOCKEY_1)); - gtk_widget_ref (HOCKEY_1); - gtk_object_set_data_full (GTK_OBJECT (gum), "HOCKEY_1", HOCKEY_1, + PRET_0 = gtk_radio_button_new_with_label (PRET_group, "No"); + PRET_group = gtk_radio_button_group (GTK_RADIO_BUTTON (PRET_0)); + gtk_widget_ref (PRET_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "PRET_0", PRET_0, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (HOCKEY_1); - gtk_box_pack_start (GTK_BOX (hbox44), HOCKEY_1, FALSE, FALSE, 0); + gtk_widget_show (PRET_0); + gtk_box_pack_start (GTK_BOX (hbox59), PRET_0, FALSE, FALSE, 0); - label131 = gtk_label_new (""); - gtk_widget_ref (label131); - gtk_object_set_data_full (GTK_OBJECT (gum), "label131", label131, + PRET_1 = gtk_radio_button_new_with_label (PRET_group, "Yes"); + PRET_group = gtk_radio_button_group (GTK_RADIO_BUTTON (PRET_1)); + gtk_widget_ref (PRET_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "PRET_1", PRET_1, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label131); - gtk_table_attach (GTK_TABLE (table8), label131, 0, 2, 2, 3, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); + gtk_widget_show (PRET_1); + gtk_box_pack_start (GTK_BOX (hbox59), PRET_1, FALSE, FALSE, 0); - label54 = gtk_label_new ("Hockey"); - gtk_widget_ref (label54); - gtk_object_set_data_full (GTK_OBJECT (gum), "label54", label54, + label1392 = gtk_label_new ("Robots"); + gtk_widget_ref (label1392); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1392", label1392, (GtkDestroyNotify) gtk_widget_unref); - gtk_widget_show (label54); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 9), label54); + gtk_widget_show (label1392); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 7), label1392); table9 = gtk_table_new (4, 2, FALSE); gtk_widget_ref (table9); @@ -3630,7 +3512,176 @@ gtk_object_set_data_full (GTK_OBJECT (gum), "INL_NOTEBOOK_LABEL", INL_NOTEBOOK_LABEL, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (INL_NOTEBOOK_LABEL); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 10), INL_NOTEBOOK_LABEL); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 8), INL_NOTEBOOK_LABEL); + + table7 = gtk_table_new (4, 2, FALSE); + gtk_widget_ref (table7); + gtk_object_set_data_full (GTK_OBJECT (gum), "table7", table7, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (table7); + gtk_container_add (GTK_CONTAINER (notebook1), table7); + gtk_container_set_border_width (GTK_CONTAINER (table7), 6); + gtk_table_set_row_spacings (GTK_TABLE (table7), 6); + gtk_table_set_col_spacings (GTK_TABLE (table7), 6); + + label126 = gtk_label_new ("Base Practice Mode Settings\n"); + gtk_widget_ref (label126); + gtk_object_set_data_full (GTK_OBJECT (gum), "label126", label126, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (label126); + gtk_table_attach (GTK_TABLE (table7), label126, 0, 2, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + + BASEPRACTICE_LABEL = gtk_label_new ("BASEPRACTICE:"); + gtk_widget_ref (BASEPRACTICE_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "BASEPRACTICE_LABEL", BASEPRACTICE_LABEL, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (BASEPRACTICE_LABEL); + gtk_table_attach (GTK_TABLE (table7), BASEPRACTICE_LABEL, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_misc_set_alignment (GTK_MISC (BASEPRACTICE_LABEL), 1, 0.5); + gtk_misc_set_padding (GTK_MISC (BASEPRACTICE_LABEL), 10, 0); + + ROBOTHOST_LABEL = gtk_label_new ("ROBOTHOST:"); + gtk_widget_ref (ROBOTHOST_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "ROBOTHOST_LABEL", ROBOTHOST_LABEL, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (ROBOTHOST_LABEL); + gtk_table_attach (GTK_TABLE (table7), ROBOTHOST_LABEL, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_misc_set_alignment (GTK_MISC (ROBOTHOST_LABEL), 1, 0.5); + gtk_misc_set_padding (GTK_MISC (ROBOTHOST_LABEL), 10, 0); + + hbox42 = gtk_hbox_new (FALSE, 0); + gtk_widget_ref (hbox42); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox42", hbox42, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (hbox42); + gtk_table_attach (GTK_TABLE (table7), hbox42, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + + BASEPRACTICE_0 = gtk_radio_button_new_with_label (BASEPRACTICE_group, "No"); + BASEPRACTICE_group = gtk_radio_button_group (GTK_RADIO_BUTTON (BASEPRACTICE_0)); + gtk_widget_ref (BASEPRACTICE_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "BASEPRACTICE_0", BASEPRACTICE_0, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (BASEPRACTICE_0); + gtk_box_pack_start (GTK_BOX (hbox42), BASEPRACTICE_0, FALSE, FALSE, 0); + + BASEPRACTICE_1 = gtk_radio_button_new_with_label (BASEPRACTICE_group, "Yes"); + BASEPRACTICE_group = gtk_radio_button_group (GTK_RADIO_BUTTON (BASEPRACTICE_1)); + gtk_widget_ref (BASEPRACTICE_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "BASEPRACTICE_1", BASEPRACTICE_1, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (BASEPRACTICE_1); + gtk_box_pack_start (GTK_BOX (hbox42), BASEPRACTICE_1, FALSE, FALSE, 0); + + hbox43 = gtk_hbox_new (FALSE, 0); + gtk_widget_ref (hbox43); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox43", hbox43, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (hbox43); + gtk_table_attach (GTK_TABLE (table7), hbox43, 1, 2, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + + ROBOTHOST = gtk_entry_new (); + gtk_widget_ref (ROBOTHOST); + gtk_object_set_data_full (GTK_OBJECT (gum), "ROBOTHOST", ROBOTHOST, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (ROBOTHOST); + gtk_box_pack_start (GTK_BOX (hbox43), ROBOTHOST, TRUE, TRUE, 0); + + label127 = gtk_label_new (""); + gtk_widget_ref (label127); + gtk_object_set_data_full (GTK_OBJECT (gum), "label127", label127, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (label127); + gtk_table_attach (GTK_TABLE (table7), label127, 0, 2, 3, 4, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); + + label51 = gtk_label_new ("Base Practice"); + gtk_widget_ref (label51); + gtk_object_set_data_full (GTK_OBJECT (gum), "label51", label51, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (label51); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 9), label51); + + table8 = gtk_table_new (3, 2, FALSE); + gtk_widget_ref (table8); + gtk_object_set_data_full (GTK_OBJECT (gum), "table8", table8, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (table8); + gtk_container_add (GTK_CONTAINER (notebook1), table8); + gtk_container_set_border_width (GTK_CONTAINER (table8), 6); + gtk_table_set_row_spacings (GTK_TABLE (table8), 6); + gtk_table_set_col_spacings (GTK_TABLE (table8), 6); + + label128 = gtk_label_new ("Hockey Mode Settings\n"); + gtk_widget_ref (label128); + gtk_object_set_data_full (GTK_OBJECT (gum), "label128", label128, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (label128); + gtk_table_attach (GTK_TABLE (table8), label128, 0, 2, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + + HOCKEY_LABEL = gtk_label_new ("HOCKEY:"); + gtk_widget_ref (HOCKEY_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "HOCKEY_LABEL", HOCKEY_LABEL, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (HOCKEY_LABEL); + gtk_table_attach (GTK_TABLE (table8), HOCKEY_LABEL, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_misc_set_alignment (GTK_MISC (HOCKEY_LABEL), 1, 0.5); + gtk_misc_set_padding (GTK_MISC (HOCKEY_LABEL), 10, 0); + + hbox44 = gtk_hbox_new (FALSE, 0); + gtk_widget_ref (hbox44); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox44", hbox44, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (hbox44); + gtk_table_attach (GTK_TABLE (table8), hbox44, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + + HOCKEY_0 = gtk_radio_button_new_with_label (HOCKEY_group, "No"); + HOCKEY_group = gtk_radio_button_group (GTK_RADIO_BUTTON (HOCKEY_0)); + gtk_widget_ref (HOCKEY_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "HOCKEY_0", HOCKEY_0, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (HOCKEY_0); + gtk_box_pack_start (GTK_BOX (hbox44), HOCKEY_0, FALSE, FALSE, 0); + + HOCKEY_1 = gtk_radio_button_new_with_label (HOCKEY_group, "Yes"); + HOCKEY_group = gtk_radio_button_group (GTK_RADIO_BUTTON (HOCKEY_1)); + gtk_widget_ref (HOCKEY_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "HOCKEY_1", HOCKEY_1, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (HOCKEY_1); + gtk_box_pack_start (GTK_BOX (hbox44), HOCKEY_1, FALSE, FALSE, 0); + + label131 = gtk_label_new (""); + gtk_widget_ref (label131); + gtk_object_set_data_full (GTK_OBJECT (gum), "label131", label131, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (label131); + gtk_table_attach (GTK_TABLE (table8), label131, 0, 2, 2, 3, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); + + label54 = gtk_label_new ("Hockey"); + gtk_widget_ref (label54); + gtk_object_set_data_full (GTK_OBJECT (gum), "label54", label54, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (label54); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 10), label54); table10 = gtk_table_new (6, 2, FALSE); gtk_widget_ref (table10); @@ -4157,15 +4208,15 @@ NULL); gtk_widget_add_accelerator (PING_FREQ, "grab_focus", accel_group, - PING_FREQ_LABEL_key, GDK_MOD1_MASK, 0); + PING_FREQ_LABEL_key, GDK_MOD1_MASK, (GtkAccelFlags) 0); gtk_widget_add_accelerator (PING_ILOSS_INTERVAL, "grab_focus", accel_group, - PING_ILOSS_INTERVAL_LABEL_key, GDK_MOD1_MASK, 0); + PING_ILOSS_INTERVAL_LABEL_key, GDK_MOD1_MASK, (GtkAccelFlags) 0); gtk_widget_add_accelerator (PING_GHOSTBUST, "grab_focus", accel_group, - PING_GHOSTBUST_LABEL_key, GDK_MOD1_MASK, 0); + PING_GHOSTBUST_LABEL_key, GDK_MOD1_MASK, (GtkAccelFlags) 0); gtk_widget_add_accelerator (PING_GHOSTBUST_INTERVAL, "grab_focus", accel_group, - PING_GHOSTBUST_INTERVAL_LABEL_key, GDK_MOD1_MASK, 0); + PING_GHOSTBUST_INTERVAL_LABEL_key, GDK_MOD1_MASK, (GtkAccelFlags) 0); gtk_widget_add_accelerator (SAVE_DOG_STAT, "grab_focus", accel_group, - SAVE_DOG_STAT_LABEL_key, GDK_MOD1_MASK, 0); + SAVE_DOG_STAT_LABEL_key, GDK_MOD1_MASK, (GtkAccelFlags) 0); gtk_object_set_data (GTK_OBJECT (gum), "tooltips", tooltips); Index: Vanilla/gum/support.c diff -u Vanilla/gum/support.c:1.3 Vanilla/gum/support.c:1.4 --- Vanilla/gum/support.c:1.3 Tue Apr 17 23:41:35 2001 +++ Vanilla/gum/support.c Fri Feb 13 23:28:14 2004 @@ -97,6 +97,9 @@ GtkWidget *pixmap; GList *elem; + if (!filename || !filename[0]) + return create_dummy_pixmap (widget); + /* We first try any pixmaps directories set by the application. */ elem = pixmaps_directories; while (elem) @@ -136,7 +139,7 @@ } /* This is an internally used function to check if a pixmap file exists. */ -gchar* +static gchar* check_file_exists (const gchar *directory, const gchar *filename) { _______________________________________________ vanilla-devel mailing list vanilla-devel at us.netrek.org https://mailman.real-time.com/mailman/listinfo/vanilla-devel