[Scummvm-cvs-logs] SF.net SVN: scummvm:[48625] tools/trunk/gui/main.cpp

criezy at users.sourceforge.net criezy at users.sourceforge.net
Sun Apr 11 20:09:12 CEST 2010


Revision: 48625
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48625&view=rev
Author:   criezy
Date:     2010-04-11 18:09:12 +0000 (Sun, 11 Apr 2010)

Log Message:
-----------
Add version in GUI Tools window title. Also the options menu is now mapped to the Preferences menu on MacOS X.

Modified Paths:
--------------
    tools/trunk/gui/main.cpp

Modified: tools/trunk/gui/main.cpp
===================================================================
--- tools/trunk/gui/main.cpp	2010-04-11 17:51:06 UTC (rev 48624)
+++ tools/trunk/gui/main.cpp	2010-04-11 18:09:12 UTC (rev 48625)
@@ -67,7 +67,10 @@
 	SetAppName(wxT("ScummVM Tools"));
 
 	// Create window & display
-	ScummToolsFrame *frame = new ScummToolsFrame(GetAppName(), wxDefaultPosition, wxSize(600,420));
+	ScummToolsFrame *frame = new ScummToolsFrame(
+			GetAppName() + wxT(" ") + wxString(gScummVMToolsVersionDate, wxConvISO8859_1),
+			wxDefaultPosition, wxSize(600,420)
+		);
 #ifdef __WXMAC__ // Menu bar looks ugly when it's part of the window, on OSX it's not
 	frame->CreateMenuBar();
 	frame->CentreOnScreen();
@@ -161,7 +164,7 @@
 	EVT_BUTTON(ID_HELP, ScummToolsFrame::onMenuHelp)
 	EVT_MENU(wxID_HELP, ScummToolsFrame::onMenuHelp)
 	EVT_BUTTON(ID_ADVANCED, ScummToolsFrame::onMenuAdvanced)
-	EVT_MENU(ID_ADVANCED, ScummToolsFrame::onMenuAdvanced)
+	EVT_MENU(wxID_PREFERENCES, ScummToolsFrame::onMenuAdvanced)
 	EVT_MENU(ID_MANUAL, ScummToolsFrame::onMenuManual)
 	EVT_MENU(ID_WEBSITE, ScummToolsFrame::onMenuWebsite)
 	EVT_MENU(wxID_ABOUT, ScummToolsFrame::onMenuAbout)
@@ -243,7 +246,7 @@
 	wxMenu *helpmenu = new wxMenu();
 	helpmenu->Append(wxID_HELP, wxT("Help"));
 	// Might be under the wrong menu...
-	helpmenu->Append(ID_ADVANCED, wxT("&Default Settings"));
+	helpmenu->Append(wxID_PREFERENCES, wxT("&Default Settings"));
 	helpmenu->Append(ID_MANUAL, wxT("&Manual Page"));
 	helpmenu->Append(ID_WEBSITE, wxT("Visit ScummVM &Website"));
 	helpmenu->Append(wxID_ABOUT, wxT("&About ") + wxGetApp().GetAppName());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list