New icons (linux).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@67822 e17a0e51-4ae3-4d35-97c3-1a29b211df97

13 files changed, 44 insertions, 49 deletions

diff --git a/data/pcsxr.glade2 b/data/pcsxr.glade2
index 55f87148..e445873f 100644
--- a/data/pcsxr.glade2
+++ b/data/pcsxr.glade2
@@ -668,34 +668,30 @@
           </packing>
         </child>
         <child>
-          <widget class="GtkToolbar" id="toolbar1">
+          <widget class="GtkTable" id="tableToolbox">
             <property name="visible">True</property>
-            <property name="toolbar_style">icons</property>
-            <property name="icon_size_set">True</property>
+            <property name="border_width">5</property>
+            <property name="n_columns">11</property>
             <child>
               <widget class="GtkToolButton" id="toolbutton_runcd">
                 <property name="visible">True</property>
+                <property name="has_tooltip">True</property>
                 <property name="tooltip" translatable="yes">Run CD</property>
-                <property name="label" translatable="yes">Run CD</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-cdrom</property>
+                <property name="icon">cd.png</property>
               </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
             <child>
               <widget class="GtkToolButton" id="toolbutton_runimage">
                 <property name="visible">True</property>
+                <property name="has_tooltip">True</property>
                 <property name="tooltip" translatable="yes">Run ISO Image</property>
-                <property name="label" translatable="yes">Run ISO...</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-open</property>
+                <property name="icon">iso-open.png</property>
               </widget>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
               </packing>
             </child>
             <child>
@@ -703,34 +699,34 @@
                 <property name="visible">True</property>
               </widget>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
               </packing>
             </child>
             <child>
               <widget class="GtkToolButton" id="toolbutton_run">
                 <property name="visible">True</property>
+                <property name="has_tooltip">True</property>
                 <property name="tooltip" translatable="yes">Continue Emulation</property>
-                <property name="label" translatable="yes">Continue...</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-go-forward</property>
+                <property name="icon">play.png</property>
               </widget>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
               </packing>
             </child>
             <child>
               <widget class="GtkToolButton" id="toolbutton_switchimage">
                 <property name="visible">True</property>
+                <property name="has_tooltip">True</property>
                 <property name="tooltip" translatable="yes">Switch ISO Image</property>
-                <property name="label" translatable="yes">Switch ISO...</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-undo</property>
+                <property name="icon">cd-load.png</property>
               </widget>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="left_attach">4</property>
+                <property name="right_attach">5</property>
               </packing>
             </child>
             <child>
@@ -738,78 +734,79 @@
                 <property name="visible">True</property>
               </widget>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="left_attach">5</property>
+                <property name="right_attach">6</property>
               </packing>
             </child>
             <child>
               <widget class="GtkToolButton" id="toolbutton_memcards">
                 <property name="visible">True</property>
+                <property name="has_tooltip">True</property>
                 <property name="tooltip" translatable="yes">Configure Memory Cards</property>
-                <property name="label" translatable="yes">Memcards...</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-floppy</property>
+                <property name="icon">memcard.png</property>
               </widget>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="left_attach">6</property>
+                <property name="right_attach">7</property>
               </packing>
             </child>
             <child>
               <widget class="GtkToolButton" id="toolbutton_graphics">
                 <property name="visible">True</property>
+                <property name="has_tooltip">True</property>
                 <property name="tooltip" translatable="yes">Configure Graphics</property>
-                <property name="label" translatable="yes">Graphics...</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-select-color</property>
+                <property name="icon">gpu.png</property>
               </widget>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="left_attach">7</property>
+                <property name="right_attach">8</property>
               </packing>
             </child>
             <child>
               <widget class="GtkToolButton" id="toolbutton_sound">
                 <property name="visible">True</property>
+                <property name="has_tooltip">True</property>
                 <property name="tooltip" translatable="yes">Configure Sound</property>
-                <property name="label" translatable="yes">Sound...</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-convert</property>
+                <property name="icon">spu.png</property>
               </widget>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="left_attach">8</property>
