From: <tm...@us...> - 2010-03-25 22:12:23
|
Revision: 5092 http://hugin.svn.sourceforge.net/hugin/?rev=5092&view=rev Author: tmodes Date: 2010-03-25 22:12:17 +0000 (Thu, 25 Mar 2010) Log Message: ----------- Modified dialogs to respect systems interface guidelines (reorder of Ok and Cancel button: on Windows it's Ok and then Cancel; on Mac first Cancel, then Ok) Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/xrc/assistant_panel.xrc hugin/trunk/src/hugin1/hugin/xrc/cpdetector_dialog.xrc hugin/trunk/src/hugin1/hugin/xrc/edit_script_dialog.xrc hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc hugin/trunk/src/hugin1/hugin/xrc/pano_panel.xrc hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc hugin/trunk/src/hugin1/hugin/xrc/reset_dialog.xrc Modified: hugin/trunk/src/hugin1/hugin/xrc/assistant_panel.xrc =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/assistant_panel.xrc 2010-03-25 22:08:15 UTC (rev 5091) +++ hugin/trunk/src/hugin1/hugin/xrc/assistant_panel.xrc 2010-03-25 22:12:17 UTC (rev 5092) @@ -340,25 +340,17 @@ <border>10</border> </object> <object class="sizeritem"> - <object class="wxBoxSizer"> - <orient>wxHORIZONTAL</orient> - <object class="spacer"> - <size>0,0</size> - <option>1</option> - </object> - <object class="sizeritem"> + <object class="wxStdDialogButtonSizer"> + <object class="button"> <object class="wxButton" name="wxID_OK"> - <label></label> + <label>OK</label> + <default>1</default> </object> - <flag>wxRIGHT</flag> - <border>8</border> </object> - <object class="sizeritem"> + <object class="button"> <object class="wxButton" name="wxID_CANCEL"> - <label></label> + <label>Cancel</label> </object> - <flag>wxRIGHT</flag> - <border>8</border> </object> </object> <flag>wxALL|wxEXPAND</flag> Modified: hugin/trunk/src/hugin1/hugin/xrc/cpdetector_dialog.xrc =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/cpdetector_dialog.xrc 2010-03-25 22:08:15 UTC (rev 5091) +++ hugin/trunk/src/hugin1/hugin/xrc/cpdetector_dialog.xrc 2010-03-25 22:12:17 UTC (rev 5092) @@ -310,29 +310,19 @@ <flag>wxEXPAND</flag> </object> <object class="sizeritem"> - <object class="wxBoxSizer"> - <orient>wxHORIZONTAL</orient> - <object class="spacer"> - <option>1</option> - <flag>wxEXPAND</flag> - </object> - <object class="sizeritem"> + <object class="wxStdDialogButtonSizer"> + <object class="button"> <object class="wxButton" name="wxID_OK"> <label>OK</label> <default>1</default> </object> - <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> </object> - <object class="sizeritem"> + <object class="button"> <object class="wxButton" name="wxID_CANCEL"> <label>Cancel</label> </object> - <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> </object> </object> - <option>0</option> <flag>wxALL|wxEXPAND</flag> <border>5</border> </object> Modified: hugin/trunk/src/hugin1/hugin/xrc/edit_script_dialog.xrc =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/edit_script_dialog.xrc 2010-03-25 22:08:15 UTC (rev 5091) +++ hugin/trunk/src/hugin1/hugin/xrc/edit_script_dialog.xrc 2010-03-25 22:12:17 UTC (rev 5092) @@ -21,29 +21,20 @@ <minsize>600,300</minsize> </object> <object class="sizeritem"> - <object class="wxBoxSizer"> - <orient>wxHORIZONTAL</orient> - <object class="spacer"> - <size>0,0</size> - <option>1</option> - <flag>wxEXPAND</flag> - </object> - <object class="sizeritem"> + <object class="wxStdDialogButtonSizer"> + <object class="button"> <object class="wxButton" name="wxID_OK"> <label>Continue with these changes</label> </object> - <flag>wxALL</flag> - <border>5</border> </object> - <object class="sizeritem"> + <object class="button"> <object class="wxButton" name="wxID_CANCEL"> <label>Discard changes and cancel</label> </object> - <flag>wxALL</flag> - <border>5</border> </object> </object> <flag>wxALL|wxEXPAND|wxGROW</flag> + <border>5</border> </object> <orient>wxVERTICAL</orient> </object> Modified: hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc 2010-03-25 22:08:15 UTC (rev 5091) +++ hugin/trunk/src/hugin1/hugin/xrc/mask_editor_panel.xrc 2010-03-25 22:12:17 UTC (rev 5092) @@ -296,32 +296,21 @@ <flag>wxEXPAND</flag> </object> <object class="sizeritem"> - <object class="wxBoxSizer"> - <orient>wxHORIZONTAL</orient> - <object class="spacer"> - <option>1</option> - <flag>wxEXPAND</flag> - </object> - <object class="sizeritem"> + <object class="wxStdDialogButtonSizer"> + <object class="button"> <object class="wxButton" name="wxID_OK"> <label>OK</label> <default>1</default> </object> - <option>0</option> - <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> </object> - <object class="sizeritem"> + <object class="button"> <object class="wxButton" name="wxID_CANCEL"> <label>Cancel</label> </object> - <option>0</option> - <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> </object> </object> - <option>0</option> - <flag>wxEXPAND|wxALIGN_CENTRE_HORIZONTAL</flag> + <flag>wxEXPAND|wxALL</flag> + <border>5</border> </object> </object> <title>Loading mask</title> Modified: hugin/trunk/src/hugin1/hugin/xrc/pano_panel.xrc =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/pano_panel.xrc 2010-03-25 22:08:15 UTC (rev 5091) +++ hugin/trunk/src/hugin1/hugin/xrc/pano_panel.xrc 2010-03-25 22:12:17 UTC (rev 5092) @@ -43,26 +43,17 @@ </object> <orient>wxVERTICAL</orient> <object class="sizeritem"> - <object class="wxBoxSizer"> - <orient>wxHORIZONTAL</orient> - <object class="spacer"> - <size>10,10</size> - <option>1</option> - <flag/> - </object> - <object class="sizeritem"> + <object class="wxStdDialogButtonSizer"> + <object class="button"> <object class="wxButton" name="wxID_OK"> - <label/> + <label>OK</label> + <default>1</default> </object> - <flag>wxRIGHT</flag> - <border>6</border> </object> - <object class="sizeritem"> + <object class="button"> <object class="wxButton" name="wxID_CANCEL"> - <label/> + <label>Cancel</label> </object> - <flag>wxRIGHT</flag> - <border>6</border> </object> </object> <flag>wxTOP|wxBOTTOM|wxEXPAND</flag> @@ -94,26 +85,17 @@ </object> <orient>wxVERTICAL</orient> <object class="sizeritem"> - <object class="wxBoxSizer"> - <orient>wxHORIZONTAL</orient> - <object class="spacer"> - <size>10,10</size> - <option>1</option> - <flag/> - </object> - <object class="sizeritem"> + <object class="wxStdDialogButtonSizer"> + <object class="button"> <object class="wxButton" name="wxID_OK"> - <label/> + <label>OK</label> + <default>1</default> </object> - <flag>wxRIGHT</flag> - <border>6</border> </object> - <object class="sizeritem"> + <object class="button"> <object class="wxButton" name="wxID_CANCEL"> - <label/> + <label>Cancel</label> </object> - <flag>wxRIGHT</flag> - <border>6</border> </object> </object> <flag>wxTOP|wxBOTTOM|wxEXPAND</flag> @@ -145,26 +127,17 @@ </object> <orient>wxVERTICAL</orient> <object class="sizeritem"> - <object class="wxBoxSizer"> - <orient>wxHORIZONTAL</orient> - <object class="spacer"> - <size>10,10</size> - <option>1</option> - <flag/> - </object> - <object class="sizeritem"> + <object class="wxStdDialogButtonSizer"> + <object class="button"> <object class="wxButton" name="wxID_OK"> - <label/> + <label>OK</label> + <default>1</default> </object> - <flag>wxRIGHT</flag> - <border>6</border> </object> - <object class="sizeritem"> + <object class="button"> <object class="wxButton" name="wxID_CANCEL"> - <label/> + <label>Cancel</label> </object> - <flag>wxRIGHT</flag> - <border>6</border> </object> </object> <flag>wxTOP|wxBOTTOM|wxEXPAND</flag> @@ -1168,26 +1141,17 @@ <border>5</border> </object> <object class="sizeritem"> - <object class="wxBoxSizer"> - <orient>wxHORIZONTAL</orient> - <object class="spacer"> - <size>10,10</size> - <option>1</option> - <flag/> - </object> - <object class="sizeritem"> + <object class="wxStdDialogButtonSizer"> + <object class="button"> <object class="wxButton" name="wxID_OK"> - <label/> + <label>OK</label> + <default>1</default> </object> - <flag>wxRIGHT</flag> - <border>6</border> </object> - <object class="sizeritem"> + <object class="button"> <object class="wxButton" name="wxID_CANCEL"> - <label/> + <label>Cancel</label> </object> - <flag>wxRIGHT</flag> - <border>6</border> </object> </object> <flag>wxTOP|wxBOTTOM|wxEXPAND</flag> Modified: hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc 2010-03-25 22:08:15 UTC (rev 5091) +++ hugin/trunk/src/hugin1/hugin/xrc/pref_dialog.xrc 2010-03-25 22:12:17 UTC (rev 5092) @@ -1032,27 +1032,26 @@ <flag>wxEXPAND</flag> </object> <object class="sizeritem"> - <object class="wxButton" name="wxID_APPLY"> - <label>Apply</label> + <object class="wxStdDialogButtonSizer"> + <object class="button"> + <object class="wxButton" name="wxID_APPLY"> + <label>Apply</label> + </object> + </object> + <object class="button"> + <object class="wxButton" name="wxID_OK"> + <label>OK</label> + <default>1</default> + </object> + </object> + <object class="button"> + <object class="wxButton" name="wxID_CANCEL"> + <label>Cancel</label> + </object> + </object> </object> - <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> + <flag>wxALL|wxEXPAND</flag> </object> - <object class="sizeritem"> - <object class="wxButton" name="wxID_CANCEL"> - <label>Cancel</label> - </object> - <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxButton" name="wxID_OK"> - <label>OK</label> - <default>1</default> - </object> - <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> </object> <flag>wxTOP|wxALL|wxEXPAND</flag> <border>5</border> Modified: hugin/trunk/src/hugin1/hugin/xrc/reset_dialog.xrc =================================================================== --- hugin/trunk/src/hugin1/hugin/xrc/reset_dialog.xrc 2010-03-25 22:08:15 UTC (rev 5091) +++ hugin/trunk/src/hugin1/hugin/xrc/reset_dialog.xrc 2010-03-25 22:12:17 UTC (rev 5092) @@ -92,25 +92,21 @@ <border>5</border> </object> <object class="sizeritem"> - <object class="wxBoxSizer"> - <orient>wxHORIZONTAL</orient> - <object class="sizeritem"> + <object class="wxStdDialogButtonSizer"> + <object class="button"> <object class="wxButton" name="wxID_OK"> <label>OK</label> <default>1</default> </object> - <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> </object> - <object class="sizeritem"> + <object class="button"> <object class="wxButton" name="wxID_CANCEL"> <label>Cancel</label> </object> - <flag>wxALL|wxEXPAND|wxALIGN_CENTRE|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> </object> </object> - <flag>wxALIGN_CENTRE_HORIZONTAL</flag> + <flag>wxEXPAND|wxALL</flag> + <border>5</border> </object> </object> </object> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |