new toolbar buttons

4 files changed, 350 insertions, 199 deletions

diff --git a/mixgtk/Makefile.am b/mixgtk/Makefile.am
index cf1bc56..cd6f653 100644
--- a/mixgtk/Makefile.am
+++ b/mixgtk/Makefile.am
@@ -12,7 +12,7 @@
 
 XPMS = clear.xpm colors.xpm compile.xpm edit.xpm font.xpm fontl.xpm \
        jump.xpm next.xpm onew.xpm open.xpm output.xpm run.xpm splitw.xpm \
-       symbols.xpm
+       symbols.xpm extern.xpm devdir.xpm
 
 EXTRA_DIST = mixgtk.glade $(XPMS)
 INCLUDES = -I$(includedir) -DGLADE_FILE=\""$(pkgdatadir)/mixgtk.glade"\"\
diff --git a/mixgtk/devdir.xpm b/mixgtk/devdir.xpm
new file mode 100644
index 0000000..12de838
--- /dev/null
+++ b/mixgtk/devdir.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+static char * devdir_xpm[] = {
+"24 24 6 1",
+" 	c None",
+".	c #000000",
+"+	c #99907B",
+"@	c #FFFEF7",
+"#	c #FFFFFF",
+"$	c #A39E9E",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"              ..        ",
+"           ...++.       ",
+"    ..  ...++++@@#...   ",
+"   .++..++++@@@@..++.   ",
+"   .+++++@@@@@..++++.   ",
+"    .++@@@@@..++++++.   ",
+"    .++@@@..++++++++.   ",
+"     .+@@.+++.....++.   ",
+"     .++@.+++......+.   ",
+"      .+@.+++..$$$...   ",
+"      .++.+++..$##..    ",
+"       .+.+++..$##..    ",
+"       .+.+++..$##..    ",
+"        ..+++..$##..    ",
+"        ..+....$##..    ",
+"         ..  ......     ",
+"             .....      ",
+"                        ",
+"                        "};
diff --git a/mixgtk/extern.xpm b/mixgtk/extern.xpm
new file mode 100644
index 0000000..e277415
--- /dev/null
+++ b/mixgtk/extern.xpm
@@ -0,0 +1,45 @@
+/* XPM */
+static char * extern_xpm[] = {
+"22 22 20 1",
+" 	c None",
+".	c #000000",
+"+	c #808080",
+"@	c #585858",
+"#	c #DCDCDC",
+"$	c #CFCFCF",
+"%	c #B8B8B8",
+"&	c #A0A0A0",
+"*	c #CCCCCC",
+"=	c #FFFFFF",
+"-	c #D8D8D8",
+";	c #303030",
+">	c #EDEDED",
+",	c #C2C2C2",
+"'	c #646464",
+")	c #DBDBDB",
+"!	c #787878",
+"~	c #E7E7E7",
+"{	c #C3C3C3",
+"]	c #B7B7B7",
+"                      ",
+"                      ",
+"     .......+         ",
+"     .@@#$%&...       ",
+"     .*%@@##$%&.      ",
+"      .=*%@@#$%&.     ",
+" ...   ..=*%@#-&.&    ",
+" .=#..   ..=;#-$&.    ",
+" .=>#,..   ;,##-&.    ",
+" .'=>##,..;,###-&.    ",
+" .#'==>#######)$&&..  ",
+" .##'!==>>###>~{${&&. ",
+"  .=#='!=====~$~)${]& ",
+"   .=##=''''!&==~)${] ",
+"    ..=#{{{{&''!==)${ ",
+"      ....&#{{&&'!==$ ",
+"          ...&{#{&'!= ",
+"             ..#=#{&' ",
+"               ..#=#{ ",
+"                 ..#= ",
+"                   .. ",
+"                      "};
diff --git a/mixgtk/mixgtk.glade b/mixgtk/mixgtk.glade
index 45a1cd2..b3021ca 100644
--- a/mixgtk/mixgtk.glade
+++ b/mixgtk/mixgtk.glade
@@ -589,6 +589,65 @@
       <widget>
 	<class>GtkButton</class>
 	<child_name>Toolbar:button</child_name>
+	<name>button29</name>
+	<tooltip>Colors</tooltip>
+	<signal>
+	  <name>clicked</name>
+	  <handler>on_colors_activate</handler>
+	  <last_modification_time>Thu, 16 Aug 2001 13:36:24 GMT</last_modification_time>
+	</signal>
+	<label>Colors</label>
+	<icon>colors.xpm</icon>
+	<child>
+	  <new_group>True</new_group>
+	</child>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<child_name>Toolbar:button</child_name>
+	<name>button28</name>
+	<tooltip>Device directory</tooltip>
+	<signal>
+	  <name>clicked</name>
+	  <handler>on_devdir_activate</handler>
+	  <last_modification_time>Thu, 16 Aug 2001 13:14:09 GMT</last_modification_time>
+	</signal>
+	<label>Device dir</label>
+	<icon>devdir.xpm</icon>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<child_name>Toolbar:button</child_name>
+	<name>button30</name>
+	<tooltip>Output format</tooltip>
+	<signal>
+	  <name>clicked</name>
+	  <handler>on_devform_activate</handler>
+	  <last_modification_time>Thu, 16 Aug 2001 14:46:32 GMT</last_modification_time>
+	</signal>
+	<label>Output</label>
+	<icon>output.xpm</icon>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<child_name>Toolbar:button</child_name>
+	<name>button31</name>
+	<tooltip>External programs</tooltip>
+	<signal>
+	  <name>clicked</name>
+	  <handler>on_external_programs_activate</handler>
+	  <last_modification_time>Thu, 16 Aug 2001 23:56:34 GMT</last_modification_time>
+	</signal>
+	<label>Extern</label>
+	<icon>extern.xpm</icon>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<child_name>Toolbar:button</child_name>
 	<name>button26</name>
 	<tooltip>Split windows</tooltip>
 	<signal>
@@ -797,177 +856,6 @@
 
 	  <widget>
 	    <class>GtkLabel</class>
-	    <name>label100</name>
-	    <x>8</x>
-	    <y>91</y>
-	    <width>31</width>
-	    <height>16</height>
-	    <label>I1</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>GtkLabel</class>
-	    <name>label102</name>
-	    <x>8</x>
-	    <y>200</y>
-	    <width>31</width>
-	    <height>16</height>
-	    <label>I3</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>GtkLabel</class>
-	    <name>label101</name>
-	    <x>8</x>
-	    <y>144</y>
-	    <width>31</width>
-	    <height>16</height>
-	    <label>I2</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>GtkLabel</class>
-	    <name>label103</name>
-	    <x>136</x>
-	    <y>88</y>
-	    <width>32</width>
-	    <height>16</height>
-	    <label>I4</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>GtkLabel</class>
-	    <name>label104</name>
-	    <x>136</x>
-	    <y>144</y>
-	    <width>31</width>
-	    <height>16</height>
-	    <label>I5</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>GtkLabel</class>
-	    <name>label105</name>
-	    <x>136</x>
-	    <y>200</y>
-	    <width>31</width>
-	    <height>16</height>
-	    <label>I6</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>GtkLabel</class>
-	    <name>label98</name>
-	    <x>216</x>
-	    <y>24</y>
-	    <width>31</width>
-	    <height>16</height>
-	    <label>X</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>GtkLabel</class>
-	    <name>label97</name>
-	    <x>8</x>
-	    <y>24</y>
-	    <width>31</width>
-	    <height>16</height>
-	    <label>A</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>GtkVSeparator</class>
-	    <name>vseparator2</name>
-	    <x>0</x>
-	    <y>8</y>
-	    <width>16</width>
-	    <height>263</height>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVSeparator</class>
-	    <name>vseparator3</name>
-	    <x>626</x>
-	    <y>8</y>
-	    <width>16</width>
-	    <height>267</height>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label99</name>
-	    <x>272</x>
-	    <y>88</y>
-	    <width>31</width>
-	    <height>16</height>
-	    <label>J</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>GtkHSeparator</class>
-	    <name>hseparator2</name>
-	    <x>6</x>
-	    <y>265</y>
-	    <width>627</width>
-	    <height>16</height>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
 	    <name>label159</name>
 	    <x>8</x>
 	    <y>248</y>
@@ -1058,22 +946,6 @@
 
 	  <widget>
 	    <class>GtkLabel</class>
-	    <name>label167</name>
-	    <x>256</x>
-	    <y>200</y>
-	    <width>48</width>
-	    <height>16</height>
-	    <label>LOC</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>GtkLabel</class>
 	    <name>program_label</name>
 	    <x>184</x>
 	    <y>248</y>
@@ -1263,15 +1135,6 @@
 	  </widget>
 
 	  <widget>
