chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temporary disabled graph linkages for testing mac issues

Browse Source
This commit is contained in:
Mark Watkins 2011-06-10 12:00:13 +10:00
parent 509d1fbd5a
commit 4e316a8f12
5 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8304,14 +8304,14 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307634592 /home/mark/projects/git/sleepyhead/src/version.h 1307671170 /home/mark/projects/git/sleepyhead/src/version.h
1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
"machine_loader.h" "machine_loader.h"
"profiles.h" "profiles.h"
1307620763 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine_loader.h 1307636478 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine_loader.h
"profiles.h" "profiles.h"
1307620828 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.h 1307620828 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.h
@ -8392,7 +8392,7 @@
"machine_loader.h" "machine_loader.h"
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1307627182 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp 1307634591 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp
<wx/dir.h> <wx/dir.h>
<wx/filename.h> <wx/filename.h>
<wx/ffile.h> <wx/ffile.h>

41
Projects/CodeBlocks/SleepyHead.layout
View File

@ -4,46 +4,55 @@
<File name="../../src/GUIFrame.cpp" open="0" top="0" tabpos="14"> <File name="../../src/GUIFrame.cpp" open="0" top="0" tabpos="14">
<Cursor position="1300" topLine="24" /> <Cursor position="1300" topLine="24" />
</File> </File>
<File name="../../src/GUIFrame.h" open="1" top="0" tabpos="11"> <File name="../../src/GUIFrame.h" open="1" top="0" tabpos="9">
<Cursor position="0" topLine="33" /> <Cursor position="0" topLine="33" />
</File> </File>
<File name="../../src/SleepyHeadApp.cpp" open="1" top="0" tabpos="1"> <File name="../../src/SleepyHeadApp.cpp" open="1" top="0" tabpos="1">
<Cursor position="1042" topLine="7" /> <Cursor position="1042" topLine="7" />
</File> </File>
<File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="2"> <File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="2">
<Cursor position="35219" topLine="888" /> <Cursor position="24637" topLine="631" />
</File> </File>
<File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="3"> <File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="3">
<Cursor position="2209" topLine="51" /> <Cursor position="2209" topLine="51" />
</File> </File>
<File name="../../src/graphs/graph.cpp" open="1" top="1" tabpos="9"> <File name="../../src/graphs/graph.cpp" open="1" top="0" tabpos="7">
<Cursor position="11516" topLine="447" /> <Cursor position="17536" topLine="634" />
</File> </File>
<File name="../../src/graphs/graph.h" open="1" top="0" tabpos="10"> <File name="../../src/graphs/graph.h" open="1" top="0" tabpos="8">
<Cursor position="7161" topLine="200" /> <Cursor position="7161" topLine="200" />
</File> </File>
<File name="../../src/libs/sleeplib/binary_file.cpp" open="0" top="0" tabpos="11"> <File name="../../src/libs/sleeplib/binary_file.cpp" open="0" top="0" tabpos="11">
<Cursor position="7148" topLine="269" /> <Cursor position="7148" topLine="269" />
</File> </File>
<File name="../../src/libs/sleeplib/loader_plugins/cms50_loader.cpp" open="1" top="0" tabpos="4"> <File name="../../src/libs/sleeplib/loader_plugins/cms50_loader.cpp" open="1" top="0" tabpos="12">
<Cursor position="2222" topLine="82" /> <Cursor position="7484" topLine="237" />
</File> </File>
<File name="../../src/libs/sleeplib/loader_plugins/cms50_loader.h" open="1" top="0" tabpos="5"> <File name="../../src/libs/sleeplib/loader_plugins/cms50_loader.h" open="0" top="0" tabpos="5">
<Cursor position="579" topLine="0" /> <Cursor position="579" topLine="0" />
</File> </File>
<File name="../../src/libs/sleeplib/machine.cpp" open="1" top="0" tabpos="8"> <File name="../../src/libs/sleeplib/loader_plugins/zeo_loader.cpp" open="1" top="0" tabpos="14">
<Cursor position="0" topLine="0" /> <Cursor position="1662" topLine="27" />
</File> </File>
<File name="../../src/libs/sleeplib/machine.h" open="1" top="0" tabpos="6"> <File name="../../src/libs/sleeplib/machine.cpp" open="1" top="0" tabpos="5">
<Cursor position="1712" topLine="36" /> <Cursor position="9760" topLine="283" />
</File> </File>
<File name="../../src/libs/sleeplib/profiles.cpp" open="0" top="0" tabpos="12"> <File name="../../src/libs/sleeplib/machine.h" open="1" top="0" tabpos="4">
<Cursor position="4619" topLine="141" /> <Cursor position="5047" topLine="119" />
</File>
<File name="../../src/libs/sleeplib/machine_loader.h" open="1" top="1" tabpos="15">
<Cursor position="222" topLine="0" />
</File>
<File name="../../src/libs/sleeplib/profiles.cpp" open="1" top="0" tabpos="10">
<Cursor position="2681" topLine="49" />
</File> </File>
<File name="../../src/libs/sleeplib/profiles.h" open="0" top="0" tabpos="13"> <File name="../../src/libs/sleeplib/profiles.h" open="0" top="0" tabpos="13">
<Cursor position="757" topLine="15" /> <Cursor position="757" topLine="15" />
</File> </File>
<File name="../../src/libs/sleeplib/prs1_loader.cpp" open="1" top="0" tabpos="7"> <File name="../../src/libs/sleeplib/prs1_loader.cpp" open="1" top="0" tabpos="6">
<Cursor position="12567" topLine="248" /> <Cursor position="13397" topLine="309" />
</File>
<File name="../../src/libs/sleeplib/prs1_loader.h" open="1" top="0" tabpos="11">
<Cursor position="622" topLine="0" />
</File> </File>
</CodeBlocks_layout_file> </CodeBlocks_layout_file>

