[Hugin-cvs] /hgroot/hugin/hugin: Show also gui level on image tab and change...

[<hug...@li...>]

branch:     gui_overhaul
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/7f384d763667
changeset:  5778:7f384d763667
user:       tmodes
date:       Tue May 08 18:54:56 2012 +0200
description:

Show also gui level on image tab and changed display selection to wxRadioBox

diffstat:

 src/hugin1/hugin/ImagesPanel.cpp      |  19 +++++++++++++++++--
 src/hugin1/hugin/xrc/images_panel.xrc |  21 ++++++++++++---------
 src/hugin1/hugin/xrc/main_frame.xrc   |   2 +-
 3 files changed, 30 insertions(+), 12 deletions(-)

diffs (106 lines):

diff -r e25658bc8efd -r 7f384d763667 src/hugin1/hugin/ImagesPanel.cpp
--- a/src/hugin1/hugin/ImagesPanel.cpp	Sun May 06 18:42:17 2012 +0200
+++ b/src/hugin1/hugin/ImagesPanel.cpp	Tue May 08 18:54:56 2012 +0200
@@ -63,7 +63,7 @@
     EVT_TREE_SEL_CHANGED(XRCID("images_tree_ctrl"), ImagesPanel::OnSelectionChanged )
     EVT_CHOICE     ( XRCID("images_lens_type"), ImagesPanel::OnLensTypeChanged)
     EVT_CHOICE     ( XRCID("images_group_mode"), ImagesPanel::OnGroupModeChanged)
-    EVT_CHOICE     ( XRCID("images_column_choice"), ImagesPanel::OnDisplayModeChanged)
+    EVT_RADIOBOX   ( XRCID("images_column_radiobox"), ImagesPanel::OnDisplayModeChanged)
     EVT_CHOICE     ( XRCID("images_optimize_mode"), ImagesPanel::OnOptimizerSwitchChanged)
     EVT_CHOICE     ( XRCID("images_photo_optimize_mode"), ImagesPanel::OnPhotometricOptimizerSwitchChanged)
     EVT_TEXT_ENTER ( XRCID("images_focal_length"), ImagesPanel::OnFocalLengthChanged)
@@ -629,7 +629,7 @@
 
 void ImagesPanel::OnDisplayModeChanged(wxCommandEvent & e)
 {
-    wxChoice* display=XRCCTRL(*this,"images_column_choice", wxChoice);
+    wxRadioBox* display=XRCCTRL(*this,"images_column_radiobox", wxRadioBox);
     m_images_tree->SetDisplayMode((ImagesTreeCtrl::DisplayMode)display->GetSelection());
 };
 
@@ -661,6 +661,21 @@
     m_images_tree->SetGuiLevel(newGuiLevel);
     FillGroupChoice();
     FillOptimizerChoice();
+    wxStaticText* textlabel=XRCCTRL(*this, "images_mode_text", wxStaticText);
+    switch(m_guiLevel)
+    {
+        case GUI_BEGINNER:
+            textlabel->SetLabel(_("Mode: Beginner"));
+            break;
+        case GUI_ADVANCED:
+            textlabel->SetLabel(_("Mode: Advanced"));
+            break;
+        case GUI_EXPERT:
+            textlabel->SetLabel(_("Mode: Expert"));
+            break;
+    };
+    textlabel->GetParent()->Layout();
+    textlabel->Refresh();
     panoramaChanged(*m_pano);
 };
 
diff -r e25658bc8efd -r 7f384d763667 src/hugin1/hugin/xrc/images_panel.xrc
--- a/src/hugin1/hugin/xrc/images_panel.xrc	Sun May 06 18:42:17 2012 +0200
+++ b/src/hugin1/hugin/xrc/images_panel.xrc	Tue May 08 18:54:56 2012 +0200
@@ -19,6 +19,13 @@
                 <object class="sizeritem">
                   <object class="wxBoxSizer">
                     <object class="sizeritem">
+                      <object class="wxStaticText" name="images_mode_text">
+                        <style>wxALIGN_CENTRE</style>
+                      </object>
+                      <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_HORIZONTAL</flag>
+                      <border>3</border>
+                    </object>
+                    <object class="sizeritem">
                       <object class="wxStaticText">
                         <label>Group by:</label>
                       </object>
@@ -28,15 +35,10 @@
                       <flag>wxEXPAND|wxALL</flag>
                       <border>3</border>
                     </object>
+                    
                     <object class="sizeritem">
-                      <object class="wxStaticText">
-                        <label>Display:</label>
-                      </object>
-                      <flag>wxTOP</flag>
-                      <border>6</border>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxChoice" name="images_column_choice">
+                      <object class="wxRadioBox" name="images_column_radiobox">
+                        <label>Display</label>
                         <content>
                           <item>General</item>
                           <item>EXIF data</item>
@@ -45,12 +47,13 @@
                           <item>Photometric parameters</item>
                         </content>
                         <selection>0</selection>
+                        <style>wxRA_SPECIFY_COLS</style>
                       </object>
                       <flag>wxEXPAND|wxALL</flag>
                       <border>3</border>
                     </object>
                     <orient>wxVERTICAL</orient>
-                    <object platform="win" class="sizeritem">
+                    <object class="sizeritem" platform="win">
                       <object class="wxStaticBitmap">
                         <bitmap>data/hugin.png</bitmap>
                       </object>
diff -r e25658bc8efd -r 7f384d763667 src/hugin1/hugin/xrc/main_frame.xrc
--- a/src/hugin1/hugin/xrc/main_frame.xrc	Sun May 06 18:42:17 2012 +0200
+++ b/src/hugin1/hugin/xrc/main_frame.xrc	Tue May 08 18:54:56 2012 +0200
@@ -23,7 +23,7 @@
               <object class="AssistantPanel" name="assistant_panel_unknown"/>
             </object>
             <object class="notebookpage">
-              <label>Images</label>
+              <label>Photos</label>
               <object class="ImagesPanel" name="images_panel_unknown"/>
             </object>