From 9e1842a1554a7df2f5d989a966883b8b6d8bf2ba Mon Sep 17 00:00:00 2001 From: "SND\\edgbla_cp" Date: Mon, 13 Jun 2011 08:00:02 +0000 Subject: git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@67807 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- data/pcsxr.glade2 | 10 ++++------ gui/AboutDlg.c | 1 + macosx/Pcsxr.xcodeproj/project.pbxproj | 2 +- macosx/icons/PCSXR.icns | Bin 50301 -> 44147 bytes .../DFCdrom/DFCdrom.xcodeproj/project.pbxproj | 2 +- .../DFInput/DFInput.xcodeproj/project.pbxproj | 2 +- .../PeopsSoftGPU.xcodeproj/project.pbxproj | 2 +- .../PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj | 2 +- pixmaps/Makefile.am | 4 ++-- pixmaps/pcsxr-icon.png | Bin 15923 -> 13508 bytes pixmaps/pcsxr.jpg | Bin 46736 -> 0 bytes pixmaps/pcsxr.png | Bin 0 -> 40887 bytes win32/gui/WndMain.c | 4 ++-- win32/gui/cdrom02.ico | Bin 9662 -> 0 bytes win32/gui/pcsxr.bmp | Bin 185190 -> 283254 bytes win32/gui/pcsxr.ico | Bin 0 -> 7358 bytes win32/pcsxr.dev | 2 +- win32/pcsxr.dsp | 2 +- win32/pcsxr.rc | 2 +- win32/pcsxr.vcproj | 2 +- 20 files changed, 18 insertions(+), 19 deletions(-) delete mode 100755 pixmaps/pcsxr.jpg create mode 100644 pixmaps/pcsxr.png delete mode 100755 win32/gui/cdrom02.ico create mode 100644 win32/gui/pcsxr.ico diff --git a/data/pcsxr.glade2 b/data/pcsxr.glade2 index 0769a149..55f87148 100644 --- a/data/pcsxr.glade2 +++ b/data/pcsxr.glade2 @@ -815,10 +815,8 @@ - 354 - 174 True - pcsxr.jpg + pcsxr.png 2 @@ -1593,9 +1591,6 @@ - - - Slow Boot @@ -1614,6 +1609,9 @@ + + + 0 diff --git a/gui/AboutDlg.c b/gui/AboutDlg.c index b5d18d90..232249db 100644 --- a/gui/AboutDlg.c +++ b/gui/AboutDlg.c @@ -60,6 +60,7 @@ void RunAboutDialog(void) { "", "Icon Design:", "Romain Lafourcade", + "perchibald", NULL }; diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj index 80aef096..4024e955 100644 --- a/macosx/Pcsxr.xcodeproj/project.pbxproj +++ b/macosx/Pcsxr.xcodeproj/project.pbxproj @@ -945,7 +945,7 @@ "-lz", "-lSystemStubs", ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = ""; }; name = Deployment; }; diff --git a/macosx/icons/PCSXR.icns b/macosx/icons/PCSXR.icns index 3f57a340..8050aa14 100755 Binary files a/macosx/icons/PCSXR.icns and b/macosx/icons/PCSXR.icns differ diff --git a/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj b/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj index c2c53db0..1cd551b9 100644 --- a/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj @@ -348,7 +348,7 @@ ../../../plugins/dfcdrom, ); MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = ""; SYMROOT = ../../build; }; name = Deployment; diff --git a/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj b/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj index 61c11670..683ca520 100644 --- a/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj @@ -627,7 +627,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = ""; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = ""; SYMROOT = ../../build; }; name = Deployment; diff --git a/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj b/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj index 5953352d..8eae399c 100644 --- a/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj @@ -382,7 +382,7 @@ ../../../libpcsxcore, ); MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = ""; SYMROOT = ../../build; }; name = Deployment; diff --git a/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj b/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj index cc1408b2..4a25a6ec 100644 --- a/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj +++ b/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj @@ -389,7 +389,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = "-fomit-frame-pointer"; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = ""; SYMROOT = ../../build; }; name = Deployment; diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index aec6f0d4..39358e06 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -1,7 +1,7 @@ pixmapdir = "$(datadir)/pcsxr" -pixmap_DATA = pcsxr.jpg +pixmap_DATA = pcsxr.png icondir = "$(datadir)/pixmaps" icon_DATA = pcsxr-icon.png -EXTRA_DIST = pcsxr.jpg pcsxr-icon.png +EXTRA_DIST = pcsxr.png pcsxr-icon.png diff --git a/pixmaps/pcsxr-icon.png b/pixmaps/pcsxr-icon.png index 7a0c0ed7..2cc9839f 100755 Binary files a/pixmaps/pcsxr-icon.png and b/pixmaps/pcsxr-icon.png differ diff --git a/pixmaps/pcsxr.jpg b/pixmaps/pcsxr.jpg deleted file mode 100755 index 7aa535ba..00000000 Binary files a/pixmaps/pcsxr.jpg and /dev/null differ diff --git a/pixmaps/pcsxr.png b/pixmaps/pcsxr.png new file mode 100644 index 00000000..7ecf7810 Binary files /dev/null and b/pixmaps/pcsxr.png differ diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c index f50c8b9a..77e83a90 100644 --- a/win32/gui/WndMain.c +++ b/win32/gui/WndMain.c @@ -1747,8 +1747,8 @@ void CreateMainWindow(int nCmdShow) { WS_CAPTION | WS_POPUPWINDOW | WS_MINIMIZEBOX, CW_USEDEFAULT, 0, - 350, - 220, + 356, + 252, NULL, NULL, gApp.hInstance, diff --git a/win32/gui/cdrom02.ico b/win32/gui/cdrom02.ico deleted file mode 100755 index 98daa5b8..00000000 Binary files a/win32/gui/cdrom02.ico and /dev/null differ diff --git a/win32/gui/pcsxr.bmp b/win32/gui/pcsxr.bmp index fca63000..77f2e9f2 100755 Binary files a/win32/gui/pcsxr.bmp and b/win32/gui/pcsxr.bmp differ diff --git a/win32/gui/pcsxr.ico b/win32/gui/pcsxr.ico new file mode 100644 index 00000000..8dd7b262 Binary files /dev/null and b/win32/gui/pcsxr.ico differ diff --git a/win32/pcsxr.dev b/win32/pcsxr.dev index b88425d8..67d60b89 100644 --- a/win32/pcsxr.dev +++ b/win32/pcsxr.dev @@ -470,7 +470,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit45] -FileName=gui\cdrom02.ico +FileName=gui\pcsxr.ico Folder=gui Compile=0 CompileCpp=0 diff --git a/win32/pcsxr.dsp b/win32/pcsxr.dsp index e8275ca3..755cf539 100644 --- a/win32/pcsxr.dsp +++ b/win32/pcsxr.dsp @@ -332,7 +332,7 @@ SOURCE=.\gui\AboutDlg.h # End Source File # Begin Source File -SOURCE=.\gui\cdrom02.ico +SOURCE=.\gui\pcsxr.ico # End Source File # Begin Source File diff --git a/win32/pcsxr.rc b/win32/pcsxr.rc index 7f25904d..7ccece86 100644 --- a/win32/pcsxr.rc +++ b/win32/pcsxr.rc @@ -371,7 +371,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_APP_ICON ICON DISCARDABLE "gui\\cdrom02.ico" +IDI_APP_ICON ICON DISCARDABLE "gui\\pcsxr.ico" ///////////////////////////////////////////////////////////////////////////// // diff --git a/win32/pcsxr.vcproj b/win32/pcsxr.vcproj index a37033a1..ef1c8343 100644 --- a/win32/pcsxr.vcproj +++ b/win32/pcsxr.vcproj @@ -920,7 +920,7 @@ >