ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove anything saying Playground from the Linux version. Minor change to the Linux cpu code. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@435 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-02-06 22:46:05 +00:00
parent 3fa8c34a8d
commit b16a122e9f
10 changed files with 12673 additions and 12668 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/.pixmaps/pcsxAbout.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 245 KiB

After

Width:  |  Height:  |  Size: 245 KiB

2
pcsx2/Common.h
View File

@ -74,6 +74,6 @@ extern TESTRUNARGS g_TestRun;
//#include "Misc.h"
#include "Patch.h"
#define PCSX2_VERSION "Playground (beta)"
#define PCSX2_VERSION "(beta)"
#endif /* __COMMON_H__ */

1
pcsx2/Linux/DebugDlg.cpp
View File

@ -18,7 +18,6 @@
#include "DebugDlg.h"
using namespace R5900;
//using namespace Dynarec;
void UpdateDebugger() {

20
pcsx2/Linux/GtkGui.cpp
View File

@ -36,9 +36,9 @@ void StartGui() {
MainWindow = create_MainWindow();
if (SVN_REV != 0)
gtk_window_set_title(GTK_WINDOW(MainWindow), "PCSX2 "PCSX2_VERSION" "SVN_REV" Playground");
gtk_window_set_title(GTK_WINDOW(MainWindow), "PCSX2 "PCSX2_VERSION" "SVN_REV);
else
gtk_window_set_title(GTK_WINDOW(MainWindow), "PCSX2 "PCSX2_VERSION" Playground");
gtk_window_set_title(GTK_WINDOW(MainWindow), "PCSX2 "PCSX2_VERSION);
// status bar
pStatusBar = gtk_statusbar_new ();
@ -605,11 +605,17 @@ void OnCpu_Ok(GtkButton *button, gpointer user_data) {
{
SysRestorableReset();
if( (Config.Options&PCSX2_GSMULTITHREAD) ^ (newopts&PCSX2_GSMULTITHREAD) )
if ((Config.Options&PCSX2_GSMULTITHREAD) ^ (newopts&PCSX2_GSMULTITHREAD))
{
// gotta shut down *all* the plugins.
ResetPlugins();
// Need the MTGS setting to take effect, so close out the plugins:
PluginsResetGS();
if (CHECK_MULTIGS)
Console::Notice( "MTGS mode disabled.\n\tEnjoy the fruits of single-threaded simpicity." );
else
Console::Notice( "MTGS mode enabled.\n\tWelcome to multi-threaded awesomeness. And random crashes." );
}
Config.Options = newopts;
}
else
@ -731,10 +737,10 @@ void OnHelp_About(GtkMenuItem *menuitem, gpointer user_data) {
// Include the SVN revision
if (SVN_REV !=0)
sprintf(str, _("PCSX2 Playground For Linux\nVersion %s %s\n"), PCSX2_VERSION, SVN_REV);
sprintf(str, _("PCSX2 For Linux\nVersion %s %s\n"), PCSX2_VERSION, SVN_REV);
else
//Use this instead for a non-svn version
sprintf(str, _("PCSX2 Playground For Linux\nVersion %s\n"), PCSX2_VERSION);
sprintf(str, _("PCSX2 For Linux\nVersion %s\n"), PCSX2_VERSION);
gtk_label_set_text(GTK_LABEL(Label), str);

2
pcsx2/Linux/interface.c
View File

@ -2698,7 +2698,7 @@ create_MainWindow (void)
GtkMenuItem_Help_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (GtkMenuItem_Help), GtkMenuItem_Help_menu);
GtkMenuItem_About = gtk_menu_item_new_with_mnemonic (_("About PCSX2 - Playground..."));
GtkMenuItem_About = gtk_menu_item_new_with_mnemonic (_("About PCSX2..."));
gtk_widget_show (GtkMenuItem_About);
gtk_container_add (GTK_CONTAINER (GtkMenuItem_Help_menu), GtkMenuItem_About);

2
pcsx2/Linux/pcsx2.glade
View File

@ -5219,7 +5219,7 @@ Version x.x</property>
<child>
<widget class="GtkMenuItem" id="GtkMenuItem_About">
<property name="visible">True</property>
<property name="label" translatable="yes">About PCSX2 - Playground...</property>
<property name="label" translatable="yes">About PCSX2...</property>
<property name="use_underline">True</property>
<signal name="activate" handler="OnHelp_About"/>
</widget>