From 9f2574f34ef6f010e50b17c7dc1acf18e00a2a34 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Sun, 16 Jul 2017 21:49:12 +0300 Subject: * Move data and pixmaps folders inside gui folder to reflect codeplex branch. * Enable overclock feature in config file. --- gui/data/Makefile.am | 7 + gui/data/pcsxr.desktop | 15 + gui/data/pcsxr.ui | 4553 ++++++++++++++++++++++++++++++++ gui/data/pixmaps/Makefile.am | 30 + gui/data/pixmaps/pcsxr-cd-open.png | Bin 0 -> 1593 bytes gui/data/pixmaps/pcsxr-icon.png | Bin 0 -> 13508 bytes gui/data/pixmaps/pcsxr-iso-open.png | Bin 0 -> 3034 bytes gui/data/pixmaps/pcsxr-iso-reopen.png | Bin 0 -> 1772 bytes gui/data/pixmaps/pcsxr-memcard.png | Bin 0 -> 935 bytes gui/data/pixmaps/pcsxr-play.png | Bin 0 -> 846 bytes gui/data/pixmaps/pcsxr-plugin-cdr.png | Bin 0 -> 1491 bytes gui/data/pixmaps/pcsxr-plugin-gpu.png | Bin 0 -> 1455 bytes gui/data/pixmaps/pcsxr-plugin-pad.png | Bin 0 -> 1767 bytes gui/data/pixmaps/pcsxr-plugin-sio1.png | Bin 0 -> 1786 bytes gui/data/pixmaps/pcsxr-plugin-spu.png | Bin 0 -> 2102 bytes gui/data/pixmaps/pcsxr.png | Bin 0 -> 60106 bytes 16 files changed, 4605 insertions(+) create mode 100644 gui/data/Makefile.am create mode 100644 gui/data/pcsxr.desktop create mode 100644 gui/data/pcsxr.ui create mode 100644 gui/data/pixmaps/Makefile.am create mode 100644 gui/data/pixmaps/pcsxr-cd-open.png create mode 100644 gui/data/pixmaps/pcsxr-icon.png create mode 100644 gui/data/pixmaps/pcsxr-iso-open.png create mode 100644 gui/data/pixmaps/pcsxr-iso-reopen.png create mode 100644 gui/data/pixmaps/pcsxr-memcard.png create mode 100644 gui/data/pixmaps/pcsxr-play.png create mode 100644 gui/data/pixmaps/pcsxr-plugin-cdr.png create mode 100644 gui/data/pixmaps/pcsxr-plugin-gpu.png create mode 100644 gui/data/pixmaps/pcsxr-plugin-pad.png create mode 100644 gui/data/pixmaps/pcsxr-plugin-sio1.png create mode 100644 gui/data/pixmaps/pcsxr-plugin-spu.png create mode 100644 gui/data/pixmaps/pcsxr.png (limited to 'gui/data') diff --git a/gui/data/Makefile.am b/gui/data/Makefile.am new file mode 100644 index 00000000..8f1ce6a2 --- /dev/null +++ b/gui/data/Makefile.am @@ -0,0 +1,7 @@ +glade_DATA = pcsxr.ui +gladedir = $(datadir)/pcsxr + +desktopdir = $(datadir)/applications +desktop_DATA = pcsxr.desktop + +EXTRA_DIST = $(glade_DATA) pcsxr.desktop diff --git a/gui/data/pcsxr.desktop b/gui/data/pcsxr.desktop new file mode 100644 index 00000000..c284f003 --- /dev/null +++ b/gui/data/pcsxr.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=PCSXR +GenericName=PlayStation Emulator +GenericName[ru_RU]=Эмулятор PlayStation +GenericName[zh_CN]=PlayStation 模拟器 +GenericName[zh_TW]=PlayStation 模擬器 +Comment=Sony PlayStation emulator +Comment[ru_RU]=Эмулятор Sony PlayStation +Comment[zh_CN]=Sony PlayStation 模拟器 +Comment[zh_TW]=Sony PlayStation 模擬器 +Exec=pcsxr +Icon=pcsxr-icon +Categories=Game; diff --git a/gui/data/pcsxr.ui b/gui/data/pcsxr.ui new file mode 100644 index 00000000..2d8f2ddf --- /dev/null +++ b/gui/data/pcsxr.ui @@ -0,0 +1,4553 @@ + + + + + + + + + + + + + + + + + + + + False + 5 + True + center-on-parent + dialog + pcsxr + image-missing + + + False + vertical + 2 + + + False + end + + + False + True + end + 0 + + + + + + + + + + False + 5 + Edit Cheat Codes + True + center-on-parent + dialog + + + True + False + vertical + + + True + False + end + + + gtk-close + True + True + True + True + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + 15 + + + True + False + 0 + + + 500 + 355 + True + True + 5 + etched-in + + + True + True + + + + + + + + + + True + False + <b>Cheat Codes</b> + True + + + + + True + True + 0 + + + + + True + False + 5 + + + gtk-save-as + True + True + True + True + + + False + False + end + 0 + + + + + gtk-open + True + True + True + True + + + False + False + end + 1 + + + + + gtk-edit + True + True + True + True + + + False + False + 2 + + + + + gtk-delete + True + True + True + True + + + False + False + 3 + + + + + gtk-add + True + True + True + True + + + False + False + 4 + + + + + False + True + 1 + + + + + True + True + 10 + 2 + + + + + + closbutton1 + + + + False + Configure PCSXR + False + True + center-on-parent + dialog + + + True + False + vertical + + + True + False + end + + + gtk-close + True + True + True + True + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + 5 + 3 + + + True + False + 0 + + + True + False + 5 + + + True + False + 7 + 5 + 5 + 5 + + + True + False + generated-icon-gpu-png + + + GTK_FILL + GTK_FILL + + + + + True + False + generated-icon-cdr-png + + + 4 + 5 + GTK_FILL + GTK_FILL + + + + + True + False + generated-icon-pad-png + + + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + False + generated-icon-pad-png + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + False + generated-icon-spu-png + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + True + False + + + + True + False + gtk-preferences + + + + + 3 + 4 + GTK_FILL + + + + + + True + False + + + 2 + 3 + 4 + 5 + GTK_FILL + + + + + True + False + + + 2 + 3 + 3 + 4 + GTK_FILL + + + + + True + False + + + + + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + True + False + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + True + False + + + 2 + 3 + GTK_FILL + + + + + True + True + False + + + + True + False + gtk-info + + + + + 4 + 5 + 1 + 2 + + + + + + + True + True + False + + + + True + False + gtk-info + + + + + 4 + 5 + 2 + 3 + + + + + + + True + True + False + + + + True + False + gtk-info + + + + + 4 + 5 + 3 + 4 + + + + + + + True + True + False + + + + True + False + gtk-info + + + + + 4 + 5 + 4 + 5 + + + + + + + True + True + False + + + + True + False + gtk-preferences + + + + + 3 + 4 + 4 + 5 + + + + + + + True + True + False + + + + True + False + gtk-preferences + + + + + 3 + 4 + 3 + 4 + + + + + + + True + True + False + + + + True + False + gtk-preferences + + + + + 3 + 4 + 2 + 3 + + + + + + + True + True + False + + + + True + False + gtk-preferences + + + + + 3 + 4 + 1 + 2 + + + + + + + True + False + 0 + Graphics: + + + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + Sound: + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + Controller 1: + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + Controller 2: + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + + True + False + 0 + CD-ROM: + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + + True + True + False + + + + True + False + gtk-info + + + + + 4 + 5 + + + + + + + True + False + gtk-find + + + 6 + 7 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + Search in: + + + 1 + 2 + 6 + 7 + GTK_FILL + + + + + + True + False + + + True + False + select-folder + True + Select Folder to Search + + + + False + True + 0 + + + + + 2 + 5 + 6 + 7 + + + + + True + False + generated-icon-sio1-png + + + 5 + 6 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + Link cable: + + + 1 + 2 + 5 + 6 + GTK_FILL + + + + + + True + False + + + 2 + 3 + 5 + 6 + GTK_FILL + + + + + True + True + True + + + + True + False + gtk-preferences + + + + + 3 + 4 + 5 + 6 + + + + + + + True + True + True + + + + True + False + gtk-info + + + + + 4 + 5 + 5 + 6 + + + + + + + + + + + True + False + <b>Plugins</b> + True + + + + + False + False + 0 + + + + + True + False + 0 + + + True + False + 5 + + + True + False + True + 5 + 5 + + + True + False + gtk-execute + + + 0 + 0 + + + + + True + False + 0 + BIOS: + + + 1 + 0 + + + + + True + False + gtk-find + + + 0 + 1 + + + + + True + False + 0 + Search in: + + + 1 + 1 + + + + + True + False + + + True + False + + + False + True + 0 + + + + + 2 + 0 + + + + + True + False + + + True + False + select-folder + True + + + False + True + 0 + + + + + 2 + 1 + + + + + + + + + True + False + <b>BIOS</b> + True + + + + + True + True + 1 + + + + + True + True + 5 + 2 + + + + + + btn_ConfClose + + + + False + Configure Memory Cards + True + center-on-parent + 688 + 400 + dialog + + + True + False + + + True + False + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + + + True + False + 5 + 0 + + + True + False + 6 + 6 + + + True + False + in + + + 265 + 400 + True + True + + + + + + + + True + True + 0 + + + + + True + False + 5 + 5 + + + True + True + True + False + + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-new + + + False + False + 0 + + + + + True + False + 0 + New + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + True + True + True + False + + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-clear + + + False + False + 0 + + + + + True + False + 0 + Format + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + True + True + True + True + + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-delete + + + False + False + 0 + + + + + True + False + 0 + Un/Delete + True + + + False + False + 1 + + + + + + + + + False + False + 2 + + + + + False + True + 1 + + + + + True + True + True + + + True + False + 3 + + + True + False + gtk-floppy + + + False + False + 0 + + + + + True + False + Loading... + middle + True + + + True + True + 1 + + + + + True + False + + + False + True + 2 + + + + + True + False + gtk-open + + + False + False + 3 + + + + + + + False + True + 2 + + + + + + + True + False + + + True + False + <b>Memory Card 1</b> + True + + + False + False + 4 + 0 + + + + + + + True + True + 0 + + + + + True + False + 27 + 132 + + + True + False + 6 + spread + + + True + True + True + False + + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-go-forward + + + False + False + 0 + + + + + True + False + 0 + Copy + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + True + True + True + False + + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-go-back + + + False + False + 0 + + + + + True + False + 0 + Copy + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + + + False + False + 1 + + + + + True + False + 5 + 0 + + + True + False + 6 + 6 + + + 265 + 400 + True + False + in + + + True + True + + + + + + + + True + True + 0 + + + + + True + False + 5 + 5 + + + True + True + True + False + + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-new + + + False + False + 0 + + + + + True + False + 0 + New + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + True + True + True + False + + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-clear + + + False + False + 0 + + + + + True + False + 0 + Format + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + True + True + True + True + + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-delete + + + False + False + 0 + + + + + True + False + 0 + Un/Delete + True + + + False + False + 1 + + + + + + + + + False + False + 2 + + + + + False + True + 1 + + + + + True + True + True + + + True + False + 3 + + + True + False + gtk-floppy + + + False + False + 0 + + + + + True + False + Loading... + middle + True + + + True + True + 1 + + + + + True + False + + + False + True + 2 + + + + + True + False + gtk-open + + + False + False + 3 + + + + + + + False + True + 2 + + + + + + + True + False + + + True + False + <b>Memory Card 2</b> + True + + + False + False + 4 + 0 + + + + + + + True + True + 2 + + + + + True + True + 2 + + + + + + McdClose + + + + False + 5 + Memory Dump + False + True + center-on-parent + dialog + + + True + False + vertical + 5 + + + True + False + end + + + gtk-close + True + True + True + True + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + 13 + + + True + False + 10 + + + True + False + 0 + Address (Hexadecimal): + + + False + False + 0 + + + + + True + True + • + False + False + + + True + True + 1 + + + + + True + True + 5 + 0 + + + + + True + False + 10 + + + gtk-jump-to + True + True + True + True + + + False + False + 1 + + + + + gtk-media-rewind + True + True + True + True + + + False + False + 2 + + + + + gtk-media-forward + True + True + True + True + + + False + False + 3 + + + + + True + True + 1 + + + + + False + False + 5 + 1 + + + + + 580 + 380 + True + True + never + etched-in + + + True + True + True + horizontal + + + + + + + + True + True + 2 + + + + + True + False + 20 + center + + + True + True + True + + + True + False + + + True + False + gtk-save-as + + + True + True + 0 + + + + + True + False + 0 + Raw Dump... + + + True + True + 1 + + + + + + + False + False + 0 + + + + + True + True + True + + + True + False + + + True + False + gtk-edit + + + True + True + 0 + + + + + True + False + 0 + Patch Memory... + + + True + True + 1 + + + + + + + False + False + 1 + + + + + False + False + 3 + + + + + + memview_close + + + + False + Configure NetPlay + False + True + center-on-parent + dialog + + + + True + False + vertical + + + True + False + end + + + gtk-close + True + True + True + True + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + + + True + False + 5 + 0 + + + True + False + 5 + + + True + False + 5 + + + True + False + gtk-network + + + False + True + 0 + + + + + True + False + + + True + True + 1 + + + + + True + True + False + + + + True + False + gtk-preferences + + + + + False + False + 2 + + + + + True + True + False + + + + True + False + gtk-info + + + + + False + False + 3 + + + + + + + + + True + False + <b>NetPlay</b> + True + + + + + False + False + 0 + + + + + False + True + 2 + + + + + + closebutton2 + + + + True + False + gtk-open + 1 + + + True + False + gtk-revert-to-saved + 1 + + + True + False + gtk-preferences + 1 + + + True + False + gtk-properties + 1 + + + True + False + gtk-floppy + 1 + + + True + False + gtk-properties + 1 + + + True + False + gtk-indent + 1 + + + True + False + gtk-index + 1 + + + True + False + gtk-find + 1 + + + True + False + gtk-about + 1 + + + True + False + gtk-save-as + 1 + + + True + False + 0.49000000953674316 + gtk-cdrom + 1 + + + True + False + gtk-stop + 1 + + + True + False + gtk-select-color + 1 + + + True + False + gtk-convert + 1 + + + True + False + gtk-cdrom + 1 + + + True + False + gtk-execute + 1 + + + True + False + gtk-quit + 1 + + + True + False + gtk-open + 1 + + + True + False + gtk-revert-to-saved + 1 + + + True + False + gtk-convert + 1 + + + True + False + gtk-execute + 1 + + + True + False + gtk-execute + 1 + + + True + False + gtk-go-forward + 1 + + + True + False + gtk-refresh + 1 + + + True + False + gtk-open + 1 + + + True + False + gtk-save-as + 1 + + + False + PCSXR + False + pcsxr-icon.png + + + + True + False + + + True + False + + + True + False + _File + True + + + False + + + Run _CD + True + False + True + image2 + False + + + + + + + Run _ISO... + True + False + True + image3 + False + + + + + + + Run _BIOS + True + False + True + image4 + False + + + + + + + Run _EXE... + True + False + True + image5 + False + + + + + + + True + False + + + + + E_xit + True + False + True + image25 + False + + + + + + + + + + + True + False + _Emulator + True + + + False + + + _Continue + True + False + True + image6 + False + + + + + + + _Reset + True + False + True + image7 + False + + + + + + + _Shutdown + True + False + True + image20 + False + + + + + + + True + False + + + + + S_witch ISO... + True + False + True + image8 + False + + + + + + + True + False + + + + + _Save State + True + False + True + image9 + False + + + False + + + True + False + Slot _1 + True + + + + + + + True + False + Slot _2 + True + + + + + + + True + False + Slot _3 + True + + + + + + + True + False + Slot _4 + True + + + + + + + True + False + Slot _5 + True + + + + + + + True + False + Slot _6 + True + + + + + + True + False + Slot _7 + True + + + + + + True + False + Slot _8 + True + + + + + + True + False + Slot _9 + True + + + + + + _Other... + True + False + True + image19 + False + + + + + + + + + + + _Load State + True + False + True + image10 + False + + + False + + + True + False + Slot _1 + True + + + + + + + True + False + Slot _2 + True + + + + + + + True + False + Slot _3 + True + + + + + + + True + False + Slot _4 + True + + + + + + + True + False + Slot _5 + True + + + + + + + True + False + Slot _6 + True + + + + + + True + False + Slot _7 + True + + + + + + True + False + Slot _8 + True + + + + + + True + False + Slot _9 + True + + + + + + True + False + Slot _Recent + True + + + + + + _Other... + True + False + True + image1 + False + + + + + + + + + + + + + + + True + False + _Configuration + True + + + False + + + _Plugins & BIOS... + True + False + True + image11 + False + + + + + + + True + False + + + + + _Graphics... + True + False + True + image21 + False + + + + + _Sound... + True + False + True + image22 + False + + + + + CD-_ROM... + True + False + True + image23 + False + + + + + C_ontrollers... + True + False + True + image24 + False + + + + + _Link cable... + True + False + True + image42 + False + + + + + True + False + + + + + _Netplay... + True + False + True + image14 + False + + + + + + True + False + + + + + _CPU... + True + False + True + image12 + False + + + + + + _Memory Cards... + True + False + True + image13 + False + + + + + + + True + False + + + + + Chea_t + True + False + True + image15 + False + + + True + False + + + _Browse... + True + False + True + image16 + False + + + + + _Search... + True + False + True + image17 + False + + + + + + + + + Memory _Dump + True + False + True + image34 + False + + + + + + + + + True + False + _Help + True + + + False + + + _About PCSXR... + True + False + True + image18 + False + + + + + + + + + + False + False + 0 + + + + + True + False + 5 + 11 + + + True + False + True + Run CD + True + generated-icon-cd-png + + + + + True + False + True + Run ISO Image + True + generated-icon-iso-open-png + + + 1 + 2 + + + + + True + False + + + 2 + 3 + + + + + True + False + True + Continue Emulation + True + generated-icon-play-png + + + 3 + 4 + + + + + True + False + True + Switch ISO Image + True + generated-icon-iso-reopen-png + + + 4 + 5 + + + + + True + False + + + 5 + 6 + + + + + True + False + True + Configure Memory Cards + True + generated-icon-memcard-png + + + 6 + 7 + + + + + True + False + True + Configure Graphics + True + generated-icon-gpu-png + + + 7 + 8 + + + + + True + False + True + Configure Sound + True + generated-icon-spu-png + + + 8 + 9 + + + + + True + False + True + Configure CD-ROM + True + generated-icon-cdr-png + + + 9 + 10 + + + + + True + False + True + Configure Controllers + True + generated-icon-pad-png + + + 10 + 11 + + + + + False + False + 1 + + + + + True + False + pcsxr.png + + + True + True + 2 + + + + + True + False + 2 + + + False + True + 3 + + + + + + + + + + + + + NTSC + + + PAL + + + + + + + + + + + 8-bit + + + 16-bit + + + 32-bit + + + + + + + + + + + Equal Value + + + Not Equal Value + + + Range + + + Increased By + + + Decreased By + + + Increased + + + Decreased + + + Different + + + No Change + + + + + + + + + + + Decimal + + + Hexadecimal + + + + + False + 5 + Cheat Search + False + True + center-on-parent + dialog + + + True + False + vertical + 2 + + + True + False + end + + + gtk-close + True + True + True + True + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + 0 + + + True + False + 5 + 5 + 5 + + + True + False + 5 + + + True + False + 3 + 4 + 5 + 5 + + + True + False + liststore2 + + + + 0 + + + + + 1 + 2 + 1 + 2 + + + + + + True + False + 0 + Search For: + + + + + True + False + 0 + Data Type: + + + 1 + 2 + + + + + True + False + 0 + Value: + + + 2 + 3 + + + + + True + False + Data Base: + + + 2 + 3 + 1 + 2 + + + + + True + False + liststore3 + + + + 0 + + + + + 1 + 2 + + + + + + True + True + False + False + + + 1 + 2 + 2 + 3 + + + + + + True + False + liststore4 + + + + 0 + + + + + 3 + 4 + 1 + 2 + + + + + + True + False + To: + + + 2 + 3 + 2 + 3 + + + + + + + + True + True + False + False + + + 3 + 4 + 2 + 3 + + + + + + + + False + True + 0 + + + + + True + False + + + 450 + 250 + True + True + never + etched-in + + + True + True + False + False + vertical + + + + + + + + True + True + 0 + + + + + True + False + 10 + start + + + True + True + True + + + True + False + + + True + False + gtk-ok + 1 + + + True + True + 0 + + + + + True + False + 0 + Freeze + + + True + True + 1 + + + + + + + False + False + 0 + + + + + True + True + True + + + True + False + + + True + False + gtk-edit + 1 + + + True + True + 0 + + + + + True + False + 0 + Modify + + + True + True + 1 + + + + + + + False + False + 1 + + + + + True + True + True + + + True + False + + + True + False + gtk-paste + 1 + + + True + True + 0 + + + + + True + False + 0 + Copy + + + True + True + 1 + + + + + + + False + False + 2 + + + + + False + False + 10 + 1 + + + + + True + True + 1 + + + + + True + False + 0 + 0 + label_resultsfound + True + + + False + False + 2 + + + + + True + False + 20 + center + + + True + True + True + + + True + False + + + True + False + gtk-ok + 1 + + + True + True + 0 + + + + + True + False + 0 + Search + + + True + True + 1 + + + + + + + False + False + 0 + + + + + True + True + True + + + True + False + + + True + False + gtk-undo + 1 + + + True + True + 0 + + + + + True + False + 0 + Restart + + + True + True + 1 + + + + + + + False + False + 1 + + + + + False + False + 3 + + + + + + + + + True + False + <b>Cheat Search</b> + True + + + + + True + True + 1 + + + + + + closebutton + + + + + + + + + + Enabled (Little endian) + + + Disabled + + + Enabled (Big endian) + + + + + False + Configure CPU + False + True + center-on-parent + dialog + + + True + False + vertical + + + True + False + end + + + gtk-close + True + True + True + True + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + 5 + 5 + + + True + False + 0 + + + True + False + 5 + 12 + + + + + + SPU IRQ Always Enabled + True + True + False + True + 0 + True + + + 2 + 3 + GTK_FILL + + + + + + Black & White Movies + True + True + False + True + 0 + True + + + 3 + 4 + GTK_FILL + + + + + + SIO IRQ Always Enabled + True + True + False + True + 0 + True + + + 1 + 2 + GTK_FILL + + + + + + Disable XA Decoding + True + True + False + True + 0 + True + + + GTK_FILL + + + + + + Slow Boot + True + True + False + True + 0 + True + + + 5 + 6 + GTK_FILL + + + + + + Enable Interpreter CPU + True + True + False + True + 0 + True + + + 7 + 8 + GTK_FILL + + + + + + Enable Console Output + True + True + False + True + 0 + True + + + 6 + 7 + GTK_FILL + + + + + + Enable Debugger + True + True + False + True + 0 + True + + + 8 + 9 + GTK_FILL + + + + + + Parasite Eve 2, Vandal Hearts 1/2 Fix + True + True + False + True + 0 + True + + + 9 + 10 + GTK_FILL + + + + + + InuYasha Sengoku Battle Fix + True + True + False + True + 0 + True + + + 10 + 11 + GTK_FILL + + + + + + No memcard (COTS password option) + True + True + False + True + 0 + True + + + 11 + 12 + GTK_FILL + + + + + + Widescreen (GTE Hack) + True + True + False + True + 0 + True + + + 12 + 13 + GTK_FILL + + + + + + Compatibility hacks (Raystorm/VH-D/MML/Cart World/...) + True + True + False + True + 0 + True + + + 13 + 14 + GTK_FILL + + + + + + + + True + False + <b>Options</b> + True + + + + + False + True + 0 + + + + + True + False + 0 + + + True + False + 5 + 10 + + + True + False + CD Audio + True + + + False + False + 0 + + + + + True + False + liststore5 + + + + 0 + + + + + False + False + 1 + + + + + + + False + True + 1 + + + + + True + False + 0 + + + True + False + 5 + 4 + + + True + False + Every + True + + + False + False + 0 + + + + + True + True + 3 + 3 + + + False + False + 1 + + + + + True + False + vblanks, max. + True + + + False + False + 2 + + + + + True + True + 3 + 3 + + + False + False + 3 + + + + + True + False + rewinds = + True + + + False + False + 4 + + + + + True + False + False + 5 + 5 + + + False + False + 5 + + + + + True + False + MB + True + + + False + False + 6 + + + + + + + True + False + <b>Rewind interval</b> + True + + + + + False + True + 2 + + + + + True + False + 0 + + + True + False + 5 + 4 + + + True + False + Alt1 + True + + + False + False + 0 + + + + + True + True + 4 + 4 + 4 + % + + + False + False + 1 + + + + + True + False + % + True + + + False + False + 2 + + + + + True + False + + + False + False + 4 + 3 + + + + + True + False + Alt2 + True + + + False + False + 4 + + + + + True + True + 4 + 4 + 4 + 0.11 + + + False + False + 5 + + + + + True + False + % + True + + + False + False + 6 + + + + + True + False + + + False + False + 4 + 7 + + + + + + + + + + True + False + <b>Alternate Speed</b> + True + + + + + False + True + 3 + + + + + True + False + 0 + + + True + False + 5 + 10 + + + Autodetect + True + True + False + True + 0.5 + True + + + False + False + 0 + + + + + True + False + liststore1 + + + + 0 + + + + + False + False + 1 + + + + + + + True + False + <b>System Type</b> + True + + + + + False + True + 4 + + + + + False + True + 2 + + + + + + closebutton1 + + + diff --git a/gui/data/pixmaps/Makefile.am b/gui/data/pixmaps/Makefile.am new file mode 100644 index 00000000..904ffe34 --- /dev/null +++ b/gui/data/pixmaps/Makefile.am @@ -0,0 +1,30 @@ +pixmapdir = "$(datadir)/pcsxr" +pixmap_DATA = \ + 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 + +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 diff --git a/gui/data/pixmaps/pcsxr-cd-open.png b/gui/data/pixmaps/pcsxr-cd-open.png new file mode 100644 index 00000000..1f07c0e7 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-cd-open.png differ diff --git a/gui/data/pixmaps/pcsxr-icon.png b/gui/data/pixmaps/pcsxr-icon.png new file mode 100644 index 00000000..2cc9839f Binary files /dev/null and b/gui/data/pixmaps/pcsxr-icon.png differ diff --git a/gui/data/pixmaps/pcsxr-iso-open.png b/gui/data/pixmaps/pcsxr-iso-open.png new file mode 100644 index 00000000..3daaea2a Binary files /dev/null and b/gui/data/pixmaps/pcsxr-iso-open.png differ diff --git a/gui/data/pixmaps/pcsxr-iso-reopen.png b/gui/data/pixmaps/pcsxr-iso-reopen.png new file mode 100644 index 00000000..3294074a Binary files /dev/null and b/gui/data/pixmaps/pcsxr-iso-reopen.png differ diff --git a/gui/data/pixmaps/pcsxr-memcard.png b/gui/data/pixmaps/pcsxr-memcard.png new file mode 100644 index 00000000..2b061b6d Binary files /dev/null and b/gui/data/pixmaps/pcsxr-memcard.png differ diff --git a/gui/data/pixmaps/pcsxr-play.png b/gui/data/pixmaps/pcsxr-play.png new file mode 100644 index 00000000..ce003e4d Binary files /dev/null and b/gui/data/pixmaps/pcsxr-play.png differ diff --git a/gui/data/pixmaps/pcsxr-plugin-cdr.png b/gui/data/pixmaps/pcsxr-plugin-cdr.png new file mode 100644 index 00000000..72737547 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-plugin-cdr.png differ diff --git a/gui/data/pixmaps/pcsxr-plugin-gpu.png b/gui/data/pixmaps/pcsxr-plugin-gpu.png new file mode 100644 index 00000000..e49595f3 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-plugin-gpu.png differ diff --git a/gui/data/pixmaps/pcsxr-plugin-pad.png b/gui/data/pixmaps/pcsxr-plugin-pad.png new file mode 100644 index 00000000..186e7be8 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-plugin-pad.png differ diff --git a/gui/data/pixmaps/pcsxr-plugin-sio1.png b/gui/data/pixmaps/pcsxr-plugin-sio1.png new file mode 100644 index 00000000..e9340ade Binary files /dev/null and b/gui/data/pixmaps/pcsxr-plugin-sio1.png differ diff --git a/gui/data/pixmaps/pcsxr-plugin-spu.png b/gui/data/pixmaps/pcsxr-plugin-spu.png new file mode 100644 index 00000000..53c9ac51 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-plugin-spu.png differ diff --git a/gui/data/pixmaps/pcsxr.png b/gui/data/pixmaps/pcsxr.png new file mode 100644 index 00000000..8dc59052 Binary files /dev/null and b/gui/data/pixmaps/pcsxr.png differ -- cgit v1.2.3 From aa295feb0d95d75f10f4ac097fdb1139428e1220 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Mon, 17 Jul 2017 16:43:15 +0300 Subject: * Bring main Linux(gtk) UI up to date to remove deprecated warnings. --- configure.ac | 3 + gui/AboutDlg.c | 10 +- gui/Cheat.c | 38 +- gui/ConfDlg.c | 6 +- gui/DebugMemory.c | 46 ++- gui/GtkGui.c | 37 +- gui/Makefile.am | 50 ++- gui/MemcardDlg.c | 13 +- gui/data/Makefile.am | 6 +- gui/data/pcsxr.ui | 558 ++++++++++++------------------ gui/data/pixmaps/Makefile.am | 18 +- gui/data/pixmaps/pcsxr-about.png | Bin 0 -> 294 bytes gui/data/pixmaps/pcsxr-cheats-browse.png | Bin 0 -> 316 bytes gui/data/pixmaps/pcsxr-cheats-search.png | Bin 0 -> 397 bytes gui/data/pixmaps/pcsxr-cheats.png | Bin 0 -> 194 bytes gui/data/pixmaps/pcsxr-cpu.png | Bin 0 -> 427 bytes gui/data/pixmaps/pcsxr-exit.png | Bin 0 -> 372 bytes gui/data/pixmaps/pcsxr-iso-open.png | Bin 3034 -> 1946 bytes gui/data/pixmaps/pcsxr-iso-reopen.png | Bin 1772 -> 435 bytes gui/data/pixmaps/pcsxr-load-state.png | Bin 0 -> 274 bytes gui/data/pixmaps/pcsxr-memory-dump.png | Bin 0 -> 266 bytes gui/data/pixmaps/pcsxr-plugin-netplay.png | Bin 0 -> 283 bytes gui/data/pixmaps/pcsxr-reset.png | Bin 0 -> 308 bytes gui/data/pixmaps/pcsxr-run-bios.png | Bin 0 -> 427 bytes gui/data/pixmaps/pcsxr-run-exe.png | Bin 0 -> 349 bytes gui/data/pixmaps/pcsxr-save-state.png | Bin 0 -> 294 bytes gui/data/pixmaps/pcsxr-settings.png | Bin 0 -> 471 bytes gui/data/pixmaps/pcsxr-shutdown.png | Bin 0 -> 306 bytes gui/data/pixmaps/pcsxr.png | Bin 60106 -> 40920 bytes 29 files changed, 349 insertions(+), 436 deletions(-) create mode 100644 gui/data/pixmaps/pcsxr-about.png create mode 100644 gui/data/pixmaps/pcsxr-cheats-browse.png create mode 100644 gui/data/pixmaps/pcsxr-cheats-search.png create mode 100644 gui/data/pixmaps/pcsxr-cheats.png create mode 100644 gui/data/pixmaps/pcsxr-cpu.png create mode 100644 gui/data/pixmaps/pcsxr-exit.png create mode 100644 gui/data/pixmaps/pcsxr-load-state.png create mode 100644 gui/data/pixmaps/pcsxr-memory-dump.png create mode 100644 gui/data/pixmaps/pcsxr-plugin-netplay.png create mode 100644 gui/data/pixmaps/pcsxr-reset.png create mode 100644 gui/data/pixmaps/pcsxr-run-bios.png create mode 100644 gui/data/pixmaps/pcsxr-run-exe.png create mode 100644 gui/data/pixmaps/pcsxr-save-state.png create mode 100644 gui/data/pixmaps/pcsxr-settings.png create mode 100644 gui/data/pixmaps/pcsxr-shutdown.png (limited to 'gui/data') diff --git a/configure.ac b/configure.ac index ce160659..3eed1175 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,9 @@ PKG_CHECK_MODULES([SDL2], [sdl2 >= 2.0.0], ], AC_MSG_ERROR([*** SDL >= 1.2.12 not found!])) ]) +AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources) +AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) + AC_SUBST(GLIB2_CFLAGS) AC_SUBST(GLIB2_LIBS) AC_SUBST(GTK3_CFLAGS) diff --git a/gui/AboutDlg.c b/gui/AboutDlg.c index f701c1c9..4f5d02ae 100755 --- a/gui/AboutDlg.c +++ b/gui/AboutDlg.c @@ -19,11 +19,12 @@ #include "Linux.h" #include -#define ABOUT_VERSION "svn" +#define ABOUT_VERSION "git" void RunAboutDialog(void) { GtkBuilder *builder; GtkWidget *AboutDlg; + GdkPixbuf *logo; const gchar *authors[] = { "PCSX-Reloaded Team:", @@ -87,9 +88,11 @@ void RunAboutDialog(void) { "You should have received a copy of the GNU General Public License " "along with this program. If not, see ."); + logo = gdk_pixbuf_new_from_resource("/org/pcsxr/gui/pixmaps/pcsxr-icon.png", NULL); + builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } @@ -109,6 +112,9 @@ void RunAboutDialog(void) { gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG (AboutDlg), _("A PlayStation emulator.")); gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(AboutDlg), _(license)); gtk_about_dialog_set_wrap_license(GTK_ABOUT_DIALOG(AboutDlg), TRUE); + gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(AboutDlg), logo); + + g_object_unref(G_OBJECT(logo)); gtk_dialog_run(GTK_DIALOG(AboutDlg)); gtk_widget_destroy(AboutDlg); diff --git a/gui/Cheat.c b/gui/Cheat.c index 497970ae..3ecb6468 100755 --- a/gui/Cheat.c +++ b/gui/Cheat.c @@ -49,7 +49,6 @@ static void LoadCheatListItems(int index) { gtk_tree_view_set_model(GTK_TREE_VIEW(widget), GTK_TREE_MODEL(store)); g_object_unref(G_OBJECT(store)); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(widget), TRUE); gtk_tree_view_set_search_column(GTK_TREE_VIEW(widget), 1); gtk_widget_show(widget); @@ -99,8 +98,8 @@ static void OnCheatListDlg_AddClicked(GtkWidget *widget, gpointer user_data) { GtkWidget *box, *scroll, *label, *descr_edit, *code_edit; dlg = gtk_dialog_new_with_buttons(_("Add New Cheat"), GTK_WINDOW(CheatListDlg), - GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + GTK_DIALOG_MODAL, "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_ACCEPT, NULL); gtk_window_set_default_size(GTK_WINDOW(dlg), 350, 350); @@ -125,7 +124,7 @@ static void OnCheatListDlg_AddClicked(GtkWidget *widget, gpointer user_data) { gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), code_edit); + gtk_container_add(GTK_CONTAINER(scroll), code_edit); gtk_widget_show(code_edit); gtk_box_pack_start(GTK_BOX(box), scroll, TRUE, TRUE, 5); @@ -183,8 +182,8 @@ static void OnCheatListDlg_EditClicked(GtkWidget *widget, gpointer user_data) { gtk_tree_path_free(path); dlg = gtk_dialog_new_with_buttons(_("Edit Cheat"), GTK_WINDOW(CheatListDlg), - GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + GTK_DIALOG_MODAL, "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_ACCEPT, NULL); gtk_window_set_default_size(GTK_WINDOW(dlg), 350, 350); @@ -220,7 +219,7 @@ static void OnCheatListDlg_EditClicked(GtkWidget *widget, gpointer user_data) { gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), code_edit); + gtk_container_add(GTK_CONTAINER(scroll), code_edit); gtk_widget_show(code_edit); gtk_box_pack_start(GTK_BOX(box), scroll, TRUE, TRUE, 5); @@ -311,8 +310,8 @@ static void OnCheatListDlg_OpenClicked(GtkWidget *widget, gpointer user_data) { GtkFileFilter *filter; chooser = gtk_file_chooser_dialog_new (_("Open Cheat File"), - NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + NULL, GTK_FILE_CHOOSER_ACTION_OPEN, "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_OK, NULL); filename = g_build_filename(getenv("HOME"), CHEATS_DIR, NULL); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), filename); @@ -355,8 +354,8 @@ static void OnCheatListDlg_SaveClicked(GtkWidget *widget, gpointer user_data) { GtkFileFilter *filter; chooser = gtk_file_chooser_dialog_new(_("Save Cheat File"), - NULL, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + NULL, GTK_FILE_CHOOSER_ACTION_SAVE, "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_OK, NULL); filename = g_build_filename(getenv("HOME"), CHEATS_DIR, NULL); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), filename); @@ -424,7 +423,7 @@ void RunCheatListDialog() { builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } @@ -621,7 +620,6 @@ static void UpdateCheatSearchDialog() { gtk_tree_view_set_model(GTK_TREE_VIEW(widget), GTK_TREE_MODEL(store)); g_object_unref(G_OBJECT(store)); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(widget), TRUE); gtk_widget_show(widget); } @@ -659,8 +657,8 @@ static void OnCheatSearchDlg_FreezeClicked(GtkWidget *widget, gpointer user_data addr = SearchResults[GetSelectedResultIndex()]; dlg = gtk_dialog_new_with_buttons(_("Freeze value"), GTK_WINDOW(CheatListDlg), - GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + GTK_DIALOG_MODAL, "_OK", GTK_RESPONSE_ACCEPT, + "_Cancel", GTK_RESPONSE_CANCEL, NULL); box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg))); @@ -672,7 +670,7 @@ static void OnCheatSearchDlg_FreezeClicked(GtkWidget *widget, gpointer user_data gtk_box_pack_start(GTK_BOX(box), descr_edit, FALSE, FALSE, 10); gtk_widget_show(descr_edit); - hbox = gtk_hbox_new(FALSE, 0); + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 15); label = gtk_label_new(_("Value:")); @@ -758,11 +756,11 @@ static void OnCheatSearchDlg_ModifyClicked(GtkWidget *widget, gpointer user_data addr = SearchResults[GetSelectedResultIndex()]; dlg = gtk_dialog_new_with_buttons(_("Modify value"), GTK_WINDOW(CheatListDlg), - GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + GTK_DIALOG_MODAL, "_OK", GTK_RESPONSE_ACCEPT, + "_Cancel", GTK_RESPONSE_CANCEL, NULL); box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg))); - hbox = gtk_hbox_new(FALSE, 0); + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 5); label = gtk_label_new(_("New value:")); @@ -1136,7 +1134,7 @@ void RunCheatSearchDialog() { builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c index 25c107eb..30d3df1f 100755 --- a/gui/ConfDlg.c +++ b/gui/ConfDlg.c @@ -101,7 +101,7 @@ void ConfigurePlugins() { UpdatePluginsBIOS(); builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } @@ -213,7 +213,7 @@ void OnConf_Net() { } builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } @@ -958,7 +958,7 @@ void OnConf_Cpu() { builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } diff --git a/gui/DebugMemory.c b/gui/DebugMemory.c index 3c7939ab..096b6c5c 100755 --- a/gui/DebugMemory.c +++ b/gui/DebugMemory.c @@ -86,7 +86,6 @@ static void UpdateMemViewDlg() { gtk_tree_view_set_model(GTK_TREE_VIEW(widget), GTK_TREE_MODEL(store)); g_object_unref(G_OBJECT(store)); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(widget), TRUE); gtk_widget_show(widget); } @@ -150,30 +149,32 @@ static void MemView_Dump() { char buf[10]; dlg = gtk_dialog_new_with_buttons(_("Memory Dump"), GTK_WINDOW(MemViewDlg), - GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + GTK_DIALOG_MODAL, "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_ACCEPT, NULL); box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg))); - table = gtk_table_new(2, 2, FALSE); + table = gtk_grid_new(); + gtk_grid_set_row_spacing(GTK_GRID(table), 5); + gtk_grid_set_column_spacing(GTK_GRID(table), 5); label = gtk_label_new(_("Start Address (Hexadecimal):")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1); gtk_widget_show(label); start_edit = gtk_entry_new(); gtk_entry_set_max_length(GTK_ENTRY(start_edit), 8); sprintf(buf, "%.8X", MemViewAddress | 0x80000000); gtk_entry_set_text(GTK_ENTRY(start_edit), buf); - gtk_table_attach(GTK_TABLE(table), start_edit, 1, 2, 0, 1, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), start_edit, 1, 0, 1, 1); gtk_widget_show(start_edit); label = gtk_label_new(_("Length (Decimal):")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), label, 0, 1, 1, 1); gtk_widget_show(label); length_edit = gtk_entry_new(); - gtk_table_attach(GTK_TABLE(table), length_edit, 1, 2, 1, 2, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), length_edit, 1, 1, 1, 1); gtk_widget_show(length_edit); gtk_box_pack_start(GTK_BOX(box), table, FALSE, FALSE, 5); @@ -196,8 +197,8 @@ static void MemView_Dump() { if (length > 0) { GtkWidget *file_chooser = gtk_file_chooser_dialog_new(_("Dump to File"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + "_Cancel", GTK_RESPONSE_CANCEL, + "_Save", GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_chooser), getenv("HOME")); @@ -228,32 +229,34 @@ static void MemView_Patch() { char buf[12]; dlg = gtk_dialog_new_with_buttons(_("Memory Patch"), GTK_WINDOW(MemViewDlg), - GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + GTK_DIALOG_MODAL, "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_ACCEPT, NULL); box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg))); - table = gtk_table_new(2, 2, FALSE); + table = gtk_grid_new(); + gtk_grid_set_row_spacing(GTK_GRID(table), 5); + gtk_grid_set_column_spacing(GTK_GRID(table), 5); label = gtk_label_new(_("Address (Hexadecimal):")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1); gtk_widget_show(label); addr_edit = gtk_entry_new(); gtk_entry_set_max_length(GTK_ENTRY(addr_edit), 8); sprintf(buf, "%.8X", MemViewAddress | 0x80000000); gtk_entry_set_text(GTK_ENTRY(addr_edit), buf); - gtk_table_attach(GTK_TABLE(table), addr_edit, 1, 2, 0, 1, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), addr_edit, 1, 0, 1, 1); gtk_widget_show(addr_edit); label = gtk_label_new(_("Value (Hexa string):")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), label, 0, 1, 1, 1); gtk_widget_show(label); val_edit = gtk_entry_new(); sprintf(buf, "%.2X", MemViewValue); gtk_entry_set_text(GTK_ENTRY(val_edit), buf); - gtk_table_attach(GTK_TABLE(table), val_edit, 1, 2, 1, 2, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), val_edit, 1, 1, 1, 1); gtk_widget_show(val_edit); gtk_box_pack_start(GTK_BOX(box), table, FALSE, FALSE, 5); @@ -303,12 +306,11 @@ void RunDebugMemoryDialog() { GtkWidget *widget; GtkCellRenderer *renderer; GtkTreeViewColumn *column; - PangoFontDescription *pfd; int i; builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } @@ -343,12 +345,6 @@ void RunDebugMemoryDialog() { renderer, "text", 17, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column); - pfd = pango_font_description_from_string("Bitstream Vera Sans Mono, " - "DejaVu Sans Mono, Liberation Mono, FreeMono, Sans Mono 9"); - - gtk_widget_override_font(widget, pfd); - - pango_font_description_free(pfd); UpdateMemViewDlg(); diff --git a/gui/GtkGui.c b/gui/GtkGui.c index 17f1422f..970be43b 100755 --- a/gui/GtkGui.c +++ b/gui/GtkGui.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "Linux.h" @@ -320,9 +321,13 @@ void StartGui() { gtk_window_present (GTK_WINDOW (Window)); return; }*/ + GtkIconTheme *itheme = gtk_icon_theme_get_default(); + gtk_icon_theme_add_resource_path(itheme,"/org/pcsxr/gui"); + gtk_icon_theme_add_resource_path(itheme,"/org/pcsxr/gui/pixmaps/"); + builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } @@ -331,8 +336,8 @@ void StartGui() { gtk_widget_show(GTK_WIDGET(Window)); gtk_window_set_title(GTK_WINDOW(Window), "PCSXR"); - gtk_window_set_icon_from_file(GTK_WINDOW(Window), PIXMAPDIR "pcsxr-icon.png", NULL); - gtk_window_set_default_icon_from_file(PIXMAPDIR "pcsxr-icon.png", NULL); + gtk_window_set_icon(GTK_WINDOW(Window), gdk_pixbuf_new_from_resource("/org/pcsxr/gui/pixmaps/pcsxr-icon.png", NULL)); + gtk_window_set_default_icon(gdk_pixbuf_new_from_resource("/org/pcsxr/gui/pixmaps/pcsxr-icon.png", NULL)); ResetMenuSlots(); // Set up callbacks @@ -462,9 +467,11 @@ void StartGui() { G_CALLBACK(OnConf_Sio1), NULL, NULL, G_CONNECT_AFTER); #endif widget = GTK_WIDGET(gtk_builder_get_object(builder, "cpu1")); - g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Cpu), NULL, NULL, G_CONNECT_AFTER); + g_signal_connect_data(G_OBJECT(widget), "activate", + G_CALLBACK(OnConf_Cpu), NULL, NULL, G_CONNECT_AFTER); widget = GTK_WIDGET(gtk_builder_get_object(builder, "pgxp1")); - g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Pgxp), NULL, NULL, G_CONNECT_AFTER); + g_signal_connect_data(G_OBJECT(widget), "activate", + G_CALLBACK(OnConf_Pgxp), NULL, NULL, G_CONNECT_AFTER); widget = GTK_WIDGET(gtk_builder_get_object(builder, "memory_cards1")); g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER); @@ -572,8 +579,8 @@ void OnFile_RunExe() { } else { file_chooser = gtk_file_chooser_dialog_new(_("Select PSX EXE File"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + "_Cancel", GTK_RESPONSE_CANCEL, + "_Open", GTK_RESPONSE_ACCEPT, NULL); // Add file filters GtkFileFilter *exefilter = gtk_file_filter_new (); @@ -709,8 +716,8 @@ static gchar *Open_Iso_Proc() { static char current_folder[MAXPATHLEN] = ""; chooser = gtk_file_chooser_dialog_new (_("Open PSX Disc Image File"), - NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, + NULL, GTK_FILE_CHOOSER_ACTION_OPEN, "_Cancel", GTK_RESPONSE_CANCEL, + "_Open", GTK_RESPONSE_ACCEPT, NULL); if (stat(Config.IsoImgDir, &sb) == 0 && S_ISDIR(sb.st_mode)) { @@ -747,7 +754,7 @@ static gchar *Open_Iso_Proc() { gtk_file_filter_set_name(allfilter, _("All Files")); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (chooser), allfilter); - if (gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_OK) { + if (gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_ACCEPT) { gchar *path = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(chooser)); /* Workaround: @@ -1084,8 +1091,8 @@ void on_states_load_other() { SStateFile = g_strconcat(getenv("HOME"), STATES_DIR, NULL); file_chooser = gtk_file_chooser_dialog_new(_("Select State File"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + "_Cancel", GTK_RESPONSE_CANCEL, + "_Open", GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (file_chooser), SStateFile); g_free(SStateFile); @@ -1113,8 +1120,8 @@ void on_states_save_other() { file_chooser = gtk_file_chooser_dialog_new(_("Select State File"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + "_Cancel", GTK_RESPONSE_CANCEL, + "_Save", GTK_RESPONSE_OK, NULL); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_chooser), SStateFile); g_free(SStateFile); @@ -1155,7 +1162,7 @@ void SysMessage(const char *fmt, ...) { } MsgDlg = gtk_dialog_new_with_buttons(_("Notice"), NULL, - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_NONE, NULL); + GTK_DIALOG_DESTROY_WITH_PARENT, "_OK", GTK_RESPONSE_NONE, NULL); gtk_window_set_position (GTK_WINDOW(MsgDlg), GTK_WIN_POS_CENTER); diff --git a/gui/Makefile.am b/gui/Makefile.am index 5feb39ea..ebae1d48 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -24,7 +24,55 @@ pcsxr_SOURCES = \ DebugMemory.c \ DebugMemory.h \ AboutDlg.c \ - AboutDlg.h + AboutDlg.h \ + GtkResources.c \ + GtkResources.h + +# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. +define gresource_xml = + + + + pcsxr.ui + pixmaps/pcsxr-about.png + pixmaps/pcsxr-cd-open.png + pixmaps/pcsxr-cheats-browse.png + pixmaps/pcsxr-cheats-search.png + pixmaps/pcsxr-cheats.png + pixmaps/pcsxr-cpu.png + pixmaps/pcsxr-exit.png + pixmaps/pcsxr-icon.png + pixmaps/pcsxr-iso-open.png + pixmaps/pcsxr-iso-reopen.png + pixmaps/pcsxr-load-state.png + pixmaps/pcsxr-memcard.png + pixmaps/pcsxr-memory-dump.png + pixmaps/pcsxr-play.png + pixmaps/pcsxr-plugin-cdr.png + pixmaps/pcsxr-plugin-gpu.png + pixmaps/pcsxr-plugin-netplay.png + pixmaps/pcsxr-plugin-pad.png + pixmaps/pcsxr-plugin-sio1.png + pixmaps/pcsxr-plugin-spu.png + pixmaps/pcsxr-reset.png + pixmaps/pcsxr-run-bios.png + pixmaps/pcsxr-run-exe.png + pixmaps/pcsxr-save-state.png + pixmaps/pcsxr-settings.png + pixmaps/pcsxr-shutdown.png + pixmaps/pcsxr.png + + +endef + +pcsxr.gresource.xml: + $(file >$@,$(gresource_xml)) +pcsxr_gresource: pcsxr.gresource.xml + $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/data --generate-dependencies $(srcdir)/$<) +GtkResources.c: pcsxr.gresource.xml $(pcsxr_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/data --generate-source --c-name pcsxr $< +GtkResources.h: pcsxr.gresource.xml $(pcsxr_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/data --generate-header --c-name pcsxr $< pcsxr_LDADD = \ ../libpcsxcore/libpcsxcore.a \ diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c index b9f2dab0..fada33ff 100755 --- a/gui/MemcardDlg.c +++ b/gui/MemcardDlg.c @@ -236,7 +236,6 @@ static void LoadListItems(int mcd, boolean newstore) { if (newstore) { gtk_tree_view_set_model(GTK_TREE_VIEW(List), GTK_TREE_MODEL(store)); g_object_unref(G_OBJECT(store)); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(List), TRUE); } else { OnTreeSelectionChanged(gtk_tree_view_get_selection(GTK_TREE_VIEW(List)), GINT_TO_POINTER(mcd)); } @@ -308,8 +307,8 @@ static void OnMcd_FileChange(GtkWidget *widget, gpointer user_data) { // Ask for name of memory card chooser = gtk_file_chooser_dialog_new(_("Select A File"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_OK, + "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_OK, NULL); if (memcard == 1) @@ -350,7 +349,7 @@ static void OnMcd_Format(GtkWidget *widget, gpointer user_data) { gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog), _("If you format the memory card, the card will be empty, and any existing data overwritten.")); gtk_dialog_add_buttons(GTK_DIALOG(message_dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + "_Cancel", GTK_RESPONSE_CANCEL, _("Format card"), GTK_RESPONSE_YES, NULL); result = gtk_dialog_run(GTK_DIALOG(message_dialog)); @@ -375,8 +374,8 @@ static void OnMcd_New(GtkWidget *widget, gpointer user_data) { // Ask for name of new memory card chooser = gtk_file_chooser_dialog_new(_("Create a new Memory Card"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + "_Cancel", GTK_RESPONSE_CANCEL, + "_Save", GTK_RESPONSE_OK, NULL); // Card should be put into $HOME/.pcsxr/memcards @@ -709,7 +708,7 @@ void OnConf_Mcds() { builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } diff --git a/gui/data/Makefile.am b/gui/data/Makefile.am index 8f1ce6a2..07966973 100644 --- a/gui/data/Makefile.am +++ b/gui/data/Makefile.am @@ -1,7 +1,7 @@ -glade_DATA = pcsxr.ui -gladedir = $(datadir)/pcsxr +#glade_DATA = pcsxr.ui +#gladedir = $(datadir)/pcsxr desktopdir = $(datadir)/applications desktop_DATA = pcsxr.desktop -EXTRA_DIST = $(glade_DATA) pcsxr.desktop +EXTRA_DIST = $(glade_DATA) $(desktop_DATA) diff --git a/gui/data/pcsxr.ui b/gui/data/pcsxr.ui index 2d8f2ddf..6cc4b24f 100644 --- a/gui/data/pcsxr.ui +++ b/gui/data/pcsxr.ui @@ -1,21 +1,7 @@ - + - - - - - - - - - - - - - - - + False 5 @@ -87,7 +73,7 @@ - + True False 15 @@ -131,9 +117,10 @@ - + True False + vertical 5 @@ -268,10 +255,11 @@ - + True False 5 + vertical 3 @@ -284,74 +272,64 @@ False 5 - + True False - 7 - 5 - 5 5 + 5 True False - generated-icon-gpu-png + pcsxr-plugin-gpu - GTK_FILL - GTK_FILL + 0 + 0 True False - generated-icon-cdr-png + pcsxr-plugin-cdr + 0 4 - 5 - GTK_FILL - GTK_FILL True False - generated-icon-pad-png + pcsxr-plugin-pad + 0 3 - 4 - GTK_FILL - GTK_FILL True False - generated-icon-pad-png + pcsxr-plugin-pad + 0 2 - 3 - GTK_FILL - GTK_FILL True False - generated-icon-spu-png + pcsxr-plugin-spu + 0 1 - 2 - GTK_FILL - GTK_FILL @@ -370,9 +348,7 @@ 3 - 4 - GTK_FILL - + 0 @@ -382,10 +358,7 @@ 2 - 3 4 - 5 - GTK_FILL @@ -395,10 +368,7 @@ 2 - 3 3 - 4 - GTK_FILL @@ -412,10 +382,7 @@ 2 - 3 2 - 3 - GTK_FILL @@ -425,10 +392,7 @@ 2 - 3 1 - 2 - GTK_FILL @@ -438,8 +402,7 @@ 2 - 3 - GTK_FILL + 0 @@ -458,11 +421,7 @@ 4 - 5 1 - 2 - - @@ -481,11 +440,7 @@ 4 - 5 2 - 3 - - @@ -504,11 +459,7 @@ 4 - 5 3 - 4 - - @@ -527,11 +478,7 @@ 4 - 5 4 - 5 - - @@ -550,11 +497,7 @@ 3 - 4 4 - 5 - - @@ -573,11 +516,7 @@ 3 - 4 3 - 4 - - @@ -596,11 +535,7 @@ 3 - 4 2 - 3 - - @@ -619,89 +554,67 @@ 3 - 4 1 - 2 - - True False - 0 Graphics: + 0 1 - 2 - GTK_FILL - + 0 True False - 0 Sound: + 0 1 - 2 1 - 2 - GTK_FILL - True False - 0 Controller 1: + 0 1 - 2 2 - 3 - GTK_FILL - True False - 0 Controller 2: + 0 1 - 2 3 - 4 - GTK_FILL - True False - 0 CD-ROM: + 0 1 - 2 4 - 5 - GTK_FILL - @@ -720,9 +633,7 @@ 4 - 5 - - + 0 @@ -732,26 +643,20 @@ gtk-find + 0 6 - 7 - GTK_FILL - GTK_FILL True False - 0 Search in: + 0 1 - 2 6 - 7 - GTK_FILL - @@ -776,38 +681,30 @@ 2 - 5 6 - 7 True False - generated-icon-sio1-png + pcsxr-plugin-sio1 + 0 5 - 6 - GTK_FILL - GTK_FILL True False - 0 Link cable: + 0 1 - 2 5 - 6 - GTK_FILL - @@ -817,10 +714,7 @@ 2 - 3 5 - 6 - GTK_FILL @@ -839,11 +733,7 @@ 3 - 4 5 - 6 - - @@ -862,13 +752,15 @@ 4 - 5 5 - 6 - - + + + + + + @@ -920,8 +812,8 @@ True False - 0 BIOS: + 0 1 @@ -943,8 +835,8 @@ True False - 0 Search in: + 0 1 @@ -1040,6 +932,7 @@ True False + vertical True @@ -1069,7 +962,7 @@ - + True False @@ -1079,10 +972,11 @@ 5 0 - + True False 6 + vertical 6 @@ -1108,7 +1002,7 @@ - + True False 5 @@ -1127,7 +1021,7 @@ 0 0 - + True False 2 @@ -1147,9 +1041,9 @@ True False - 0 New True + 0 False @@ -1182,7 +1076,7 @@ 0 0 - + True False 2 @@ -1202,9 +1096,9 @@ True False - 0 Format True + 0 False @@ -1237,7 +1131,7 @@ 0 0 - + True False 2 @@ -1257,9 +1151,9 @@ True False - 0 Un/Delete True + 0 False @@ -1291,7 +1185,7 @@ True True - + True False 3 @@ -1322,7 +1216,7 @@ - + True False @@ -1356,7 +1250,7 @@ - + True False @@ -1389,11 +1283,12 @@ 27 132 - + True False + vertical 6 - spread + center True @@ -1408,7 +1303,7 @@ 0 0 - + True False 2 @@ -1428,9 +1323,9 @@ True False - 0 Copy True + 0 False @@ -1463,7 +1358,7 @@ 0 0 - + True False 2 @@ -1483,9 +1378,9 @@ True False - 0 Copy True + 0 False @@ -1520,10 +1415,11 @@ 5 0 - + True False 6 + vertical 6 @@ -1549,7 +1445,7 @@ - + True False 5 @@ -1568,7 +1464,7 @@ 0 0 - + True False 2 @@ -1588,9 +1484,9 @@ True False - 0 New True + 0 False @@ -1623,7 +1519,7 @@ 0 0 - + True False 2 @@ -1643,9 +1539,9 @@ True False - 0 Format True + 0 False @@ -1678,7 +1574,7 @@ 0 0 - + True False 2 @@ -1698,9 +1594,9 @@ True False - 0 Un/Delete True + 0 False @@ -1732,7 +1628,7 @@ True True - + True False 3 @@ -1763,7 +1659,7 @@ - + True False @@ -1797,7 +1693,7 @@ - + True False @@ -1878,12 +1774,12 @@ - + True False 13 - + True False 10 @@ -1891,8 +1787,8 @@ True False - 0 Address (Hexadecimal): + 0 False @@ -1923,7 +1819,7 @@ - + True False 10 @@ -2001,6 +1897,9 @@ + @@ -2011,7 +1910,7 @@ - + True False 20 @@ -2022,7 +1921,7 @@ True True - + True False @@ -2041,8 +1940,8 @@ True False - 0 Raw Dump... + 0 True @@ -2065,7 +1964,7 @@ True True - + True False @@ -2084,8 +1983,8 @@ True False - 0 Patch Memory... + 0 True @@ -2156,9 +2055,10 @@ - + True False + vertical True @@ -2171,7 +2071,7 @@ False 5 - + True False 5 @@ -2273,176 +2173,177 @@ True False - gtk-open + pcsxr-load-state 1 True False - gtk-revert-to-saved + pcsxr-load-state 1 True False - gtk-preferences + pcsxr-settings 1 True False - gtk-properties + pcsxr-cpu 1 True False - gtk-floppy + pcsxr-memcard 1 True False - gtk-properties + pcsxr-plugin-netplay 1 True False - gtk-indent + pcsxr-cheats 1 True False - gtk-index + pcsxr-cheats-browse 1 True False - gtk-find + pcsxr-cheats-search 1 True False - gtk-about + pcsxr-about 1 True False - gtk-save-as + pcsxr-save-state 1 True False 0.49000000953674316 - gtk-cdrom + pcsxr-cd-open 1 True False - gtk-stop + pcsxr-shutdown 1 True False - gtk-select-color + pcsxr-plugin-gpu 1 True False - gtk-convert + pcsxr-plugin-spu 1 True False - gtk-cdrom + pcsxr-plugin-cdr 1 True False - gtk-execute + pcsxr-plugin-pad 1 True False - gtk-quit + pcsxr-exit 1 True False - gtk-open + pcsxr-iso-open 1 True False - gtk-revert-to-saved + pcsxr-memory-dump 1 True False - gtk-convert + pcsxr-run-bios 1 True False - gtk-execute + pcsxr-plugin-sio1 1 True False - gtk-execute + pcsxr-run-exe 1 True False - gtk-go-forward + pcsxr-play 1 True False - gtk-refresh + pcsxr-reset 1 True False - gtk-open + pcsxr-iso-reopen 1 True False - gtk-save-as + pcsxr-save-state 1 - + False PCSXR False pcsxr-icon.png - + True False + vertical True @@ -3045,11 +2946,9 @@ - + True False - 5 - 11 True @@ -3057,8 +2956,12 @@ True Run CD True - generated-icon-cd-png + pcsxr-cd-open + + False + True + @@ -3067,11 +2970,11 @@ True Run ISO Image True - generated-icon-iso-open-png + pcsxr-iso-open - 1 - 2 + False + True @@ -3080,8 +2983,8 @@ False - 2 - 3 + False + False @@ -3091,11 +2994,11 @@ True Continue Emulation True - generated-icon-play-png + pcsxr-play - 3 - 4 + False + True @@ -3105,11 +3008,11 @@ True Switch ISO Image True - generated-icon-iso-reopen-png + pcsxr-iso-reopen - 4 - 5 + False + True @@ -3118,8 +3021,8 @@ False - 5 - 6 + False + False @@ -3129,11 +3032,11 @@ True Configure Memory Cards True - generated-icon-memcard-png + pcsxr-memcard - 6 - 7 + False + True @@ -3143,11 +3046,11 @@ True Configure Graphics True - generated-icon-gpu-png + pcsxr-plugin-gpu - 7 - 8 + False + True @@ -3157,11 +3060,11 @@ True Configure Sound True - generated-icon-spu-png + pcsxr-plugin-spu - 8 - 9 + False + True @@ -3171,11 +3074,11 @@ True Configure CD-ROM True - generated-icon-cdr-png + pcsxr-plugin-cdr - 9 - 10 + False + True @@ -3185,11 +3088,11 @@ True Configure Controllers True - generated-icon-pad-png + pcsxr-plugin-pad - 10 - 11 + False + True @@ -3203,7 +3106,7 @@ True False - pcsxr.png + pixmaps/pcsxr.png True @@ -3360,18 +3263,17 @@ 5 5 - + True False + vertical 5 - + True False - 3 - 4 - 5 5 + 5 True @@ -3386,42 +3288,43 @@ 1 - 2 1 - 2 - True False - 0 Search For: + 0 + + 0 + 0 + True False - 0 Data Type: + 0 + 0 1 - 2 True False - 0 Value: + 0 + 0 2 - 3 @@ -3432,9 +3335,7 @@ 2 - 3 1 - 2 @@ -3451,8 +3352,7 @@ 1 - 2 - + 0 @@ -3464,10 +3364,7 @@ 1 - 2 2 - 3 - @@ -3484,10 +3381,7 @@ 3 - 4 1 - 2 - @@ -3498,14 +3392,9 @@ 2 - 3 2 - 3 - - - True @@ -3515,14 +3404,15 @@ 3 - 4 2 - 3 + + + False @@ -3531,7 +3421,7 @@ - + True False @@ -3562,9 +3452,10 @@ - + True False + vertical 10 start @@ -3573,7 +3464,7 @@ True True - + True False @@ -3593,8 +3484,8 @@ True False - 0 Freeze + 0 True @@ -3617,7 +3508,7 @@ True True - + True False @@ -3637,8 +3528,8 @@ True False - 0 Modify + 0 True @@ -3661,7 +3552,7 @@ True True - + True False @@ -3681,8 +3572,8 @@ True False - 0 Copy + 0 True @@ -3718,10 +3609,10 @@ True False - 0 - 0 label_resultsfound True + 0 + 0 False @@ -3730,7 +3621,7 @@ - + True False 20 @@ -3741,7 +3632,7 @@ True True - + True False @@ -3761,8 +3652,8 @@ True False - 0 Search + 0 True @@ -3785,7 +3676,7 @@ True True - + True False @@ -3805,8 +3696,8 @@ True False - 0 Restart + 0 True @@ -3912,10 +3803,11 @@ - + True False 5 + vertical 5 @@ -3923,14 +3815,11 @@ False 0 - + True False 5 - 12 - - - + vertical SPU IRQ Always Enabled @@ -3942,10 +3831,8 @@ True + 0 2 - 3 - GTK_FILL - @@ -3959,10 +3846,8 @@ True + 0 3 - 4 - GTK_FILL - @@ -3976,10 +3861,8 @@ True + 0 1 - 2 - GTK_FILL - @@ -3993,8 +3876,8 @@ True - GTK_FILL - + 0 + 0 @@ -4008,10 +3891,8 @@ True + 0 5 - 6 - GTK_FILL - @@ -4025,10 +3906,8 @@ True + 0 7 - 8 - GTK_FILL - @@ -4042,10 +3921,8 @@ True + 0 6 - 7 - GTK_FILL - @@ -4059,10 +3936,8 @@ True + 0 8 - 9 - GTK_FILL - @@ -4076,10 +3951,8 @@ True + 0 9 - 10 - GTK_FILL - @@ -4093,10 +3966,8 @@ True + 0 10 - 11 - GTK_FILL - @@ -4110,10 +3981,8 @@ True + 0 11 - 12 - GTK_FILL - @@ -4127,10 +3996,8 @@ True + 0 12 - 13 - GTK_FILL - @@ -4144,12 +4011,13 @@ True + 0 13 - 14 - GTK_FILL - + + + @@ -4173,7 +4041,7 @@ False 0 - + True False 5 @@ -4224,7 +4092,7 @@ False 0 - + True False 5 @@ -4344,7 +4212,7 @@ False 0 - + True False 5 @@ -4481,7 +4349,7 @@ False 0 - + True False 5 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 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-about.png differ 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 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-cheats-browse.png differ 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 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-cheats-search.png differ diff --git a/gui/data/pixmaps/pcsxr-cheats.png b/gui/data/pixmaps/pcsxr-cheats.png new file mode 100644 index 00000000..1e814b85 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-cheats.png differ diff --git a/gui/data/pixmaps/pcsxr-cpu.png b/gui/data/pixmaps/pcsxr-cpu.png new file mode 100644 index 00000000..55deaa6b Binary files /dev/null and b/gui/data/pixmaps/pcsxr-cpu.png differ diff --git a/gui/data/pixmaps/pcsxr-exit.png b/gui/data/pixmaps/pcsxr-exit.png new file mode 100644 index 00000000..c5f7865c Binary files /dev/null and b/gui/data/pixmaps/pcsxr-exit.png differ diff --git a/gui/data/pixmaps/pcsxr-iso-open.png b/gui/data/pixmaps/pcsxr-iso-open.png index 3daaea2a..80dff9c8 100644 Binary files a/gui/data/pixmaps/pcsxr-iso-open.png and b/gui/data/pixmaps/pcsxr-iso-open.png differ diff --git a/gui/data/pixmaps/pcsxr-iso-reopen.png b/gui/data/pixmaps/pcsxr-iso-reopen.png index 3294074a..20e218d1 100644 Binary files a/gui/data/pixmaps/pcsxr-iso-reopen.png and b/gui/data/pixmaps/pcsxr-iso-reopen.png differ 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 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-load-state.png differ 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 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-memory-dump.png differ 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 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-plugin-netplay.png differ diff --git a/gui/data/pixmaps/pcsxr-reset.png b/gui/data/pixmaps/pcsxr-reset.png new file mode 100644 index 00000000..7edb426b Binary files /dev/null and b/gui/data/pixmaps/pcsxr-reset.png differ 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 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-run-bios.png differ 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 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-run-exe.png differ 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 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-save-state.png differ diff --git a/gui/data/pixmaps/pcsxr-settings.png b/gui/data/pixmaps/pcsxr-settings.png new file mode 100644 index 00000000..90d18e80 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-settings.png differ diff --git a/gui/data/pixmaps/pcsxr-shutdown.png b/gui/data/pixmaps/pcsxr-shutdown.png new file mode 100644 index 00000000..781d877a Binary files /dev/null and b/gui/data/pixmaps/pcsxr-shutdown.png differ diff --git a/gui/data/pixmaps/pcsxr.png b/gui/data/pixmaps/pcsxr.png index 8dc59052..92760f9d 100644 Binary files a/gui/data/pixmaps/pcsxr.png and b/gui/data/pixmaps/pcsxr.png differ -- cgit v1.2.3 From f48b5b2ac35ee69db0c0ffd3f411ffc21b7d5789 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Mon, 17 Jul 2017 23:22:35 +0300 Subject: * Add configuration UI for PGXP. * Clean generated files with `make clean` --- gui/ConfDlg.c | 83 ++++++++++++ gui/Makefile.am | 2 + gui/data/pcsxr.ui | 294 +++++++++++++++++++++++++++++++++++++++++- plugins/bladesio1/Makefile.am | 3 + plugins/dfcdrom/Makefile.am | 3 + plugins/dfinput/Makefile.am | 2 + plugins/dfnet/Makefile.am | 2 + plugins/dfsound/Makefile.am | 3 + plugins/dfxvideo/Makefile.am | 3 + plugins/peopsxgl/Makefile.am | 3 + 10 files changed, 396 insertions(+), 2 deletions(-) (limited to 'gui/data') diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c index 30d3df1f..529e2722 100755 --- a/gui/ConfDlg.c +++ b/gui/ConfDlg.c @@ -845,6 +845,7 @@ static void FindNetPlugin() { } GtkWidget *CpuDlg; +GtkWidget *PgxpDlg; GList *psxglist; char *psxtypes[] = { "NTSC", @@ -1033,5 +1034,87 @@ void OnConf_Cpu() { G_CALLBACK(OnCpu_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); } +//When a different mode is selected, display some informational text +static void OnPgxp_ModeChanged(GtkWidget *widget, gpointer user_data) { + uint8_t mode; + + mode = gtk_combo_box_get_active(GTK_COMBO_BOX( + gtk_builder_get_object(builder, "PGXP_Mode"))); + + switch (mode) { + case 0: + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_title")), + _("Disabled")); + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_description")), + _("PGXP is not mirroring any functions currently.")); + break; + case 1: + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_title")), + _("Memory operations only")); + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_description")), + _("PGXP is mirroring load, store and processor transfer operations of the CPU and GTE.")); + break; + case 2: + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_title")), + _("Memory and CPU arithmetic operations")); + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_description")), + _("PGXP is mirroring load, store and transfer operations of the CPU and GTE and arithmetic/logic functions of the PSX CPU.\n(WARNING: This mode is currently unfinished and may cause incorrect behaviour in some games).")); + break; + default: + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_title")), + _("Error")); + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "PGXP_Mode_description")), + _("Unknown mode.")); + } +} + +static void OnPgxp_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) { + + Config.PGXP_GTE = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + gtk_builder_get_object(builder, "PGXP_GTE"))); + Config.PGXP_Cache = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + gtk_builder_get_object(builder, "PGXP_Cache"))); + Config.PGXP_Texture = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + gtk_builder_get_object(builder, "PGXP_Texture"))); + + Config.PGXP_Mode = gtk_combo_box_get_active(GTK_COMBO_BOX( + gtk_builder_get_object(builder, "PGXP_Mode"))); + + EmuSetPGXPMode(Config.PGXP_Mode); + SaveConfig(); + + gtk_widget_destroy(PgxpDlg); + PgxpDlg = NULL; +} + void OnConf_Pgxp() { + GtkWidget *widget; + char buf[25]; + + builder = gtk_builder_new(); + + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { + g_warning("Error: interface could not be loaded!"); + return; + } + + PgxpDlg = GTK_WIDGET(gtk_builder_get_object(builder, "PgxpDlg")); + gtk_window_set_default_size(GTK_WINDOW(PgxpDlg), 320, 320); + gtk_widget_show (PgxpDlg); + + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( + gtk_builder_get_object(builder, "PGXP_GTE")), Config.PGXP_GTE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( + gtk_builder_get_object(builder, "PGXP_Cache")), Config.PGXP_Cache); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( + gtk_builder_get_object(builder, "PGXP_Texture")), Config.PGXP_Texture); + + gtk_combo_box_set_active(GTK_COMBO_BOX( + gtk_builder_get_object(builder, "PGXP_Mode")), Config.PGXP_Mode); + OnPgxp_ModeChanged(NULL, NULL); + + g_signal_connect_data(G_OBJECT(gtk_builder_get_object(builder, "PGXP_Mode")), "changed", + G_CALLBACK(OnPgxp_ModeChanged), builder, NULL, G_CONNECT_AFTER); + g_signal_connect_data(G_OBJECT(PgxpDlg), "response", + G_CALLBACK(OnPgxp_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); } diff --git a/gui/Makefile.am b/gui/Makefile.am index ebae1d48..7db62f01 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -77,3 +77,5 @@ GtkResources.h: pcsxr.gresource.xml $(pcsxr_gresource) pcsxr_LDADD = \ ../libpcsxcore/libpcsxcore.a \ $(GTK3_LIBS) -lpthread -lz -lm -lXext -lXtst + +CLEANFILES = pcsxr.gresource.xml GtkResources.c GtkResources.h diff --git a/gui/data/pcsxr.ui b/gui/data/pcsxr.ui index 6cc4b24f..35937bfb 100644 --- a/gui/data/pcsxr.ui +++ b/gui/data/pcsxr.ui @@ -1,5 +1,5 @@ - + @@ -32,6 +32,9 @@ + + + False @@ -214,6 +217,9 @@ closbutton1 + + + False @@ -919,6 +925,9 @@ btn_ConfClose + + + False @@ -1731,6 +1740,9 @@ McdClose + + + False @@ -2013,6 +2025,9 @@ memview_close + + + False @@ -2169,6 +2184,9 @@ closebutton2 + + + True @@ -2239,7 +2257,6 @@ True False - 0.49000000953674316 pcsxr-cd-open 1 @@ -2303,6 +2320,12 @@ pcsxr-plugin-sio1 1 + + True + False + pcsxr-pgxp + 1 + True False @@ -2835,6 +2858,23 @@ False + + + _PGXP... + True + False + True + image43 + False + + + + + + True + False + + _CPU... @@ -3128,6 +3168,9 @@ + + + @@ -3745,6 +3788,9 @@ closebutton + + + @@ -4417,5 +4463,249 @@ closebutton1 + + + + + + + + + + + + Disabled + + + Memory only + + + Memory + Cpu logic + + + + + False + Configure PGXP + False + True + center-on-parent + dialog + + + False + vertical + + + False + end + + + gtk-close + True + True + True + True + + + False + False + 0 + + + + + False + False + 1 + + + + + True + False + vertical + 5 + + + True + False + 0 + + + True + False + 12 + + + True + False + vertical + + + Enable PGXP GTE vertex creation + True + True + False + True + + + False + True + 0 + + + + + Enable vertex caching. + True + True + False + True + + + False + True + 1 + + + + + Enable perspective correct texturing. + True + True + False + True + + + False + True + 2 + + + + + + + + + True + False + Options + + + + + + + + False + True + 0 + + + + + True + False + 0 + + + True + False + 12 + + + True + False + vertical + top + + + True + False + 40 + 40 + liststore6 + + + + 0 + + + + + False + True + 0 + + + + + True + False + start + 4 + 4 + + + + + + False + True + 1 + + + + + True + False + 10 + True + 20 + + + True + True + 2 + + + + + + + + + True + False + Select PGXP Mode + + + + + + + + True + True + 1 + + + + + True + True + 0 + + + + + + PgxpDlg_close + + + + diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am index 880aa647..badd57e5 100644 --- a/plugins/bladesio1/Makefile.am +++ b/plugins/bladesio1/Makefile.am @@ -38,3 +38,6 @@ GtkResources.h: bladesio1.gresource.xml $(bladesio1_gresource) #glade_DATA = sio1.ui #gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) + +CLEANFILES = bladesio1.gresource.xml GtkResources.c GtkResources.h + diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am index 4b3dec4b..1f87998b 100644 --- a/plugins/dfcdrom/Makefile.am +++ b/plugins/dfcdrom/Makefile.am @@ -53,3 +53,6 @@ GtkResources.h: dfcdrom.gresource.xml $(dfcdrom_gresource) #glade_DATA = cdrcfg-0.1df/dfcdrom.ui #gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) + +CLEANFILES = dfcdrom.gresource.xml GtkResources.c GtkResources.h + diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am index 11eee3eb..458259c5 100644 --- a/plugins/dfinput/Makefile.am +++ b/plugins/dfinput/Makefile.am @@ -39,3 +39,5 @@ GtkResources.h: dfinput.gresource.xml $(dfinput_gresource) #glade_DATA = dfinput.ui #gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) + +CLEANFILES = dfinput.gresource.xml GtkResources.c GtkResources.h diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am index 4000b8c4..f0a53ea0 100755 --- a/plugins/dfnet/Makefile.am +++ b/plugins/dfnet/Makefile.am @@ -38,3 +38,5 @@ GtkResources.h: dfnet.gresource.xml $(dfnet_gresource) #glade_DATA = dfnet.ui #gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) + +CLEANFILES = dfnet.gresource.xml GtkResources.c GtkResources.h diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am index b34f3267..9f8130a1 100755 --- a/plugins/dfsound/Makefile.am +++ b/plugins/dfsound/Makefile.am @@ -74,3 +74,6 @@ GtkResources.h: dfsound.gresource.xml $(dfsound_gresource) #glade_DATA = spucfg-0.1df/dfsound.ui #gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) + +CLEANFILES = dfsound.gresource.xml GtkResources.c GtkResources.h + diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am index 86e8ef3a..520749b2 100755 --- a/plugins/dfxvideo/Makefile.am +++ b/plugins/dfxvideo/Makefile.am @@ -52,3 +52,6 @@ GtkResources.h: dfxvideo.gresource.xml $(dfxvideo_gresource) #glade_DATA = gpucfg-0.1df/dfxvideo.ui #gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) + +CLEANFILES = dfxvideo.gresource.xml GtkResources.c GtkResources.h + diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am index a37643e6..576e140d 100755 --- a/plugins/peopsxgl/Makefile.am +++ b/plugins/peopsxgl/Makefile.am @@ -52,3 +52,6 @@ GtkResources.h: peopsxgl.gresource.xml $(peopsxgl_gresource) #glade_DATA = gpucfg/peopsxgl.ui #gladedir = $(datadir)/psemu/ EXTRA_DIST = $(glade_DATA) + +CLEANFILES = peopsxgl.gresource.xml GtkResources.c GtkResources.h + -- cgit v1.2.3 From 95a7aec22cf2b93a6e8c3483fabc3638f5796719 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Tue, 18 Jul 2017 11:35:30 +0300 Subject: * Add UI configuration knobs from overclocking, wipeout memhack and per game mcd. * Clean-up UI from deprecated attributes. --- gui/ConfDlg.c | 35 +- gui/MemcardDlg.c | 9 + gui/data/pcsxr.ui | 1592 ++++++++++++++++++++++++++++------------------------- 3 files changed, 889 insertions(+), 747 deletions(-) (limited to 'gui/data') diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c index 529e2722..d55234f8 100755 --- a/gui/ConfDlg.c +++ b/gui/ConfDlg.c @@ -877,6 +877,14 @@ static void OnCpu_CpuClicked(GtkWidget *widget, gpointer user_data) { gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))); } +// When overclock checkbutton is changed, enable/disable the selection spinbutton +static void OnCpu_OverClockClicked(GtkWidget *widget, gpointer user_data){ + GtkWidget *spin; + + spin = GTK_WIDGET(gtk_builder_get_object(builder, "GtkSpinButton_PsxClock")); + gtk_widget_set_sensitive(spin, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))); +} + void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) { GtkWidget *widget; long unsigned int tmp; @@ -936,6 +944,7 @@ void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) { SysClose(); exit(1); } + psxCpu->SetPGXPMode(Config.PGXP_Mode); psxCpu->Reset(); } @@ -947,7 +956,14 @@ void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) { Config.Widescreen = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Widescreen"))); Config.HackFix = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_HackFix"))); - SaveConfig(); + Config.OverClock = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_OverClock"))); + Config.PsxClock = gtk_spin_button_get_value( + GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "GtkSpinButton_PsxClock"))); + Config.MemHack = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_MemHack"))); + + SaveConfig(); gtk_widget_destroy(CpuDlg); CpuDlg = NULL; @@ -1029,12 +1045,24 @@ void OnConf_Cpu() { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Widescreen")), Config.Widescreen); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_HackFix")), Config.HackFix); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( + gtk_builder_get_object(builder, "GtkCheckButton_OverClock")), Config.OverClock); + gtk_spin_button_set_value(GTK_SPIN_BUTTON( + gtk_builder_get_object(builder, "GtkSpinButton_PsxClock")), Config.PsxClock); + OnCpu_OverClockClicked(GTK_WIDGET( + gtk_builder_get_object(builder, "GtkCheckButton_OverClock")), NULL); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( + gtk_builder_get_object(builder, "GtkCheckButton_MemHack")), Config.MemHack); + + g_signal_connect_data(G_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_OverClock")), "toggled", + G_CALLBACK(OnCpu_OverClockClicked), builder, NULL, G_CONNECT_AFTER); + // Setup a handler for when Close or Cancel is clicked g_signal_connect_data(G_OBJECT(CpuDlg), "response", - G_CALLBACK(OnCpu_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); + G_CALLBACK(OnCpu_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER); } -//When a different mode is selected, display some informational text +//When a different PGXP mode is selected, display some informational text static void OnPgxp_ModeChanged(GtkWidget *widget, gpointer user_data) { uint8_t mode; @@ -1099,7 +1127,6 @@ void OnConf_Pgxp() { } PgxpDlg = GTK_WIDGET(gtk_builder_get_object(builder, "PgxpDlg")); - gtk_window_set_default_size(GTK_WINDOW(PgxpDlg), 320, 320); gtk_widget_show (PgxpDlg); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c index fada33ff..d3949565 100755 --- a/gui/MemcardDlg.c +++ b/gui/MemcardDlg.c @@ -294,6 +294,9 @@ static void UpdateMcdDlg(GtkWidget *widget) { } static void OnMcd_Close(GtkDialog *dialog, gint arg1, gpointer user_data) { + + Config.PerGameMcd = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_PerGameMcd"))); quit = TRUE; SaveConfig(); gtk_widget_destroy(GTK_WIDGET(dialog)); @@ -748,6 +751,12 @@ void OnConf_Mcds() { G_CALLBACK(OnTreeSelectionChanged), GINT_TO_POINTER(2), NULL, G_CONNECT_AFTER); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( + gtk_builder_get_object(builder, "GtkCheckButton_PerGameMcd")), Config.PerGameMcd); + // Disable it because it is not working yet + gtk_widget_set_sensitive(GTK_WIDGET( + gtk_builder_get_object(builder, "GtkCheckButton_PerGameMcd")), FALSE); + LoadMcdDlg(dialog); // Setup a handler for when Close or Cancel is clicked diff --git a/gui/data/pcsxr.ui b/gui/data/pcsxr.ui index 35937bfb..6f6a9b12 100644 --- a/gui/data/pcsxr.ui +++ b/gui/data/pcsxr.ui @@ -568,7 +568,6 @@ True False Graphics: - 0 1 @@ -580,7 +579,6 @@ True False Sound: - 0 1 @@ -592,7 +590,6 @@ True False Controller 1: - 0 1 @@ -604,7 +601,6 @@ True False Controller 2: - 0 1 @@ -616,7 +612,6 @@ True False CD-ROM: - 0 1 @@ -658,7 +653,6 @@ True False Search in: - 0 1 @@ -706,7 +700,6 @@ True False Link cable: - 0 1 @@ -819,7 +812,6 @@ True False BIOS: - 0 1 @@ -842,7 +834,6 @@ True False Search in: - 0 1 @@ -971,356 +962,240 @@ - + True False + vertical - + True False - 5 - 0 - + True False - 6 - vertical - 6 - - - True - False - in - - - 265 - 400 - True - True - - - - - - - - True - True - 0 - - + 5 + 0 - + True False - 5 - 5 + 6 + vertical + 6 - + True True - True - False - + in - + + 265 + 400 True - False - 0 - 0 - - - True - False - 2 - - - True - False - gtk-new - - - False - False - 0 - - - - - True - False - New - True - 0 - - - False - False - 1 - - - + True + + - False - False + True + True 0 - + True - True - True - False - + False + 5 + 5 - + True - False - 0 - 0 + True + True + False + - + True False - 2 - - - True - False - gtk-clear - - - False - False - 0 - - + 0 + 0 - + True False - Format - True - 0 + 2 + + + True + False + gtk-new + + + False + False + 0 + + + + + True + False + New + True + + + False + False + 1 + + - - False - False - 1 - + + False + False + 0 + - - - False - False - 1 - - - - - True - True - True - True - - + True - False - 0 - 0 + True + True + False + - + True False - 2 + 0 + 0 - + True False - gtk-delete + 2 + + + True + False + gtk-clear + + + False + False + 0 + + + + + True + False + Format + True + + + False + False + 1 + + - - False - False - 0 - - - - - True - False - Un/Delete - True - 0 - - - False - False - 1 - - - - - False - False - 2 - - - - - False - True - 1 - - - - - True - True - True - - - True - False - 3 - - - True - False - gtk-floppy - False False - 0 - - - - - True - False - Loading... - middle - True - - - True - True 1 - - True - False - - - False - True - 2 - - - - + True - False - gtk-open + True + True + True + + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-delete + + + False + False + 0 + + + + + True + False + Un/Delete + True + + + False + False + 1 + + + + + + False False - 3 + 2 + + False + True + 1 + - - - False - True - 2 - - - - - - - True - False - - - True - False - <b>Memory Card 1</b> - True - - - False - False - 4 - 0 - - - - - - - True - True - 0 - - - - - True - False - 27 - 132 - - - True - False - vertical - 6 - center - - - True - True - True - False - - + True - False - 0 - 0 + True + True - + True False - 2 + 3 - + True False - gtk-go-forward + gtk-floppy False @@ -1329,159 +1204,116 @@ - + True False - Copy - True - 0 + Loading... + middle + True - False - False + True + True 1 - - - - - - - False - False - 0 - - - - - True - True - True - False - - - - True - False - 0 - 0 - - - True - False - 2 - + True False - gtk-go-back False - False - 0 + True + 2 - + True False - Copy - True - 0 + gtk-open False - False - 1 - - - - - - - - - False - False - 1 - - - - - - - False - False - 1 - - - - - True - False - 5 - 0 - - - True - False - 6 - vertical - 6 - - - 265 - 400 + False + 3 + + + + + + + False + True + 2 + + + + + + True False - in - + True - True - - - + False + <b>Memory Card 1</b> + True + + False + False + 4 + 0 + - - True - True - 0 - + + + True + True + 0 + + + + + True + False + 27 + 132 - + True False - 5 - 5 + vertical + 6 + center - + True True True False - + - + True False 0 0 - + True False 2 - + True False - gtk-new + gtk-go-forward False @@ -1490,12 +1322,11 @@ - + True False - New + Copy True - 0 False @@ -1515,28 +1346,28 @@ - + True True True False - + - + True False 0 0 - + True False 2 - + True False - gtk-clear + gtk-go-back False @@ -1545,12 +1376,11 @@ - + True False - Format + Copy True - 0 False @@ -1569,83 +1399,104 @@ 1 + + + + + False + False + 1 + + + + + True + False + 5 + 0 + + + True + False + 6 + vertical + 6 - + + 265 + 400 True True - True - True - + in - + True - False - 0 - 0 - - - True - False - 2 - - - True - False - gtk-delete - - - False - False - 0 - - - - - True - False - Un/Delete - True - 0 - - - False - False - 1 - - - + True + + - False - False - 2 + True + True + 0 - - - False - True - 1 - - - - - True - True - True - + True False - 3 + 5 + 5 - + True - False - gtk-floppy + True + True + False + + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-new + + + False + False + 0 + + + + + True + False + New + True + + + False + False + 1 + + + + + + False @@ -1654,85 +1505,244 @@ - + True - False - Loading... - middle - True + True + True + False + + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-clear + + + False + False + 0 + + + + + True + False + Format + True + + + False + False + 1 + + + + + + - True - True + False + False 1 - + True - False + True + True + True + + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-delete + + + False + False + 0 + + + + + True + False + Un/Delete + True + + + False + False + 1 + + + + + + False - True + False 2 + + + False + True + 1 + + + + + True + True + True - + True False - gtk-open + 3 + + + True + False + gtk-floppy + + + False + False + 0 + + + + + True + False + Loading... + middle + True + + + True + True + 1 + + + + + True + False + + + False + True + 2 + + + + + True + False + gtk-open + + + False + False + 3 + + - - False - False - 3 - + + False + True + 2 + - - False - True - 2 - - - - - - True - False - - + + True False - <b>Memory Card 2</b> - True + + + True + False + <b>Memory Card 2</b> + True + + + False + False + 4 + 0 + + - - False - False - 4 - 0 - + + True + True + 2 + True True - 2 + 0 + + + + + Enable per game memory cards + True + True + False + 2 + True + + + False + True + 1 - True + False True - 2 + 1 @@ -1800,7 +1810,6 @@ True False Address (Hexadecimal): - 0 False @@ -1953,7 +1962,6 @@ True False Raw Dump... - 0 True @@ -1996,7 +2004,6 @@ True False Patch Memory... - 0 True @@ -2129,28 +2136,289 @@ False - False - 2 + False + 2 + + + + + True + True + False + + + + True + False + gtk-info + + + + + False + False + 3 + + + + + + + + + True + False + <b>NetPlay</b> + True + + + + + False + False + 0 + + + + + False + True + 2 + + + + + + closebutton2 + + + + + + + + + + + + + Disabled + + + Memory only + + + Memory + Cpu logic + + + + + False + Configure PGXP + False + True + center-on-parent + dialog + + + False + vertical + + + False + end + + + gtk-close + True + True + True + True + + + False + False + 0 + + + + + False + False + 1 + + + + + True + False + 5 + vertical + 5 + + + True + False + 0 + + + True + False + + + True + False + 5 + vertical + + + Enable PGXP GTE vertex creation + True + True + False + True + + + False + True + 0 + + + + + Enable vertex caching. + True + True + False + True + + + False + True + 1 + + + + + Enable perspective correct texturing. + True + True + False + True + + + False + True + 2 + + + + + + + + + True + False + Options + + + + + + + + False + True + 0 + + + + + True + False + 0 + + + True + False + + + True + False + 5 + vertical + top + + + True + False + 10 + True + + + + + + True + False + PGXP_Mode_list + + + + 0 + + + + + False + False + 1 + + + + + + + + False + True + 0 + + + + + True + False + start + 4 + 4 + Mode + + + + + + False + True + 1 - + + 100 True - True - False - - - - True - False - gtk-info - - + False + 10 + Description + True + 40 + 0 False False - 3 + 2 @@ -2158,36 +2426,44 @@ - + True False - <b>NetPlay</b> - True + Select PGXP Mode + + + - False - False - 0 + True + True + 1 - False + True True - 2 + 0 - closebutton2 + PgxpDlg_close + + 0.5 + 5 + 0.25 + 10 + True False @@ -3339,7 +3615,6 @@ True False Search For: - 0 0 @@ -3351,7 +3626,6 @@ True False Data Type: - 0 0 @@ -3363,7 +3637,6 @@ True False Value: - 0 0 @@ -3528,7 +3801,6 @@ True False Freeze - 0 True @@ -3572,7 +3844,6 @@ True False Modify - 0 True @@ -3616,7 +3887,6 @@ True False Copy - 0 True @@ -3652,10 +3922,9 @@ True False + start label_resultsfound True - 0 - 0 False @@ -3696,7 +3965,6 @@ True False Search - 0 True @@ -3740,7 +4008,6 @@ True False Restart - 0 True @@ -3873,7 +4140,6 @@ True False True - 0 True @@ -3888,7 +4154,6 @@ True False True - 0 True @@ -3903,7 +4168,6 @@ True False True - 0 True @@ -3918,7 +4182,6 @@ True False True - 0 True @@ -3933,7 +4196,6 @@ True False True - 0 True @@ -3948,7 +4210,6 @@ True False True - 0 True @@ -3963,7 +4224,6 @@ True False True - 0 True @@ -3978,7 +4238,6 @@ True False True - 0 True @@ -3993,7 +4252,6 @@ True False True - 0 True @@ -4008,7 +4266,6 @@ True False True - 0 True @@ -4023,7 +4280,6 @@ True False True - 0 True @@ -4038,7 +4294,6 @@ True False True - 0 True @@ -4053,7 +4308,6 @@ True False True - 0 True @@ -4407,7 +4661,6 @@ True False True - 0.5 True @@ -4451,83 +4704,8 @@ 4 - - - False - True - 2 - - - - - - closebutton1 - - - - - - - - - - - - - Disabled - - - Memory only - - - Memory + Cpu logic - - - - - False - Configure PGXP - False - True - center-on-parent - dialog - - - False - vertical - - - False - end - - - gtk-close - True - True - True - True - - - False - False - 0 - - - - - False - False - 1 - - - - - True - False - vertical - 5 - + True False 0 @@ -4535,19 +4713,51 @@ True False - 12 True False + 5 vertical - - Enable PGXP GTE vertex creation + True - True - False - True + False + 5 + + + Overclock + True + True + False + True + + + False + True + 0 + + + + + True + True + 6 + adjustment_PsxClock + 2 + True + if-valid + 1 + + + False + True + 1 + + + + + False @@ -4556,8 +4766,8 @@ - - Enable vertex caching. + + WipeOut MemHack True True False @@ -4569,20 +4779,6 @@ 1 - - - Enable perspective correct texturing. - True - True - False - True - - - False - True - 2 - - @@ -4591,118 +4787,28 @@ True False - Options - - - + <b>CPU Overclocking</b> + True False True - 0 - - - - - True - False - 0 - - - True - False - 12 - - - True - False - vertical - top - - - True - False - 40 - 40 - liststore6 - - - - 0 - - - - - False - True - 0 - - - - - True - False - start - 4 - 4 - - - - - - False - True - 1 - - - - - True - False - 10 - True - 20 - - - True - True - 2 - - - - - - - - - True - False - Select PGXP Mode - - - - - - - - True - True - 1 + 5 - True + False True - 0 + 2 - PgxpDlg_close + closebutton1 -- cgit v1.2.3 From 966a413dda34bf31826ee1eab4d5a722a36087d6 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Tue, 18 Jul 2017 11:46:15 +0300 Subject: * Optimized pixmaps to reduce size --- gui/data/pixmaps/pcsxr-about.png | Bin 294 -> 252 bytes gui/data/pixmaps/pcsxr-cd-open.png | Bin 1593 -> 1454 bytes gui/data/pixmaps/pcsxr-cheats-browse.png | Bin 316 -> 253 bytes gui/data/pixmaps/pcsxr-cheats-search.png | Bin 397 -> 301 bytes gui/data/pixmaps/pcsxr-cheats.png | Bin 194 -> 176 bytes gui/data/pixmaps/pcsxr-cpu.png | Bin 427 -> 324 bytes gui/data/pixmaps/pcsxr-exit.png | Bin 372 -> 277 bytes gui/data/pixmaps/pcsxr-icon.png | Bin 13508 -> 12325 bytes gui/data/pixmaps/pcsxr-iso-open.png | Bin 1946 -> 1716 bytes gui/data/pixmaps/pcsxr-iso-reopen.png | Bin 435 -> 322 bytes gui/data/pixmaps/pcsxr-load-state.png | Bin 274 -> 242 bytes gui/data/pixmaps/pcsxr-memory-dump.png | Bin 266 -> 219 bytes gui/data/pixmaps/pcsxr-plugin-gpu.png | Bin 1455 -> 1429 bytes gui/data/pixmaps/pcsxr-plugin-netplay.png | Bin 283 -> 235 bytes gui/data/pixmaps/pcsxr-plugin-pad.png | Bin 1767 -> 1547 bytes gui/data/pixmaps/pcsxr-plugin-sio1.png | Bin 1786 -> 1516 bytes gui/data/pixmaps/pcsxr-plugin-spu.png | Bin 2102 -> 2042 bytes gui/data/pixmaps/pcsxr-reset.png | Bin 308 -> 257 bytes gui/data/pixmaps/pcsxr-run-bios.png | Bin 427 -> 324 bytes gui/data/pixmaps/pcsxr-run-exe.png | Bin 349 -> 258 bytes gui/data/pixmaps/pcsxr-save-state.png | Bin 294 -> 237 bytes gui/data/pixmaps/pcsxr-settings.png | Bin 471 -> 304 bytes gui/data/pixmaps/pcsxr-shutdown.png | Bin 306 -> 257 bytes gui/data/pixmaps/pcsxr.png | Bin 40920 -> 29957 bytes 24 files changed, 0 insertions(+), 0 deletions(-) (limited to 'gui/data') diff --git a/gui/data/pixmaps/pcsxr-about.png b/gui/data/pixmaps/pcsxr-about.png index a23c775c..1afd9229 100644 Binary files a/gui/data/pixmaps/pcsxr-about.png and b/gui/data/pixmaps/pcsxr-about.png differ diff --git a/gui/data/pixmaps/pcsxr-cd-open.png b/gui/data/pixmaps/pcsxr-cd-open.png index 1f07c0e7..f72f29a5 100644 Binary files a/gui/data/pixmaps/pcsxr-cd-open.png and b/gui/data/pixmaps/pcsxr-cd-open.png differ diff --git a/gui/data/pixmaps/pcsxr-cheats-browse.png b/gui/data/pixmaps/pcsxr-cheats-browse.png index e309ecb8..311fe66a 100644 Binary files a/gui/data/pixmaps/pcsxr-cheats-browse.png and b/gui/data/pixmaps/pcsxr-cheats-browse.png differ diff --git a/gui/data/pixmaps/pcsxr-cheats-search.png b/gui/data/pixmaps/pcsxr-cheats-search.png index e2558a78..21337b72 100644 Binary files a/gui/data/pixmaps/pcsxr-cheats-search.png and b/gui/data/pixmaps/pcsxr-cheats-search.png differ diff --git a/gui/data/pixmaps/pcsxr-cheats.png b/gui/data/pixmaps/pcsxr-cheats.png index 1e814b85..d8cfdb03 100644 Binary files a/gui/data/pixmaps/pcsxr-cheats.png and b/gui/data/pixmaps/pcsxr-cheats.png differ diff --git a/gui/data/pixmaps/pcsxr-cpu.png b/gui/data/pixmaps/pcsxr-cpu.png index 55deaa6b..aa2e34ba 100644 Binary files a/gui/data/pixmaps/pcsxr-cpu.png and b/gui/data/pixmaps/pcsxr-cpu.png differ diff --git a/gui/data/pixmaps/pcsxr-exit.png b/gui/data/pixmaps/pcsxr-exit.png index c5f7865c..c0fe484b 100644 Binary files a/gui/data/pixmaps/pcsxr-exit.png and b/gui/data/pixmaps/pcsxr-exit.png differ diff --git a/gui/data/pixmaps/pcsxr-icon.png b/gui/data/pixmaps/pcsxr-icon.png index 2cc9839f..736bdec3 100644 Binary files a/gui/data/pixmaps/pcsxr-icon.png and b/gui/data/pixmaps/pcsxr-icon.png differ diff --git a/gui/data/pixmaps/pcsxr-iso-open.png b/gui/data/pixmaps/pcsxr-iso-open.png index 80dff9c8..4f421296 100644 Binary files a/gui/data/pixmaps/pcsxr-iso-open.png and b/gui/data/pixmaps/pcsxr-iso-open.png differ diff --git a/gui/data/pixmaps/pcsxr-iso-reopen.png b/gui/data/pixmaps/pcsxr-iso-reopen.png index 20e218d1..68ea5387 100644 Binary files a/gui/data/pixmaps/pcsxr-iso-reopen.png and b/gui/data/pixmaps/pcsxr-iso-reopen.png differ diff --git a/gui/data/pixmaps/pcsxr-load-state.png b/gui/data/pixmaps/pcsxr-load-state.png index 91ddd251..a381e548 100644 Binary files a/gui/data/pixmaps/pcsxr-load-state.png and b/gui/data/pixmaps/pcsxr-load-state.png differ diff --git a/gui/data/pixmaps/pcsxr-memory-dump.png b/gui/data/pixmaps/pcsxr-memory-dump.png index 3b9fde0c..5c62af70 100644 Binary files a/gui/data/pixmaps/pcsxr-memory-dump.png and b/gui/data/pixmaps/pcsxr-memory-dump.png differ diff --git a/gui/data/pixmaps/pcsxr-plugin-gpu.png b/gui/data/pixmaps/pcsxr-plugin-gpu.png index e49595f3..e024618c 100644 Binary files a/gui/data/pixmaps/pcsxr-plugin-gpu.png and b/gui/data/pixmaps/pcsxr-plugin-gpu.png differ diff --git a/gui/data/pixmaps/pcsxr-plugin-netplay.png b/gui/data/pixmaps/pcsxr-plugin-netplay.png index 6227d829..1e5ff2f5 100644 Binary files a/gui/data/pixmaps/pcsxr-plugin-netplay.png and b/gui/data/pixmaps/pcsxr-plugin-netplay.png differ diff --git a/gui/data/pixmaps/pcsxr-plugin-pad.png b/gui/data/pixmaps/pcsxr-plugin-pad.png index 186e7be8..dd7656b2 100644 Binary files a/gui/data/pixmaps/pcsxr-plugin-pad.png and b/gui/data/pixmaps/pcsxr-plugin-pad.png differ diff --git a/gui/data/pixmaps/pcsxr-plugin-sio1.png b/gui/data/pixmaps/pcsxr-plugin-sio1.png index e9340ade..89d3eeba 100644 Binary files a/gui/data/pixmaps/pcsxr-plugin-sio1.png and b/gui/data/pixmaps/pcsxr-plugin-sio1.png differ diff --git a/gui/data/pixmaps/pcsxr-plugin-spu.png b/gui/data/pixmaps/pcsxr-plugin-spu.png index 53c9ac51..5d206afb 100644 Binary files a/gui/data/pixmaps/pcsxr-plugin-spu.png and b/gui/data/pixmaps/pcsxr-plugin-spu.png differ diff --git a/gui/data/pixmaps/pcsxr-reset.png b/gui/data/pixmaps/pcsxr-reset.png index 7edb426b..74de098d 100644 Binary files a/gui/data/pixmaps/pcsxr-reset.png and b/gui/data/pixmaps/pcsxr-reset.png differ diff --git a/gui/data/pixmaps/pcsxr-run-bios.png b/gui/data/pixmaps/pcsxr-run-bios.png index 55deaa6b..aa2e34ba 100644 Binary files a/gui/data/pixmaps/pcsxr-run-bios.png and b/gui/data/pixmaps/pcsxr-run-bios.png differ diff --git a/gui/data/pixmaps/pcsxr-run-exe.png b/gui/data/pixmaps/pcsxr-run-exe.png index 53907fe4..3ff9e91c 100644 Binary files a/gui/data/pixmaps/pcsxr-run-exe.png and b/gui/data/pixmaps/pcsxr-run-exe.png differ diff --git a/gui/data/pixmaps/pcsxr-save-state.png b/gui/data/pixmaps/pcsxr-save-state.png index 8f1d1988..872109e4 100644 Binary files a/gui/data/pixmaps/pcsxr-save-state.png and b/gui/data/pixmaps/pcsxr-save-state.png differ diff --git a/gui/data/pixmaps/pcsxr-settings.png b/gui/data/pixmaps/pcsxr-settings.png index 90d18e80..d423e32e 100644 Binary files a/gui/data/pixmaps/pcsxr-settings.png and b/gui/data/pixmaps/pcsxr-settings.png differ diff --git a/gui/data/pixmaps/pcsxr-shutdown.png b/gui/data/pixmaps/pcsxr-shutdown.png index 781d877a..2ab2b165 100644 Binary files a/gui/data/pixmaps/pcsxr-shutdown.png and b/gui/data/pixmaps/pcsxr-shutdown.png differ diff --git a/gui/data/pixmaps/pcsxr.png b/gui/data/pixmaps/pcsxr.png index 92760f9d..4e747a80 100644 Binary files a/gui/data/pixmaps/pcsxr.png and b/gui/data/pixmaps/pcsxr.png differ -- cgit v1.2.3