+                <property name="right_attach">9</property>
               </packing>
             </child>
             <child>
               <widget class="GtkToolButton" id="toolbutton_cdrom">
                 <property name="visible">True</property>
+                <property name="has_tooltip">True</property>
                 <property name="tooltip" translatable="yes">Configure CD-ROM</property>
-                <property name="label" translatable="yes">CD-ROM...</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-cdrom</property>
+                <property name="icon">cdr.png</property>
               </widget>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="left_attach">9</property>
+                <property name="right_attach">10</property>
               </packing>
             </child>
             <child>
               <widget class="GtkToolButton" id="toolbutton_controllers">
                 <property name="visible">True</property>
+                <property name="has_tooltip">True</property>
                 <property name="tooltip" translatable="yes">Configure Controllers</property>
-                <property name="label" translatable="yes">Controllers...</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-execute</property>
+                <property name="icon">pad.png</property>
               </widget>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="left_attach">10</property>
+                <property name="right_attach">11</property>
               </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gui/AboutDlg.c b/gui/AboutDlg.c
index 232249db..380b8e61 100644
--- a/gui/AboutDlg.c
+++ b/gui/AboutDlg.c
@@ -57,8 +57,6 @@ void RunAboutDialog(void) {
 

 	const gchar *artists[] = {

 		"Ryan Schultz <schultz.ryan@gmail.com>",

-		"",

-		"Icon Design:",

 		"Romain Lafourcade",

 		"perchibald",

 		NULL

diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 39358e06..917702a8 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,7 +1,7 @@
 pixmapdir = "$(datadir)/pcsxr"
-pixmap_DATA = pcsxr.png
+pixmap_DATA = pcsxr.png iso-open.png iso-reopen.png cd.png cdr.png gpu.png memcard.png pad.png play.png spu.png
 
 icondir = "$(datadir)/pixmaps"
 icon_DATA = pcsxr-icon.png
 
-EXTRA_DIST = pcsxr.png pcsxr-icon.png
+EXTRA_DIST = pcsxr.png iso-open.png iso-reopen.png cd.png cdr.png gpu.png memcard.png pad.png play.png spu.png pcsxr-icon.png
diff --git a/pixmaps/cd.png b/pixmaps/cd.png
new file mode 100644
index 00000000..1f07c0e7
--- /dev/null
+++ b/pixmaps/cd.png
diff --git a/pixmaps/cdr.png b/pixmaps/cdr.png
new file mode 100644
index 00000000..4f900be7
--- /dev/null
+++ b/pixmaps/cdr.png
diff --git a/pixmaps/gpu.png b/pixmaps/gpu.png
new file mode 100644
index 00000000..f4d630a3
--- /dev/null
+++ b/pixmaps/gpu.png
diff --git a/pixmaps/iso-open.png b/pixmaps/iso-open.png
new file mode 100644
index 00000000..e5266f13
--- /dev/null
+++ b/pixmaps/iso-open.png
diff --git a/pixmaps/iso-reopen.png b/pixmaps/iso-reopen.png
new file mode 100644
index 00000000..fa975f66
--- /dev/null
+++ b/pixmaps/iso-reopen.png
diff --git a/pixmaps/memcard.png b/pixmaps/memcard.png
new file mode 100644
index 00000000..5d4476f4
--- /dev/null
+++ b/pixmaps/memcard.png
diff --git a/pixmaps/pad.png b/pixmaps/pad.png
new file mode 100644
index 00000000..82b43c6f
--- /dev/null
+++ b/pixmaps/pad.png
diff --git a/pixmaps/pcsxr.png b/pixmaps/pcsxr.png
index 7ecf7810..8dc59052 100644
--- a/pixmaps/pcsxr.png
+++ b/pixmaps/pcsxr.png
diff --git a/pixmaps/play.png b/pixmaps/play.png
new file mode 100644
index 00000000..dbd7f061
--- /dev/null
+++ b/pixmaps/play.png
diff --git a/pixmaps/spu.png b/pixmaps/spu.png
new file mode 100644
index 00000000..1827d0df
--- /dev/null
+++ b/pixmaps/spu.png