Menu
▾
▴
[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Some more GUI formatting to better fit...
|
From: <hug...@li...> - 2010-10-20 17:30:59
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/3edfcd782b6a changeset: 4509:3edfcd782b6a user: tmodes date: Wed Oct 20 19:30:33 2010 +0200 description: Some more GUI formatting to better fit to GUI guidelines * Don't expand buttons vertical * Add caption to some message boxes diffstat: src/hugin1/hugin/CPEditorPanel.cpp | 4 +- src/hugin1/hugin/MainFrame.cpp | 2 +- src/hugin1/hugin/PanoPanel.cpp | 4 +- src/hugin1/hugin/xrc/pano_panel.xrc | 1207 ++++++++++++++++++---------------- 4 files changed, 635 insertions(+), 582 deletions(-) diffs (truncated from 1327 to 500 lines): diff -r 69cd40772b12 -r 3edfcd782b6a src/hugin1/hugin/CPEditorPanel.cpp --- a/src/hugin1/hugin/CPEditorPanel.cpp Wed Oct 20 18:39:42 2010 +0200 +++ b/src/hugin1/hugin/CPEditorPanel.cpp Wed Oct 20 19:30:33 2010 +0200 @@ -1065,7 +1065,7 @@ #if wxCHECK_VERSION(2, 9, 0) wxMessageDialog dlg(this, _("No similar point found."), - "", + _("Hugin"), wxICON_ERROR | wxOK); dlg.SetExtendedMessage(wxString::Format(_("Check the similarity visually.\nCorrelation coefficient (%.3f) is lower than the threshold set in the preferences."), res.maxi)); @@ -1074,7 +1074,7 @@ wxMessageBox( wxString::Format(_("No similar point found. Check the similarity visually.\nCorrelation coefficient (%.3f) is lower than the threshold set in the preferences."), res.maxi), - _("No similar point found"), + _("Hugin"), wxICON_ERROR | wxOK, this); #endif return false; diff -r 69cd40772b12 -r 3edfcd782b6a src/hugin1/hugin/MainFrame.cpp --- a/src/hugin1/hugin/MainFrame.cpp Wed Oct 20 18:39:42 2010 +0200 +++ b/src/hugin1/hugin/MainFrame.cpp Wed Oct 20 19:30:33 2010 +0200 @@ -499,7 +499,7 @@ { if (pano.isDirty()) { wxMessageDialog message(this, - _("Save changes to the panorama before closing?"), wxT(""), + _("Save changes to the panorama before closing?"), _("Hugin"), wxICON_EXCLAMATION | wxYES_NO | (cancelable? (wxCANCEL):0)); #if wxCHECK_VERSION(2, 9, 0) message.SetExtendedMessage("If you close without saving, changes since your last save will be discarded"); diff -r 69cd40772b12 -r 3edfcd782b6a src/hugin1/hugin/PanoPanel.cpp --- a/src/hugin1/hugin/PanoPanel.cpp Wed Oct 20 18:39:42 2010 +0200 +++ b/src/hugin1/hugin/PanoPanel.cpp Wed Oct 20 19:30:33 2010 +0200 @@ -1299,7 +1299,7 @@ #if wxCHECK_VERSION(2,9,0) wxMessageDialog dialog(this, _("Are you sure you want to stitch such a large panorama?"), - wxT(""), + _("Hugin"), wxICON_EXCLAMATION | wxYES_NO); dialog.SetExtendedMessage( wxString::Format(_("The panorama you are trying to stitch is %.1f gigapixels.\nIf this is too big, reduce the panorama Canvas Size and the cropped region and stitch from the Stitcher tab. Stitching a panorama this size could take a long time and a large amount of memory."), @@ -1323,7 +1323,7 @@ wxMessageDialog dialog(this, wxString::Format(_("Are you sure you want to stitch such a large panorama?\n\nThe panorama you are trying to stitch is %.1f gigapixels.\nIf this is too big, reduce the panorama Canvas Size and the cropped region and stitch from the Stitcher tab. Stitching a panorama this size could take a long time and a large amount of memory."), area / 1000000000.0), - wxT(""), + _("Hugin"), wxICON_EXCLAMATION | wxYES_NO); #endif bool result; diff -r 69cd40772b12 -r 3edfcd782b6a src/hugin1/hugin/xrc/pano_panel.xrc --- a/src/hugin1/hugin/xrc/pano_panel.xrc Wed Oct 20 18:39:42 2010 +0200 +++ b/src/hugin1/hugin/xrc/pano_panel.xrc Wed Oct 20 19:30:33 2010 +0200 @@ -154,137 +154,160 @@ <object class="wxBoxSizer"> <orient>wxVERTICAL</orient> <object class="sizeritem"> - <object class="wxBoxSizer"> - <orient>wxVERTICAL</orient> + <object class="wxGridBagSizer"> + <!-- The projection, field of view, and crop rows could be + removed, because they are all duplicated (including the + numeric entries) on the fast preview. + People still use them since when creating things like + gores and cube faces they are located near the stitch + and send to batch buttons. --> <object class="sizeritem"> - <object class="wxGridBagSizer"> - <!-- The projection, field of view, and crop rows could be - removed, because they are all duplicated (including the - numeric entries) on the fast preview. - People still use them since when creating things like - gores and cube faces they are located near the stitch - and send to batch buttons. --> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Projection:</label> - <font> - <style platform="mac">normal</style> - <family platform="mac">swiss</family> - <weight>bold</weight> - <size platform="mac">12</size> - </font> - </object> - <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> - <cellpos>0,0</cellpos> - </object> - <object class="sizeritem"> - <object class="wxChoice" name="pano_choice_pano_type"> - <content/> - <selection>2</selection> - </object> - <cellpos>0,1</cellpos> - <cellspan>1,5</cellspan> + <object class="wxStaticText"> + <label>Projection:</label> + <font> + <style platform="mac">normal</style> + <family platform="mac">swiss</family> + <weight>bold</weight> + <size platform="mac">12</size> + </font> + </object> + <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>0,0</cellpos> + </object> + <object class="sizeritem"> + <object class="wxChoice" name="pano_choice_pano_type"> + <content/> + <selection>2</selection> + </object> + <cellpos>0,1</cellpos> + <cellspan>1,5</cellspan> + <flag>wxEXPAND</flag> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Field of View:</label> + <font> + <style platform="mac">normal</style> + <family platform="mac">swiss</family> + <weight>bold</weight> + <size platform="mac">12</size> + </font> + </object> + <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>1,0</cellpos> + </object> + <object class="sizeritem"> + <cellpos>1,1</cellpos> + <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <object class="wxStaticText"> + <label>Horizontal:</label> + </object> + </object> + <object class="sizeritem"> + <cellpos>1,2</cellpos> + <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <object class="wxTextCtrl" name="pano_text_hfov"> + <size>40,-1d</size> + </object> + </object> + <object class="sizeritem"> + <cellpos>1,3</cellpos> + <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <object class="wxStaticText"> + <label>Vertical:</label> + </object> + </object> + <object class="sizeritem"> + <cellpos>1,4</cellpos> + <flag>wxTOP|wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <!-- force a larger spacing between the unrelated numerical entry rows--> + <border>6</border> + <object class="wxTextCtrl" name="pano_text_vfov"> + <size>40,-1d</size> + </object> + </object> + <object class="sizeritem"> + <object class="wxBoxSizer"> + <orient>wxVERTICAL</orient> + <object class="spacer"> + <size>0</size> + <option>1</option> <flag>wxEXPAND</flag> </object> <object class="sizeritem"> - <object class="wxStaticText"> - <label>Field of View:</label> - <font> - <style platform="mac">normal</style> - <family platform="mac">swiss</family> - <weight>bold</weight> - <size platform="mac">12</size> - </font> - </object> - <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> - <cellpos>1,0</cellpos> - </object> - <object class="sizeritem"> - <cellpos>1,1</cellpos> - <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> - <object class="wxStaticText"> - <label>Horizontal:</label> - </object> - </object> - <object class="sizeritem"> - <cellpos>1,2</cellpos> - <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> - <object class="wxTextCtrl" name="pano_text_hfov"> - <size>40,-1d</size> - </object> - </object> - <object class="sizeritem"> - <cellpos>1,3</cellpos> - <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> - <object class="wxStaticText"> - <label>Vertical:</label> - </object> - </object> - <object class="sizeritem"> - <cellpos>1,4</cellpos> - <flag>wxTOP|wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> - <!-- force a larger spacing between the unrelated numerical entry rows--> - <border>6</border> - <object class="wxTextCtrl" name="pano_text_vfov"> - <size>40,-1d</size> - </object> - </object> - <object class="sizeritem"> <object class="wxButton" name="pano_button_calc_fov"> - <!-- Gnome wants command buttons in header case, Microsoft and Apple want sentence case. + <!-- Gnome wants command buttons in header case, Microsoft and Apple want sentence case. I don't know about OS/2, but any label is better than none.--> <label platform="win|mac|os2">Calculate field of view</label> <label platform="unix">Calculate Field of View</label> </object> <!-- If there was an option, I would would expand the buttons horizontally only. --> - <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> + <flag>wxEXPAND</flag> <cellpos>1,5</cellpos> </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Canvas Size:</label> - <font> - <style platform="mac">normal</style> - <family platform="mac">swiss</family> - <weight>bold</weight> - <size platform="mac">12</size> - </font> - </object> - <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> - <cellpos>2,0</cellpos> + <object class="spacer"> + <size>0</size> + <option>1</option> + <flag>wxEXPAND</flag> </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Width:</label> - </object> - <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> - <cellpos>2,1</cellpos> - </object> - <object class="sizeritem"> - <object class="wxTextCtrl" name="pano_val_width"> - <size>40,-1d</size> - <style>wxTE_PROCESS_ENTER</style> - </object> - <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> - <cellpos>2,2</cellpos> - </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Height:</label> - <style>wxALIGN_RIGHT</style> - </object> - <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> - <cellpos>2,3</cellpos> - </object> - <object class="sizeritem"> - <object class="wxTextCtrl" name="pano_val_height"> - <size>40,-1d</size> - <style>wxTE_PROCESS_ENTER</style> - </object> - <flag>wxTOP|wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> - <!-- force a larger spacing between the unrelated numerical entry rows--> - <border>6</border> - <cellpos>2,4</cellpos> + </object> + <!-- If there was an option, I would would expand the buttons horizontally only. --> + <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>1,5</cellpos> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Canvas Size:</label> + <font> + <style platform="mac">normal</style> + <family platform="mac">swiss</family> + <weight>bold</weight> + <size platform="mac">12</size> + </font> + </object> + <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>2,0</cellpos> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Width:</label> + </object> + <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>2,1</cellpos> + </object> + <object class="sizeritem"> + <object class="wxTextCtrl" name="pano_val_width"> + <size>40,-1d</size> + <style>wxTE_PROCESS_ENTER</style> + </object> + <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>2,2</cellpos> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Height:</label> + <style>wxALIGN_RIGHT</style> + </object> + <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>2,3</cellpos> + </object> + <object class="sizeritem"> + <object class="wxTextCtrl" name="pano_val_height"> + <size>40,-1d</size> + <style>wxTE_PROCESS_ENTER</style> + </object> + <flag>wxTOP|wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <!-- force a larger spacing between the unrelated numerical entry rows--> + <border>6</border> + <cellpos>2,4</cellpos> + </object> + <object class="sizeritem"> + <object class="wxBoxSizer"> + <orient>wxVERTICAL</orient> + <object class="spacer"> + <size>0</size> + <option>1</option> + <flag>wxEXPAND</flag> </object> <object class="sizeritem"> <object class="wxButton" name="pano_button_opt_width"> @@ -292,91 +315,113 @@ <label platform="win|mac|os2">Calculate optimal size</label> <tooltip>Calculate optimal image size, such that the resolution in the image center stays similar</tooltip> </object> - <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> + <flag>wxEXPAND</flag> <cellpos>2,5</cellpos> </object> - <!-- Crop entries are split onto two rows --> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Crop:</label> - <font> - <style platform="mac">normal</style> - <family platform="mac">swiss</family> - <weight>bold</weight> - <size platform="mac">12</size> - </font> - </object> - <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> - <cellpos>3,0</cellpos> + <object class="spacer"> + <size>0</size> + <option>1</option> + <flag>wxEXPAND</flag> </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Left:</label> - </object> - <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> - <cellpos>3,1</cellpos> - </object> - <object class="sizeritem"> - <object class="wxTextCtrl" name="pano_val_roi_left"> - <size>40,-1d</size> - <style>wxTE_PROCESS_ENTER</style> - </object> - <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxTOP</flag> - <!-- force a larger spacing between the unrelated numerical entry rows--> - <border>6</border> - <cellpos>3,2</cellpos> - </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Top:</label> - <style>wxALIGN_RIGHT</style> - </object> - <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> - <cellpos>3,3</cellpos> - </object> - <object class="sizeritem"> - <object class="wxTextCtrl" name="pano_val_roi_top"> - <size>40,-1d</size> - <style>wxTE_PROCESS_ENTER</style> - </object> - <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxTOP</flag> - <!-- force a larger spacing between the unrelated numerical entry rows--> - <border>6</border> - <cellpos>3,4</cellpos> - </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Right:</label> - <style>wxALIGN_RIGHT</style> - </object> - <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> - <cellpos>4,1</cellpos> - </object> - <object class="sizeritem"> - <object class="wxTextCtrl" name="pano_val_roi_right"> - <size>40,-1d</size> - <style>wxTE_PROCESS_ENTER</style> - </object> - <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxBOTTOM</flag> - <border>6</border> - <cellpos>4,2</cellpos> - </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Bottom:</label> - <style>wxALIGN_RIGHT</style> - </object> - <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> - <cellpos>4,3</cellpos> - </object> - <object class="sizeritem"> - <object class="wxTextCtrl" name="pano_val_roi_bottom"> - <size>40,-1d</size> - <style>wxTE_PROCESS_ENTER</style> - </object> - <flag>wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> - <border>6</border> - <cellpos>4,4</cellpos> + </object> + <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>2,5</cellpos> + </object> + <!-- Crop entries are split onto two rows --> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Crop:</label> + <font> + <style platform="mac">normal</style> + <family platform="mac">swiss</family> + <weight>bold</weight> + <size platform="mac">12</size> + </font> + </object> + <flag>wxTOP|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <border>6</border> + <cellpos>3,0</cellpos> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Left:</label> + </object> + <flag>wxTOP|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <border>6</border> + <cellpos>3,1</cellpos> + </object> + <object class="sizeritem"> + <object class="wxTextCtrl" name="pano_val_roi_left"> + <size>40,-1d</size> + <style>wxTE_PROCESS_ENTER</style> + </object> + <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxTOP</flag> + <!-- force a larger spacing between the unrelated numerical entry rows--> + <border>6</border> + <cellpos>3,2</cellpos> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Top:</label> + <style>wxALIGN_RIGHT</style> + </object> + <flag>wxTOP|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <border>6</border> + <cellpos>3,3</cellpos> + </object> + <object class="sizeritem"> + <object class="wxTextCtrl" name="pano_val_roi_top"> + <size>40,-1d</size> + <style>wxTE_PROCESS_ENTER</style> + </object> + <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxTOP</flag> + <!-- force a larger spacing between the unrelated numerical entry rows--> + <border>6</border> + <cellpos>3,4</cellpos> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Right:</label> + <style>wxALIGN_RIGHT</style> + </object> + <flag>wxBOTTOM|wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <border>6</border> + <cellpos>4,1</cellpos> + </object> + <object class="sizeritem"> + <object class="wxTextCtrl" name="pano_val_roi_right"> + <size>40,-1d</size> + <style>wxTE_PROCESS_ENTER</style> + </object> |