4
src/SleepyHeadMain.cpp
View File

@ -713,7 +713,7 @@ Daily::Daily(wxWindow *win,Profile *p)
// SF->SetMargins(10,15,20,80); // SF->SetMargins(10,15,20,80);
// #if defined(__UNIX__) // #if defined(__UNIX__)
FRW->LinkZoom(SF); /* FRW->LinkZoom(SF);
FRW->LinkZoom(PRD); FRW->LinkZoom(PRD);
FRW->LinkZoom(LEAK); FRW->LinkZoom(LEAK);
FRW->LinkZoom(SNORE); FRW->LinkZoom(SNORE);
@ -732,7 +732,7 @@ Daily::Daily(wxWindow *win,Profile *p)
SNORE->LinkZoom(SF); SNORE->LinkZoom(SF);
SNORE->LinkZoom(FRW); SNORE->LinkZoom(FRW);
SNORE->LinkZoom(PRD); SNORE->LinkZoom(PRD);
SNORE->LinkZoom(LEAK); SNORE->LinkZoom(LEAK); */
// #endif // #endif

6
src/libs/sleeplib/machine_loader.h
View File

@ -16,9 +16,9 @@ class MachineLoader
public: public:
MachineLoader(); MachineLoader();
virtual ~MachineLoader(); virtual ~MachineLoader();
virtual bool Open(wxString &,Profile *profile){}; virtual bool Open(wxString &,Profile *profile)=0;
virtual int Version(){}; virtual int Version()=0;
virtual const wxString & ClassName(){}; virtual const wxString & ClassName()=0;
}; };

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 4240; static const long BUILD = 4242;
static const long REVISION = 6350; static const long REVISION = 6367;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 2742; static const long BUILDS_COUNT = 2749;
#define RC_FILEVERSION 0,7,4240,6350 #define RC_FILEVERSION 0,7,4242,6367
#define RC_FILEVERSION_STRING "0, 7, 4240, 6350\0" #define RC_FILEVERSION_STRING "0, 7, 4242, 6367\0"
static const char FULLVERSION_STRING[] = "0.7.4240.6350"; static const char FULLVERSION_STRING[] = "0.7.4242.6367";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0; static const long BUILD_HISTORY = 0;