diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index e50a67f6..e2c51f65 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8232,7 +8232,7 @@ -1307525930 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadApp.cpp +1307527338 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadApp.cpp "wx_pch.h" @@ -8296,7 +8296,7 @@ -1307525927 /home/mark/projects/git/sleepyhead/src/version.h +1307528197 /home/mark/projects/git/sleepyhead/src/version.h 1307418393 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" @@ -8333,7 +8333,7 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1307473982 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1307528077 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp @@ -8348,7 +8348,7 @@ -1307458866 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.cpp +1307527853 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.cpp @@ -8369,7 +8369,7 @@ "preferences.h" -1307418393 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.cpp +1307527050 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.cpp @@ -8381,7 +8381,7 @@ "machine_loader.h" "tinyxml/tinyxml.h" -1307522085 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp +1307527004 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp diff --git a/src/SleepyHeadApp.cpp b/src/SleepyHeadApp.cpp index dd1e279c..81493f7a 100644 --- a/src/SleepyHeadApp.cpp +++ b/src/SleepyHeadApp.cpp @@ -34,8 +34,6 @@ IMPLEMENT_APP(SleepyHeadApp); -wxLogWindow *logger; - bool SleepyHeadApp::OnInit() { // Initialize the logger @@ -43,8 +41,9 @@ bool SleepyHeadApp::OnInit() // It helps to allocate the logger on the heap.. This show work for all platforms now :) - logger=new wxLogWindow(NULL,wxT("Debug"),true,true); //new wxLogStderr(NULL); // + wxLog *logger=new wxLogStderr(NULL); //new wxLogWindow(NULL,wxT("Debug"),true,false); //new wxLogStderr(NULL); // wxLog::SetActiveTarget(logger); + //wxLog::SetLogLevel(wxLOG_Max); wxLogDebug( wxVERSION_STRING ); wxLogDebug( wxT("Application Initialze...") ); @@ -74,8 +73,8 @@ bool SleepyHeadApp::OnInit() SleepyHeadFrame* frame = new SleepyHeadFrame(0L); + //logger->GetFrame()->Reparent(frame); frame->Show(); - //logger->Show(false); return true; } @@ -83,8 +82,8 @@ bool SleepyHeadApp::OnInit() int SleepyHeadApp::OnExit() { //delete loader_progress; - wxLogMessage(wxT("Closing Profiles...")); + wxLogDebug(wxT("Closing Profiles...")); Profiles::Done(); - +// wxLog::SetActiveTarget(NULL); return true; } diff --git a/src/libs/sleeplib/machine.cpp b/src/libs/sleeplib/machine.cpp index 10c0531d..68bfceee 100644 --- a/src/libs/sleeplib/machine.cpp +++ b/src/libs/sleeplib/machine.cpp @@ -179,7 +179,6 @@ const map DefaultFlagColours= { ////////////////////////////////////////////////////////////////////////////////////////// Machine::Machine(Profile *p,MachineID id) { - wxLogDebug(wxT("Create Machine")); profile=p; if (!id) { std::tr1::minstd_rand gen; @@ -193,6 +192,7 @@ Machine::Machine(Profile *p,MachineID id) m_id=temp; } else m_id=id; + wxLogDebug(wxString::Format(wxT("Create Machine %lx"),m_id)); m_type=MT_UNKNOWN; firstsession=true; } @@ -277,7 +277,7 @@ bool Machine::Load() { wxString path=profile->Get("DataFolder")+wxFileName::GetPathSeparator()+hexid(); wxDir dir; - wxLogMessage(wxT("Loading ")+path); + wxLogDebug(wxT("Loading ")+path); dir.Open(path); if (!dir.IsOpened()) return false; diff --git a/src/libs/sleeplib/profiles.cpp b/src/libs/sleeplib/profiles.cpp index b691daf2..f4c97578 100644 --- a/src/libs/sleeplib/profiles.cpp +++ b/src/libs/sleeplib/profiles.cpp @@ -168,7 +168,7 @@ Day * Profile::GetDay(wxDateTime date,MachineType type) void Profile::Import(wxString path) { int c=0; - wxLogMessage(wxT("Importing ")+path); + wxLogDebug(wxT("Importing ")+path); listloaders=GetLoaders(); for (list::iterator i=loaders.begin(); i!=loaders.end(); i++) { if (c+=(*i)->Open(path,this)) break; diff --git a/src/libs/sleeplib/prs1_loader.cpp b/src/libs/sleeplib/prs1_loader.cpp index 430d0fcf..e960028c 100644 --- a/src/libs/sleeplib/prs1_loader.cpp +++ b/src/libs/sleeplib/prs1_loader.cpp @@ -52,7 +52,7 @@ PRS1Loader::~PRS1Loader() } Machine *PRS1Loader::CreateMachine(wxString serial,Profile *profile) { - wxLogMessage(wxT("Create Machine ")+serial); + wxLogDebug(wxT("Create Machine ")+serial); if (!profile) { // shouldn't happen.. wxLogMessage(wxT("No Profile!")); return NULL; diff --git a/src/version.h b/src/version.h index 59280134..3d9e919c 100644 --- a/src/version.h +++ b/src/version.h @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 3716; - static const long REVISION = 3516; + static const long BUILD = 3745; + static const long REVISION = 3681; //Miscellaneous Version Types - static const long BUILDS_COUNT = 1544; - #define RC_FILEVERSION 0,7,3716,3516 - #define RC_FILEVERSION_STRING "0, 7, 3716, 3516\0" - static const char FULLVERSION_STRING[] = "0.7.3716.3516"; + static const long BUILDS_COUNT = 1616; + #define RC_FILEVERSION 0,7,3745,3681 + #define RC_FILEVERSION_STRING "0, 7, 3745, 3681\0" + static const char FULLVERSION_STRING[] = "0.7.3745.3681"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;