* Bring main Linux(gtk) UI up to date to remove deprecated warnings.

19 files changed, 3 insertions, 15 deletions

diff --git a/gui/data/pixmaps/Makefile.am b/gui/data/pixmaps/Makefile.am
index 904ffe34..f5be2e62 100644
--- a/gui/data/pixmaps/Makefile.am
+++ b/gui/data/pixmaps/Makefile.am
@@ -1,5 +1,5 @@
-pixmapdir = "$(datadir)/pcsxr"
-pixmap_DATA = \
+#pixmapdir = "$(datadir)/pcsxr"
+#pixmap_DATA = \
     pcsxr-cd-open.png \
     pcsxr-iso-open.png \
     pcsxr-iso-reopen.png \
@@ -15,16 +15,4 @@ pixmap_DATA = \
 icondir = "$(datadir)/pixmaps"
 icon_DATA = pcsxr-icon.png
 
-EXTRA_DIST = \
-    pcsxr-cd-open.png \
-    pcsxr-iso-open.png \
-    pcsxr-iso-reopen.png \
-    pcsxr-memcard.png \
-    pcsxr-play.png \
-    pcsxr-plugin-cdr.png \
-    pcsxr-plugin-gpu.png \
-    pcsxr-plugin-pad.png \
-    pcsxr-plugin-sio1.png \
-    pcsxr-plugin-spu.png \
-    pcsxr.png \
-    pcsxr-icon.png
+EXTRA_DIST = $(pixmap_DATA) $(icon_DATA)
diff --git a/gui/data/pixmaps/pcsxr-about.png b/gui/data/pixmaps/pcsxr-about.png
new file mode 100644
index 00000000..a23c775c
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-about.png
diff --git a/gui/data/pixmaps/pcsxr-cheats-browse.png b/gui/data/pixmaps/pcsxr-cheats-browse.png
new file mode 100644
index 00000000..e309ecb8
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-cheats-browse.png
diff --git a/gui/data/pixmaps/pcsxr-cheats-search.png b/gui/data/pixmaps/pcsxr-cheats-search.png
new file mode 100644
index 00000000..e2558a78
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-cheats-search.png
diff --git a/gui/data/pixmaps/pcsxr-cheats.png b/gui/data/pixmaps/pcsxr-cheats.png
new file mode 100644
index 00000000..1e814b85
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-cheats.png
diff --git a/gui/data/pixmaps/pcsxr-cpu.png b/gui/data/pixmaps/pcsxr-cpu.png
new file mode 100644
index 00000000..55deaa6b
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-cpu.png
diff --git a/gui/data/pixmaps/pcsxr-exit.png b/gui/data/pixmaps/pcsxr-exit.png
new file mode 100644
index 00000000..c5f7865c
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-exit.png
diff --git a/gui/data/pixmaps/pcsxr-iso-open.png b/gui/data/pixmaps/pcsxr-iso-open.png
index 3daaea2a..80dff9c8 100644
--- a/gui/data/pixmaps/pcsxr-iso-open.png
+++ b/gui/data/pixmaps/pcsxr-iso-open.png
diff --git a/gui/data/pixmaps/pcsxr-iso-reopen.png b/gui/data/pixmaps/pcsxr-iso-reopen.png
index 3294074a..20e218d1 100644
--- a/gui/data/pixmaps/pcsxr-iso-reopen.png
+++ b/gui/data/pixmaps/pcsxr-iso-reopen.png
diff --git a/gui/data/pixmaps/pcsxr-load-state.png b/gui/data/pixmaps/pcsxr-load-state.png
new file mode 100644
index 00000000..91ddd251
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-load-state.png
diff --git a/gui/data/pixmaps/pcsxr-memory-dump.png b/gui/data/pixmaps/pcsxr-memory-dump.png
new file mode 100644
index 00000000..3b9fde0c
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-memory-dump.png
diff --git a/gui/data/pixmaps/pcsxr-plugin-netplay.png b/gui/data/pixmaps/pcsxr-plugin-netplay.png
new file mode 100644
index 00000000..6227d829
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-plugin-netplay.png
diff --git a/gui/data/pixmaps/pcsxr-reset.png b/gui/data/pixmaps/pcsxr-reset.png
new file mode 100644
index 00000000..7edb426b
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-reset.png
diff --git a/gui/data/pixmaps/pcsxr-run-bios.png b/gui/data/pixmaps/pcsxr-run-bios.png
new file mode 100644
index 00000000..55deaa6b
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-run-bios.png
diff --git a/gui/data/pixmaps/pcsxr-run-exe.png b/gui/data/pixmaps/pcsxr-run-exe.png
new file mode 100644
index 00000000..53907fe4
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-run-exe.png
diff --git a/gui/data/pixmaps/pcsxr-save-state.png b/gui/data/pixmaps/pcsxr-save-state.png
new file mode 100644
index 00000000..8f1d1988
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-save-state.png
diff --git a/gui/data/pixmaps/pcsxr-settings.png b/gui/data/pixmaps/pcsxr-settings.png
new file mode 100644
index 00000000..90d18e80
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-settings.png
diff --git a/gui/data/pixmaps/pcsxr-shutdown.png b/gui/data/pixmaps/pcsxr-shutdown.png
new file mode 100644
index 00000000..781d877a
--- /dev/null
+++ b/gui/data/pixmaps/pcsxr-shutdown.png
diff --git a/gui/data/pixmaps/pcsxr.png b/gui/data/pixmaps/pcsxr.png
index 8dc59052..92760f9d 100644
--- a/gui/data/pixmaps/pcsxr.png
+++ b/gui/data/pixmaps/pcsxr.png