-	    <class>GtkHSeparator</class>
-	    <name>hseparator3</name>
-	    <x>6</x>
-	    <y>1</y>
-	    <width>627</width>
-	    <height>16</height>
-	  </widget>
-
-	  <widget>
 	    <class>GtkButton</class>
 	    <name>loc_arrow</name>
 	    <x>346</x>
@@ -1300,11 +1163,207 @@
 	  </widget>
 
 	  <widget>
+	    <class>GtkLabel</class>
+	    <name>label97</name>
+	    <x>8</x>
+	    <y>27</y>
+	    <width>31</width>
+	    <height>16</height>
+	    <label>A</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>GtkLabel</class>
+	    <name>label98</name>
+	    <x>216</x>
+	    <y>27</y>
+	    <width>31</width>
+	    <height>16</height>
+	    <label>X</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>GtkLabel</class>
+	    <name>label100</name>
+	    <x>8</x>
+	    <y>91</y>
+	    <width>31</width>
+	    <height>16</height>
+	    <label>I1</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>GtkLabel</class>
+	    <name>label103</name>
+	    <x>136</x>
+	    <y>91</y>
+	    <width>32</width>
+	    <height>16</height>
+	    <label>I4</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>GtkLabel</class>
+	    <name>label99</name>
+	    <x>272</x>
+	    <y>91</y>
+	    <width>31</width>
+	    <height>16</height>
+	    <label>J</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>GtkLabel</class>
+	    <name>label101</name>
+	    <x>8</x>
+	    <y>147</y>
+	    <width>31</width>
+	    <height>16</height>
+	    <label>I2</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>GtkLabel</class>
+	    <name>label104</name>
+	    <x>136</x>
+	    <y>147</y>
+	    <width>31</width>
+	    <height>16</height>
+	    <label>I5</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>GtkLabel</class>
+	    <name>label102</name>
+	    <x>8</x>
+	    <y>203</y>
+	    <width>31</width>
+	    <height>16</height>
+	    <label>I3</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>GtkLabel</class>
+	    <name>label105</name>
+	    <x>136</x>
+	    <y>203</y>
+	    <width>31</width>
+	    <height>16</height>
+	    <label>I6</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>GtkLabel</class>
+	    <name>label167</name>
+	    <x>256</x>
+	    <y>203</y>
+	    <width>48</width>
+	    <height>16</height>
+	    <label>LOC</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>GtkVSeparator</class>
+	    <name>vseparator2</name>
+	    <x>0</x>
+	    <y>8</y>
+	    <width>16</width>
+	    <height>263</height>
+	  </widget>
+
+	  <widget>
+	    <class>GtkVSeparator</class>
+	    <name>vseparator3</name>
+	    <x>626</x>
+	    <y>8</y>
+	    <width>16</width>
+	    <height>263</height>
+	  </widget>
+
+	  <widget>
 	    <class>GtkHSeparator</class>
 	    <name>hseparator1</name>
 	    <x>8</x>
 	    <y>232</y>
-	    <width>377</width>
+	    <width>376</width>
+	    <height>16</height>
+	  </widget>
+
+	  <widget>
+	    <class>GtkHSeparator</class>
+	    <name>hseparator2</name>
+	    <x>6</x>
+	    <y>265</y>
+	    <width>627</width>
+	    <height>16</height>
+	  </widget>
+
+	  <widget>
+	    <class>GtkHSeparator</class>
+	    <name>hseparator3</name>
+	    <x>7</x>
+	    <y>1</y>
+	    <width>626</width>
 	    <height>16</height>
 	  </widget>
 	</widget>
@@ -2175,6 +2234,20 @@
       <widget>
 	<class>GtkButton</class>
 	<child_name>Toolbar:button</child_name>
+	<name>button32</name>
+	<tooltip>External programs</tooltip>
+	<signal>
+	  <name>clicked</name>
+	  <handler>on_external_programs_activate</handler>
+	  <last_modification_time>Thu, 16 Aug 2001 23:56:34 GMT</last_modification_time>
+	</signal>
+	<label>Extern</label>
+	<icon>extern.xpm</icon>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<child_name>Toolbar:button</child_name>
 	<name>button27</name>
 	<tooltip>One window</tooltip>
 	<signal>
@@ -4816,7 +4889,7 @@
 	  <last_modification_time>Thu, 16 Aug 2001 13:14:09 GMT</last_modification_time>
 	</signal>
 	<label>Device dir</label>
-	<icon>open.xpm</icon>
+	<icon>devdir.xpm</icon>
       </widget>
 
       <widget>