From 8f9290bf6fd644a453e886aad6543863ed1dee05 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 8 Jun 2011 16:05:57 +1000 Subject: [PATCH] wxID_stuff and left pane width in daily panel --- Projects/CodeBlocks/SleepyHead.depend | 4 ++-- src/GUIFrame.cpp | 6 +++--- src/SleepyHeadMain.cpp | 5 +++++ src/WxWizFrame.fbp | 4 ++-- src/version.h | 12 ++++++------ 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 454f6f89..1724c47a 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8295,7 +8295,7 @@ -1307480716 /home/mark/projects/git/sleepyhead/src/version.h +1307481356 /home/mark/projects/git/sleepyhead/src/version.h 1307418393 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" @@ -8312,7 +8312,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1307479655 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1307481356 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp "wx_pch.h" "version.h" diff --git a/src/GUIFrame.cpp b/src/GUIFrame.cpp index 90316015..b3890f5d 100644 --- a/src/GUIFrame.cpp +++ b/src/GUIFrame.cpp @@ -31,7 +31,7 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons FileMenu->Append( FileMenuImportSD ); wxMenuItem* FileMenuPreferences; - FileMenuPreferences = new wxMenuItem( FileMenu, wxID_PREFERENCES, wxString( _("&Preferences") ) + wxT('\t') + wxT("F10"), wxEmptyString, wxITEM_NORMAL ); + FileMenuPreferences = new wxMenuItem( FileMenu, wxID_ANY, wxString( _("&Preferences") ) + wxT('\t') + wxT("F10"), wxEmptyString, wxITEM_NORMAL ); FileMenu->Append( FileMenuPreferences ); wxMenuItem* m_separator1; @@ -116,7 +116,7 @@ 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_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnPreferencesClicked ) ); + this->Disconnect( wxID_ANY, 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 ) ); @@ -150,7 +150,7 @@ DailyPanel::DailyPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, con ScrolledWindow->Layout(); fgSizer->Fit( ScrolledWindow ); Notebook = new wxAuiNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_TAB_MOVE|wxAUI_NB_TAB_SPLIT ); - m_mgr.AddPane( Notebook, wxAuiPaneInfo() .Left() .CaptionVisible( false ).CloseButton( false ).MaximizeButton( false ).MinimizeButton( false ).PinButton( false ).PaneBorder( false ).Dock().Resizable().FloatingSize( wxDefaultSize ).DockFixed( false ).Position( 1 ).MinSize( wxSize( 260,-1 ) ) ); + m_mgr.AddPane( Notebook, wxAuiPaneInfo() .Left() .CaptionVisible( false ).CloseButton( false ).MaximizeButton( false ).MinimizeButton( false ).PinButton( false ).PaneBorder( false ).Dock().Resizable().FloatingSize( wxDefaultSize ).DockFixed( false ).Position( 1 ).MinSize( wxSize( 280,-1 ) ) ); diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp index 373e9850..58d870c6 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -979,6 +979,11 @@ void Daily::RefreshData() html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(CPAP_LeakAverage)); html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_max(CPAP_LeakMaximum))+wxT(""); + html=html+wxT("Snore"); //")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(CPAP_LeakAverage)) + html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_min(CPAP_SnoreMinimum)); + html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_avg(CPAP_SnoreAverage)); + html=html+wxT("")+wxString::Format(wxT("%.2f"),cpap->summary_max(CPAP_SnoreMaximum))+wxT(""); + // html=html+wxT(" \n"); /*if (mode!=MODE_BIPAP) { diff --git a/src/WxWizFrame.fbp b/src/WxWizFrame.fbp index 45debd12..0eeb8f1a 100644 --- a/src/WxWizFrame.fbp +++ b/src/WxWizFrame.fbp @@ -222,7 +222,7 @@ 0 1 - wxID_PREFERENCES + wxID_ANY wxITEM_NORMAL &Preferences FileMenuPreferences @@ -853,7 +853,7 @@ 0 - 260,-1 + 280,-1 0 1 diff --git a/src/version.h b/src/version.h index 04007e68..82ce5980 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 = 3690; - static const long REVISION = 3390; + static const long BUILD = 3693; + static const long REVISION = 3413; //Miscellaneous Version Types - static const long BUILDS_COUNT = 1439; - #define RC_FILEVERSION 0,7,3690,3390 - #define RC_FILEVERSION_STRING "0, 7, 3690, 3390\0" - static const char FULLVERSION_STRING[] = "0.7.3690.3390"; + static const long BUILDS_COUNT = 1446; + #define RC_FILEVERSION 0,7,3693,3413 + #define RC_FILEVERSION_STRING "0, 7, 3693, 3413\0" + static const char FULLVERSION_STRING[] = "0.7.3693.3413"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;