chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUI ID stuff

Browse Source
This commit is contained in:
Mark Watkins 2011-06-07 12:57:04 +10:00
parent a3fb5b1c34
commit c70ca20c2f
6 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8206,7 +8206,7 @@
<wx/wx.h>
"GUIFrame.h"
1307358939 /home/mark/projects/git/sleepyhead/src/GUIFrame.h
1307415268 /home/mark/projects/git/sleepyhead/src/GUIFrame.h
<wx/intl.h>
<wx/string.h>
<wx/bitmap.h>
@ -8295,7 +8295,7 @@
<sleeplib/machine.h>
<list>
1307413369 /home/mark/projects/git/sleepyhead/src/version.h
1307413738 /home/mark/projects/git/sleepyhead/src/version.h
1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h"
@ -8413,7 +8413,7 @@
1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/cms50_loader.h
"sleeplib/machine_loader.h"
1307413299 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/cms50_loader.cpp
1307413737 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/cms50_loader.cpp
<wx/log.h>
<wx/progdlg.h>
"cms50_loader.h"

14
src/GUIFrame.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version May 5 2011)
// C++ code generated with wxFormBuilder (version Jun 6 2011)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@ -31,14 +31,14 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
FileMenu->Append( FileMenuImportSD );
wxMenuItem* FileMenuPreferences;
FileMenuPreferences = new wxMenuItem( FileMenu, wxID_ANY, wxString( _("&Preferences") ) + wxT('\t') + wxT("F10"), wxEmptyString, wxITEM_NORMAL );
FileMenuPreferences = new wxMenuItem( FileMenu, wxID_PREFERENCES, wxString( _("&Preferences") ) + wxT('\t') + wxT("F10"), wxEmptyString, wxITEM_NORMAL );
FileMenu->Append( FileMenuPreferences );
wxMenuItem* m_separator1;
m_separator1 = FileMenu->AppendSeparator();
wxMenuItem* FileMenuExit;
FileMenuExit = new wxMenuItem( FileMenu, wxID_QUIT, wxString( _("E&xit") ) , wxEmptyString, wxITEM_NORMAL );
FileMenuExit = new wxMenuItem( FileMenu, wxID_EXIT, wxString( _("E&xit") ) , wxEmptyString, wxITEM_NORMAL );
FileMenu->Append( FileMenuExit );
menubar->Append( FileMenu, _("&File") );
@ -79,7 +79,7 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
HelpMenu = new wxMenu();
wxMenuItem* HelpMenuAbout;
HelpMenuAbout = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("&About") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenuAbout = new wxMenuItem( HelpMenu, wxID_ABOUT, wxString( _("&About") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( HelpMenuAbout );
menubar->Append( HelpMenu, _("&Help") );
@ -112,14 +112,14 @@ GUIFrame::~GUIFrame()
// Disconnect Events
this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GUIFrame::OnClose ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnImportSD ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnPreferencesClicked ) );
this->Disconnect( wxID_QUIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnQuit ) );
this->Disconnect( wxID_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnPreferencesClicked ) );
this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnQuit ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuSummary ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuDaily ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnShowSerial ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnFullscreen ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnScreenshot ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnAbout ) );
this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnAbout ) );
m_mgr.UnInit();

3
src/GUIFrame.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version May 5 2011)
// C++ code generated with wxFormBuilder (version Jun 6 2011)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@ -35,7 +35,6 @@
///////////////////////////////////////////////////////////////////////////
#define wxID_QUIT 1000
///////////////////////////////////////////////////////////////////////////////
/// Class GUIFrame

7
src/WxWizFrame.fbp
View File

@ -7,6 +7,7 @@
<property name="disconnect_events">1</property>
<property name="disconnect_mode">source_name</property>
<property name="disconnect_python_events">0</property>
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
<property name="file">GUIFrame</property>
@ -221,7 +222,7 @@
<property name="checked">0</property>
<property name="enabled">1</property>
<property name="help"></property>
<property name="id">wxID_ANY</property>
<property name="id">wxID_PREFERENCES</property>
<property name="kind">wxITEM_NORMAL</property>
<property name="label">&amp;Preferences</property>
<property name="name">FileMenuPreferences</property>
@ -240,7 +241,7 @@
<property name="checked">0</property>
<property name="enabled">1</property>
<property name="help"></property>
<property name="id">wxID_QUIT</property>
<property name="id">wxID_EXIT</property>
<property name="kind">wxITEM_NORMAL</property>
<property name="label">E&amp;xit</property>
<property name="name">FileMenuExit</property>
@ -358,7 +359,7 @@
<property name="checked">0</property>
<property name="enabled">1</property>
<property name="help"></property>
<property name="id">wxID_ANY</property>
<property name="id">wxID_ABOUT</property>
<property name="kind">wxITEM_NORMAL</property>
<property name="label">&amp;About</property>
<property name="name">HelpMenuAbout</property>

7
src/libs/sleeplib/loader_plugins/cms50_loader.cpp
View File

@ -59,8 +59,6 @@ bool CMS50Loader::OpenCMS50(wxString & path, Profile *profile)
loader_progress->Update(0);
}
bool cont=dir.GetFirst(&filename);
while (cont) {
@ -126,6 +124,8 @@ bool CMS50Loader::OpenSPORFile(wxString path,Machine *mach,Profile *profile)
br=f.Read(tmp,2);
if (br!=2) return false;
num_records=tmp[0] | (tmp[1] << 8);
if (num_records<300) return false; // dont bother.
num_records <<= 1;
br=f.Read(tmp,2);
@ -152,6 +152,7 @@ bool CMS50Loader::OpenSPORFile(wxString path,Machine *mach,Profile *profile)
br=f.Read(buffer,num_records);
if (br!=num_records) {
wxLogError(wxT("Short .spoR File: ")+path);
delete [] buffer;
return false;
}
@ -232,7 +233,7 @@ bool CMS50Loader::OpenSPORFile(wxString path,Machine *mach,Profile *profile)
mach->AddSession(sess,profile);
sess->SetChanged(true);
delete buffer;
delete [] buffer;
return true;
}

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 7;
static const long BUILD = 3347;
static const long REVISION = 1415;
static const long BUILD = 3349;
static const long REVISION = 1420;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 529;
#define RC_FILEVERSION 0,7,3347,1415
#define RC_FILEVERSION_STRING "0, 7, 3347, 1415\0"
static const char FULLVERSION_STRING[] = "0.7.3347.1415";
static const long BUILDS_COUNT = 532;
#define RC_FILEVERSION 0,7,3349,1420
#define RC_FILEVERSION_STRING "0, 7, 3349, 1420\0"
static const char FULLVERSION_STRING[] = "0.7.3349.1420";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0;