From: <hug...@li...> - 2012-11-26 19:54:45
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/e1714af715e8 changeset: 6036:e1714af715e8 user: tmodes date: Mon Nov 26 19:17:37 2012 +0100 description: Show interface selection also in preview window diffstat: src/hugin1/hugin/GLPreviewFrame.cpp | 13 ++++++++++++ src/hugin1/hugin/MainFrame.cpp | 35 +++++++++++++++------------------ src/hugin1/hugin/MainFrame.h | 2 +- src/hugin1/hugin/xrc/preview_frame.xrc | 16 +++++++++++++++ 4 files changed, 46 insertions(+), 20 deletions(-) diffs (145 lines): diff -r afccbfa1fca9 -r e1714af715e8 src/hugin1/hugin/GLPreviewFrame.cpp --- a/src/hugin1/hugin/GLPreviewFrame.cpp Sat Nov 17 13:19:59 2012 +0100 +++ b/src/hugin1/hugin/GLPreviewFrame.cpp Mon Nov 26 19:17:37 2012 +0100 @@ -3053,6 +3053,19 @@ SetTitle(_("Fast Panorama preview")); }; m_guiLevel=newLevel; + // update menu items + switch(m_guiLevel) + { + case GUI_SIMPLE: + GetMenuBar()->FindItem(XRCID("action_gui_simple"))->Check(); + break; + case GUI_ADVANCED: + GetMenuBar()->FindItem(XRCID("action_gui_advanced"))->Check(); + break; + case GUI_EXPERT: + GetMenuBar()->FindItem(XRCID("action_gui_expert"))->Check(); + break; + }; }; void GLPreviewFrame::OnShowMainFrame(wxCommandEvent &e) diff -r afccbfa1fca9 -r e1714af715e8 src/hugin1/hugin/MainFrame.cpp --- a/src/hugin1/hugin/MainFrame.cpp Sat Nov 17 13:19:59 2012 +0100 +++ b/src/hugin1/hugin/MainFrame.cpp Mon Nov 26 19:17:37 2012 +0100 @@ -567,7 +567,7 @@ { guiLevel=GUI_ADVANCED; }; - SetGuiLevel((GuiLevel)guiLevel, true); + SetGuiLevel((GuiLevel)guiLevel); DEBUG_TRACE(""); #ifdef __WXGTK__ @@ -930,7 +930,7 @@ GuiLevel reqGuiLevel=GetMinimumGuiLevel(pano); if(reqGuiLevel>m_guiLevel) { - SetGuiLevel(reqGuiLevel, true); + SetGuiLevel(reqGuiLevel); }; SetStatusText(_("Project opened")); m_mruFiles.AddFileToHistory(fname.GetFullPath()); @@ -2007,11 +2007,11 @@ return gl_preview_frame; } -void MainFrame::SetGuiLevel(GuiLevel newLevel, const bool updateMenu) +void MainFrame::SetGuiLevel(GuiLevel newLevel) { if(gl_preview_frame==NULL && newLevel==GUI_SIMPLE) { - SetGuiLevel(GUI_ADVANCED, updateMenu); + SetGuiLevel(GUI_ADVANCED); return; }; if(m_guiLevel==GUI_EXPERT && newLevel!=GUI_EXPERT && pano.getOptimizerSwitch()==0) @@ -2060,20 +2060,17 @@ { gl_preview_frame->SetGuiLevel(m_guiLevel); }; - if(updateMenu) + switch(m_guiLevel) { - switch(m_guiLevel) - { - case GUI_SIMPLE: - GetMenuBar()->FindItem(XRCID("action_gui_simple"))->Check(); - break; - case GUI_ADVANCED: - GetMenuBar()->FindItem(XRCID("action_gui_advanced"))->Check(); - break; - case GUI_EXPERT: - GetMenuBar()->FindItem(XRCID("action_gui_expert"))->Check(); - break; - }; + case GUI_SIMPLE: + GetMenuBar()->FindItem(XRCID("action_gui_simple"))->Check(); + break; + case GUI_ADVANCED: + GetMenuBar()->FindItem(XRCID("action_gui_advanced"))->Check(); + break; + case GUI_EXPERT: + GetMenuBar()->FindItem(XRCID("action_gui_expert"))->Check(); + break; }; if(m_guiLevel==GUI_SIMPLE) { @@ -2147,7 +2144,7 @@ #endif wxOK | wxICON_INFORMATION); } - SetGuiLevel(m_guiLevel, true); + SetGuiLevel(m_guiLevel); }; }; @@ -2167,7 +2164,7 @@ wxT(""), #endif wxOK | wxICON_INFORMATION); - SetGuiLevel(GUI_EXPERT, true); + SetGuiLevel(GUI_EXPERT); }; }; diff -r afccbfa1fca9 -r e1714af715e8 src/hugin1/hugin/MainFrame.h --- a/src/hugin1/hugin/MainFrame.h Sat Nov 17 13:19:59 2012 +0100 +++ b/src/hugin1/hugin/MainFrame.h Mon Nov 26 19:17:37 2012 +0100 @@ -167,7 +167,7 @@ #ifdef __WXMSW__ wxCHMHelpController& GetHelpController() { return m_msHtmlHelp; } #endif - void SetGuiLevel(GuiLevel newLevel, const bool updateMenu=false); + void SetGuiLevel(GuiLevel newLevel); const GuiLevel GetGuiLevel() const { return m_guiLevel; }; wxFileHistory* GetFileHistory() { return &m_mruFiles; }; diff -r afccbfa1fca9 -r e1714af715e8 src/hugin1/hugin/xrc/preview_frame.xrc --- a/src/hugin1/hugin/xrc/preview_frame.xrc Sat Nov 17 13:19:59 2012 +0100 +++ b/src/hugin1/hugin/xrc/preview_frame.xrc Mon Nov 26 19:17:37 2012 +0100 @@ -1805,6 +1805,22 @@ </object> <label>&View</label> </object> + <object class="wxMenu" name="gui_level_menu"> + <object class="wxMenuItem" name="action_gui_simple"> + <label>Simple</label> + <radio>1</radio> + <checked>1</checked> + </object> + <object class="wxMenuItem" name="action_gui_advanced"> + <label>Advanced</label> + <radio>1</radio> + </object> + <object class="wxMenuItem" name="action_gui_expert"> + <label>Expert</label> + <radio>1</radio> + </object> + <label>Interface</label> + </object> <object class="wxMenu" name="help_menu"> <object class="wxMenuItem" name="action_show_help"> <label>&Help</label> |