From: Julian Smart Date: Wed, 3 Aug 2011 11:41:17 +0000 (+0000) Subject: Outline and line spacing can now be reset via the UI; format dialog layout improvements X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/41d9dcbc6047e00f84de319d8036c80dd711c638?hp=6e92c2991bb840f1eb9f551638fd64ca5b1b86ac Outline and line spacing can now be reset via the UI; format dialog layout improvements git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/richtext/richtextdialogs.pjd b/src/richtext/richtextdialogs.pjd index 82b5a5ff9e..3df8163d19 100644 --- a/src/richtext/richtextdialogs.pjd +++ b/src/richtext/richtextdialogs.pjd @@ -3067,7 +3067,6 @@ 1 0 0 - "3/10/2006" "wbStaticTextProxy" "wxID_STATIC" 5105 @@ -3130,115 +3129,87 @@ "" - "wxBoxSizer H" + "wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT" "dialog-control-document" "" - "sizer" + "textctrl" 0 1 0 0 - "3/10/2006" - "wbBoxSizerProxy" - "Horizontal" - "" + "wbTextCtrlProxy" + "wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftUpdated" + "ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT" + 10103 + "" + "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" + "m_indentLeft" + "" + 0 + "The left indent." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 50 + -1 "Expand" "Centre" 0 5 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 0 0 0 - "<Any platform>" - - "wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "3/10/2006" - "wbTextCtrlProxy" - "wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftUpdated" - "ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT" - 10103 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_indentLeft" - "" - 0 - "The left indent." - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 50 - -1 - "Centre" - "Centre" - 1 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - 0 - + "" + "" "wxStaticText: wxID_STATIC" @@ -3249,7 +3220,6 @@ 1 0 0 - "3/10/2006" "wbStaticTextProxy" "wxID_STATIC" 5105 @@ -3312,140 +3282,29 @@ "" - "wxBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "3/10/2006" - "wbBoxSizerProxy" - "Horizontal" - "" - "Expand" - "Centre" - 0 - 5 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "<Any platform>" - - "wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "3/10/2006" - "wbTextCtrlProxy" - "wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftFirstUpdated" - "ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST" - 10104 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_indentLeftFirst" - "" - 0 - "The first line indent." - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 50 - -1 - "Centre" - "Centre" - 1 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - 0 - - - - "wxStaticText: wxID_STATIC" + "wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST" "dialog-control-document" "" - "statictext" + "textctrl" 0 1 0 0 - "3/10/2006" - "wbStaticTextProxy" - "wxID_STATIC" - 5105 + "wbTextCtrlProxy" + "wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftFirstUpdated" + "ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST" + 10104 "" - "wxStaticText" - "wxStaticText" + "wxTextCtrl" + "wxTextCtrl" 1 0 "" "" - "" - "&Right:" - -1 - "" + "m_indentLeftFirst" + "" + 0 + "The first line indent." "" "" "" @@ -3460,10 +3319,22 @@ "" "" "" - 0 - 0 - 0 - 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 0 @@ -3477,9 +3348,9 @@ "" -1 -1 - -1 + 50 -1 - "Right" + "Expand" "Centre" 0 5 @@ -3494,115 +3365,157 @@ "" - "wxBoxSizer H" + "wxStaticText: wxID_STATIC" "dialog-control-document" "" - "sizer" + "statictext" 0 1 0 0 - "3/10/2006" - "wbBoxSizerProxy" - "Horizontal" + "wbStaticTextProxy" + "wxID_STATIC" + 5105 + "" + "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" - "Expand" + "&Right:" + -1 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Right" "Centre" 0 5 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 0 0 0 + "" + "" + + + "wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT" + "dialog-control-document" + "" + "textctrl" + 0 + 1 + 0 + 0 + "wbTextCtrlProxy" + "wxEVT_COMMAND_TEXT_UPDATED|OnIndentRightUpdated" + "ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT" + 10113 + "" + "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" + "m_indentRight" + "" + 0 + "The right indent." + "" + "" + "" + "" + 0 + 1 "<Any platform>" - - "wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "3/10/2006" - "wbTextCtrlProxy" - "wxEVT_COMMAND_TEXT_UPDATED|OnIndentRightUpdated" - "ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT" - 10113 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_indentRight" - "" - 0 - "The right indent." - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 50 - -1 - "Centre" - "Centre" - 1 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - 0 - + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 50 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" "wxStaticText: wxID_STATIC" @@ -3697,8 +3610,8 @@ "" "" "m_outlineLevelCtrl" - "Normal|1|2|3|4|5|6|7|8|9" - "Normal" + "(none)|1|2|3|4|5|6|7|8|9|10" + "(none)" "The outline level." "" "" @@ -3725,11 +3638,11 @@ "" -1 -1 - 90 + 85 -1 "Expand" "Centre" - 1 + 0 5 1 1 @@ -4010,7 +3923,7 @@ 0 "3/10/2006" "wbFlexGridSizerProxy" - "1" + "" "" 2 30 @@ -4038,7 +3951,6 @@ 1 0 0 - "3/10/2006" "wbStaticTextProxy" "wxID_STATIC" 5105 @@ -4101,115 +4013,87 @@ "" - "wxBoxSizer H" + "wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE" "dialog-control-document" "" - "sizer" + "textctrl" 0 1 0 0 - "3/10/2006" - "wbBoxSizerProxy" - "Horizontal" - "" + "wbTextCtrlProxy" + "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingBeforeUpdated" + "ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE" + 10114 + "" + "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" + "m_spacingBefore" + "" + 0 + "The spacing before the paragraph." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 50 + -1 "Expand" "Centre" 0 5 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 0 0 0 - "<Any platform>" - - "wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "3/10/2006" - "wbTextCtrlProxy" - "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingBeforeUpdated" - "ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE" - 10114 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_spacingBefore" - "" - 0 - "The spacing before the paragraph." - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 50 - -1 - "Centre" - "Centre" - 1 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - 0 - + "" + "" "wxStaticText: wxID_STATIC" @@ -4220,7 +4104,6 @@ 1 0 0 - "3/10/2006" "wbStaticTextProxy" "wxID_STATIC" 5105 @@ -4283,115 +4166,87 @@ "" - "wxBoxSizer H" + "wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER" "dialog-control-document" "" - "sizer" + "textctrl" 0 1 0 0 - "3/10/2006" - "wbBoxSizerProxy" - "Horizontal" - "" + "wbTextCtrlProxy" + "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingAfterUpdated" + "ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER" + 10116 + "" + "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" + "m_spacingAfter" + "" + 0 + "" + "The spacing after the paragraph." + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 50 + -1 "Expand" "Centre" - 1 + 0 5 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 0 0 0 - "<Any platform>" - - "wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "3/10/2006" - "wbTextCtrlProxy" - "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingAfterUpdated" - "ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER" - 10116 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_spacingAfter" - "" - 0 - "" - "The spacing after the paragraph." - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 50 - -1 - "Centre" - "Centre" - 1 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - 0 - + "" + "" "wxStaticText: wxID_STATIC" @@ -4465,96 +4320,69 @@ "" - "wxBoxSizer H" + "wxComboBox: ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE" "dialog-control-document" "" - "sizer" + "combobox" 0 1 0 0 - "3/10/2006" - "wbBoxSizerProxy" - "Horizontal" - "" + "wbComboBoxProxy" + "wxEVT_COMMAND_COMBOBOX_SELECTED|OnSpacingLineSelected" + "ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE" + 10115 + "" + "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" + "m_spacingLine" + "(none)|Single|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2" + "(none)" + "The line spacing." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 85 + -1 "Expand" "Centre" 0 5 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 0 0 0 - "<Any platform>" - - "wxComboBox: ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE" - "dialog-control-document" - "" - "combobox" - 0 - 1 - 0 - 0 - "3/10/2006" - "wbComboBoxProxy" - "wxEVT_COMMAND_COMBOBOX_SELECTED|OnSpacingLineSelected" - "ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE" - 10115 - "" - "wxComboBox" - "wxComboBox" - 1 - 0 - "" - "" - "m_spacingLine" - "Single|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2" - "Single" - "The line spacing." - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 90 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - + "" + "" @@ -13222,7 +13050,6 @@ 1 0 0 - "18/10/2006" "wbStaticTextProxy" "wxID_STATIC" 5105 @@ -13285,115 +13112,87 @@ "" - "wxBoxSizer H" + "wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT" "dialog-control-document" "" - "sizer" + "textctrl" 0 1 0 0 - "18/10/2006" - "wbBoxSizerProxy" - "Horizontal" - "" - "Centre" + "wbTextCtrlProxy" + "wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftUpdated" + "ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT" + 10634 + "" + "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" + "m_indentLeft" + "" + 0 + "The left indent." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 50 + -1 + "Expand" "Centre" 0 5 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 0 0 0 - "<Any platform>" - - "wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "18/10/2006" - "wbTextCtrlProxy" - "wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftUpdated" - "ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT" - 10634 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_indentLeft" - "" - 0 - "The left indent." - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 50 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - 0 - + "" + "" "wxStaticText: wxID_STATIC" @@ -13404,7 +13203,6 @@ 1 0 0 - "18/10/2006" "wbStaticTextProxy" "wxID_STATIC" 5105 @@ -13467,140 +13265,183 @@ "" - "wxBoxSizer H" + "wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE" "dialog-control-document" "" - "sizer" + "textctrl" + 0 + 1 + 0 + 0 + "wbTextCtrlProxy" + "wxEVT_COMMAND_TEXT_UPDATED|OnIndentFirstLineUpdated" + "ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE" + 10635 + "" + "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" + "m_indentLeftFirst" + "" + 0 + "The first line indent." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 50 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxStaticText: wxID_STATIC" + "dialog-control-document" + "" + "statictext" 0 1 0 0 "18/10/2006" - "wbBoxSizerProxy" - "Horizontal" + "wbStaticTextProxy" + "wxID_STATIC" + 5105 + "" + "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" - "Centre" + "&Right:" + -1 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Right" "Centre" 0 5 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 0 0 0 - "<Any platform>" - - "wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "18/10/2006" - "wbTextCtrlProxy" - "wxEVT_COMMAND_TEXT_UPDATED|OnIndentFirstLineUpdated" - "ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE" - 10635 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_indentLeftFirst" - "" - 0 - "The first line indent." - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 50 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - 0 - + "" + "" - "wxStaticText: wxID_STATIC" + "wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT" "dialog-control-document" "" - "statictext" + "textctrl" 0 1 0 0 - "18/10/2006" - "wbStaticTextProxy" - "wxID_STATIC" - 5105 + "wbTextCtrlProxy" + "wxEVT_COMMAND_TEXT_UPDATED|OnIndentRightUpdated" + "ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT" + 10636 "" - "wxStaticText" - "wxStaticText" + "wxTextCtrl" + "wxTextCtrl" 1 0 "" "" - "" - "&Right:" - -1 - "" + "m_indentRight" + "" + 0 + "The right indent." "" "" "" @@ -13615,10 +13456,22 @@ "" "" "" - 0 - 0 - 0 - 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 0 @@ -13632,9 +13485,9 @@ "" -1 -1 - -1 + 50 -1 - "Right" + "Expand" "Centre" 0 5 @@ -13648,117 +13501,6 @@ "" "" - - "wxBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "18/10/2006" - "wbBoxSizerProxy" - "Horizontal" - "" - "Centre" - "Centre" - 0 - 5 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "<Any platform>" - - "wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "18/10/2006" - "wbTextCtrlProxy" - "wxEVT_COMMAND_TEXT_UPDATED|OnIndentRightUpdated" - "ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT" - 10636 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_indentRight" - "" - 0 - "The right indent." - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 50 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - 0 - - @@ -14056,7 +13798,6 @@ 1 0 0 - "18/10/2006" "wbStaticTextProxy" "wxID_STATIC" 5105 @@ -14119,115 +13860,87 @@ "" - "wxBoxSizer H" + "wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE" "dialog-control-document" "" - "sizer" + "textctrl" 0 1 0 0 - "18/10/2006" - "wbBoxSizerProxy" - "Horizontal" - "" - "Centre" + "wbTextCtrlProxy" + "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingBeforeUpdated" + "ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE" + 10637 + "" + "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" + "m_spacingBefore" + "" + 0 + "The spacing before the paragraph." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 50 + -1 + "Expand" "Centre" 0 5 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 0 0 0 - "<Any platform>" - - "wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "18/10/2006" - "wbTextCtrlProxy" - "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingBeforeUpdated" - "ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE" - 10637 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_spacingBefore" - "" - 0 - "The spacing before the paragraph." - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 50 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - 0 - + "" + "" "wxStaticText: wxID_STATIC" @@ -14238,7 +13951,6 @@ 1 0 0 - "18/10/2006" "wbStaticTextProxy" "wxID_STATIC" 5105 @@ -14301,115 +14013,87 @@ "" - "wxBoxSizer H" + "wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER" "dialog-control-document" "" - "sizer" + "textctrl" 0 1 0 0 - "18/10/2006" - "wbBoxSizerProxy" - "Horizontal" - "" - "Centre" + "wbTextCtrlProxy" + "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingAfterUpdated" + "ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER" + 10638 + "" + "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" + "m_spacingAfter" + "" + 0 + "The spacing after the paragraph." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 50 + -1 + "Expand" "Centre" 0 5 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 0 0 0 - "<Any platform>" - - "wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER" - "dialog-control-document" - "" - "textctrl" - 0 - 1 - 0 - 0 - "18/10/2006" - "wbTextCtrlProxy" - "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingAfterUpdated" - "ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER" - 10638 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 - "" - "" - "m_spacingAfter" - "" - 0 - "The spacing after the paragraph." - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - 50 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - 0 - + "" + "" "wxStaticText: wxID_STATIC" @@ -14483,96 +14167,69 @@ "" - "wxBoxSizer H" + "wxComboBox: ID_RICHTEXTLISTSTYLEPAGE_LINESPACING" "dialog-control-document" "" - "sizer" + "combobox" 0 1 0 0 - "18/10/2006" - "wbBoxSizerProxy" - "Horizontal" - "" - "Centre" + "wbComboBoxProxy" + "wxEVT_COMMAND_COMBOBOX_SELECTED|OnLineSpacingSelected" + "ID_RICHTEXTLISTSTYLEPAGE_LINESPACING" + 10639 + "" + "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" + "m_spacingLine" + "(none)|Single|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2" + "(none)" + "The line spacing." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 85 + -1 + "Expand" "Centre" 0 5 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 0 0 0 - "<Any platform>" - - "wxComboBox: ID_RICHTEXTLISTSTYLEPAGE_LINESPACING" - "dialog-control-document" - "" - "combobox" - 0 - 1 - 0 - 0 - "18/10/2006" - "wbComboBoxProxy" - "wxEVT_COMMAND_COMBOBOX_SELECTED|OnLineSpacingSelected" - "ID_RICHTEXTLISTSTYLEPAGE_LINESPACING" - 10639 - "" - "wxComboBox" - "wxComboBox" - 1 - 0 - "" - "" - "m_spacingLine" - "Single|1.5|2" - "Single" - "The line spacing." - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - + "" + "" @@ -14851,6 +14508,14 @@ "wbBoxSizerProxy" "Vertical" "" + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 0 0 0 diff --git a/src/richtext/richtextindentspage.cpp b/src/richtext/richtextindentspage.cpp index f73bb16211..626de8d2d1 100644 --- a/src/richtext/richtextindentspage.cpp +++ b/src/richtext/richtextindentspage.cpp @@ -207,44 +207,35 @@ void wxRichTextIndentsSpacingPage::CreateControls() wxStaticText* itemStaticText23 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Left:"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer22->Add(itemStaticText23, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer24 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer22->Add(itemBoxSizer24, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); - m_indentLeft = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); m_indentLeft->SetHelpText(_("The left indent.")); if (wxRichTextIndentsSpacingPage::ShowToolTips()) m_indentLeft->SetToolTip(_("The left indent.")); - itemBoxSizer24->Add(m_indentLeft, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxStaticText* itemStaticText26 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Left (&first line):"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer22->Add(itemStaticText26, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer22->Add(m_indentLeft, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer27 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer22->Add(itemBoxSizer27, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); + wxStaticText* itemStaticText25 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Left (&first line):"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer22->Add(itemStaticText25, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_indentLeftFirst = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); m_indentLeftFirst->SetHelpText(_("The first line indent.")); if (wxRichTextIndentsSpacingPage::ShowToolTips()) m_indentLeftFirst->SetToolTip(_("The first line indent.")); - itemBoxSizer27->Add(m_indentLeftFirst, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxStaticText* itemStaticText29 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Right:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer22->Add(itemStaticText29, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer22->Add(m_indentLeftFirst, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer30 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer22->Add(itemBoxSizer30, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); + wxStaticText* itemStaticText27 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Right:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer22->Add(itemStaticText27, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_indentRight = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); m_indentRight->SetHelpText(_("The right indent.")); if (wxRichTextIndentsSpacingPage::ShowToolTips()) m_indentRight->SetToolTip(_("The right indent.")); - itemBoxSizer30->Add(m_indentRight, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer22->Add(m_indentRight, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText32 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Outline level:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer22->Add(itemStaticText32, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticText29 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Outline level:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer22->Add(itemStaticText29, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString m_outlineLevelCtrlStrings; - m_outlineLevelCtrlStrings.Add(_("Normal")); + m_outlineLevelCtrlStrings.Add(_("(none)")); m_outlineLevelCtrlStrings.Add(_("1")); m_outlineLevelCtrlStrings.Add(_("2")); m_outlineLevelCtrlStrings.Add(_("3")); @@ -254,65 +245,57 @@ void wxRichTextIndentsSpacingPage::CreateControls() m_outlineLevelCtrlStrings.Add(_("7")); m_outlineLevelCtrlStrings.Add(_("8")); m_outlineLevelCtrlStrings.Add(_("9")); - m_outlineLevelCtrl = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL, _("Normal"), wxDefaultPosition, wxSize(90, -1), m_outlineLevelCtrlStrings, wxCB_READONLY ); - m_outlineLevelCtrl->SetStringSelection(_("Normal")); + m_outlineLevelCtrlStrings.Add(_("10")); + m_outlineLevelCtrl = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL, _("(none)"), wxDefaultPosition, wxSize(85, -1), m_outlineLevelCtrlStrings, wxCB_READONLY ); + m_outlineLevelCtrl->SetStringSelection(_("(none)")); m_outlineLevelCtrl->SetHelpText(_("The outline level.")); if (wxRichTextIndentsSpacingPage::ShowToolTips()) m_outlineLevelCtrl->SetToolTip(_("The outline level.")); - itemFlexGridSizer22->Add(m_outlineLevelCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer22->Add(m_outlineLevelCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer4->Add(2, 1, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5); - wxStaticLine* itemStaticLine35 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); - itemBoxSizer4->Add(itemStaticLine35, 0, wxGROW|wxTOP|wxBOTTOM, 5); + wxStaticLine* itemStaticLine32 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); + itemBoxSizer4->Add(itemStaticLine32, 0, wxGROW|wxTOP|wxBOTTOM, 5); itemBoxSizer4->Add(2, 1, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5); - wxBoxSizer* itemBoxSizer37 = new wxBoxSizer(wxVERTICAL); - itemBoxSizer4->Add(itemBoxSizer37, 0, wxGROW, 5); - - wxStaticText* itemStaticText38 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Spacing (tenths of a mm)"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer37->Add(itemStaticText38, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); + wxBoxSizer* itemBoxSizer34 = new wxBoxSizer(wxVERTICAL); + itemBoxSizer4->Add(itemBoxSizer34, 0, wxGROW, 5); - wxBoxSizer* itemBoxSizer39 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer37->Add(itemBoxSizer39, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText35 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Spacing (tenths of a mm)"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer34->Add(itemStaticText35, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); - itemBoxSizer39->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL, 5); + wxBoxSizer* itemBoxSizer36 = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer34->Add(itemBoxSizer36, 0, wxALIGN_LEFT|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer41 = new wxFlexGridSizer(30, 2, 0, 0); - itemFlexGridSizer41->AddGrowableCol(1); - itemBoxSizer39->Add(itemFlexGridSizer41, 0, wxALIGN_CENTER_VERTICAL, 5); + itemBoxSizer36->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL, 5); - wxStaticText* itemStaticText42 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Before a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer41->Add(itemStaticText42, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer38 = new wxFlexGridSizer(30, 2, 0, 0); + itemBoxSizer36->Add(itemFlexGridSizer38, 0, wxALIGN_CENTER_VERTICAL, 5); - wxBoxSizer* itemBoxSizer43 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer41->Add(itemBoxSizer43, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); + wxStaticText* itemStaticText39 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Before a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer38->Add(itemStaticText39, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_spacingBefore = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); m_spacingBefore->SetHelpText(_("The spacing before the paragraph.")); if (wxRichTextIndentsSpacingPage::ShowToolTips()) m_spacingBefore->SetToolTip(_("The spacing before the paragraph.")); - itemBoxSizer43->Add(m_spacingBefore, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer38->Add(m_spacingBefore, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText45 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&After a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer41->Add(itemStaticText45, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxBoxSizer* itemBoxSizer46 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer41->Add(itemBoxSizer46, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5); + wxStaticText* itemStaticText41 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&After a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer38->Add(itemStaticText41, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_spacingAfter = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); if (wxRichTextIndentsSpacingPage::ShowToolTips()) m_spacingAfter->SetToolTip(_("The spacing after the paragraph.")); - itemBoxSizer46->Add(m_spacingAfter, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxStaticText* itemStaticText48 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("L&ine spacing:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer41->Add(itemStaticText48, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer38->Add(m_spacingAfter, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer49 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer41->Add(itemBoxSizer49, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); + wxStaticText* itemStaticText43 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("L&ine spacing:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer38->Add(itemStaticText43, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString m_spacingLineStrings; + m_spacingLineStrings.Add(_("(none)")); m_spacingLineStrings.Add(_("Single")); m_spacingLineStrings.Add(_("1.1")); m_spacingLineStrings.Add(_("1.2")); @@ -324,12 +307,12 @@ void wxRichTextIndentsSpacingPage::CreateControls() m_spacingLineStrings.Add(_("1.8")); m_spacingLineStrings.Add(_("1.9")); m_spacingLineStrings.Add(_("2")); - m_spacingLine = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE, _("Single"), wxDefaultPosition, wxSize(90, -1), m_spacingLineStrings, wxCB_READONLY ); - m_spacingLine->SetStringSelection(_("Single")); + m_spacingLine = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE, _("(none)"), wxDefaultPosition, wxSize(85, -1), m_spacingLineStrings, wxCB_READONLY ); + m_spacingLine->SetStringSelection(_("(none)")); m_spacingLine->SetHelpText(_("The line spacing.")); if (wxRichTextIndentsSpacingPage::ShowToolTips()) m_spacingLine->SetToolTip(_("The line spacing.")); - itemBoxSizer49->Add(m_spacingLine, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer38->Add(m_spacingLine, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5); @@ -448,9 +431,9 @@ bool wxRichTextIndentsSpacingPage::TransferDataFromWindow() else attr->SetFlags(attr->GetFlags() & (~wxTEXT_ATTR_PARA_SPACING_BEFORE)); - int spacingIndex = m_spacingLine->GetSelection(); + int spacingIndex = m_spacingLine->GetSelection() - 1; int lineSpacing = 0; - if (spacingIndex != -1) + if (spacingIndex > -1) lineSpacing = 10 + spacingIndex; if (lineSpacing == 0) @@ -459,8 +442,13 @@ bool wxRichTextIndentsSpacingPage::TransferDataFromWindow() attr->SetLineSpacing(lineSpacing); int outlineLevel = m_outlineLevelCtrl->GetSelection(); - if (outlineLevel != wxNOT_FOUND) - attr->SetOutlineLevel(outlineLevel); + if (outlineLevel == wxNOT_FOUND || outlineLevel == 0) + { + attr->SetOutlineLevel(-1); + attr->SetFlags(attr->GetFlags() & (~wxTEXT_ATTR_OUTLINE_LEVEL)); + } + else + attr->SetOutlineLevel(outlineLevel-1); return true; } @@ -536,14 +524,14 @@ bool wxRichTextIndentsSpacingPage::TransferDataToWindow() int lineSpacing = attr->GetLineSpacing(); if (lineSpacing >= 10 && lineSpacing <= 20) - index = lineSpacing - 10; + index = (lineSpacing - 10) + 1; else - index = -1; + index = 0; m_spacingLine->SetSelection(index); } else - m_spacingLine->SetSelection(-1); + m_spacingLine->SetSelection(0); if (attr->HasOutlineLevel()) { @@ -553,10 +541,10 @@ bool wxRichTextIndentsSpacingPage::TransferDataToWindow() if (outlineLevel > 9) outlineLevel = 9; - m_outlineLevelCtrl->SetSelection(outlineLevel); + m_outlineLevelCtrl->SetSelection(outlineLevel+1); } else - m_outlineLevelCtrl->SetSelection(-1); + m_outlineLevelCtrl->SetSelection(0); UpdatePreview(); diff --git a/src/richtext/richtextliststylepage.cpp b/src/richtext/richtextliststylepage.cpp index ec7a360cde..9f7710fe82 100644 --- a/src/richtext/richtextliststylepage.cpp +++ b/src/richtext/richtextliststylepage.cpp @@ -382,91 +382,88 @@ void wxRichTextListStylePage::CreateControls() wxStaticText* itemStaticText58 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Left:"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer57->Add(itemStaticText58, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer59 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer57->Add(itemBoxSizer59, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); m_indentLeft = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); m_indentLeft->SetHelpText(_("The left indent.")); if (wxRichTextListStylePage::ShowToolTips()) m_indentLeft->SetToolTip(_("The left indent.")); - itemBoxSizer59->Add(m_indentLeft, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer57->Add(m_indentLeft, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText61 = new wxStaticText( itemPanel37, wxID_STATIC, _("Left (&first line):"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer57->Add(itemStaticText61, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticText60 = new wxStaticText( itemPanel37, wxID_STATIC, _("Left (&first line):"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer57->Add(itemStaticText60, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer62 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer57->Add(itemBoxSizer62, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); m_indentLeftFirst = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); m_indentLeftFirst->SetHelpText(_("The first line indent.")); if (wxRichTextListStylePage::ShowToolTips()) m_indentLeftFirst->SetToolTip(_("The first line indent.")); - itemBoxSizer62->Add(m_indentLeftFirst, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer57->Add(m_indentLeftFirst, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText64 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Right:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer57->Add(itemStaticText64, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticText62 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Right:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer57->Add(itemStaticText62, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer65 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer57->Add(itemBoxSizer65, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); m_indentRight = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); m_indentRight->SetHelpText(_("The right indent.")); if (wxRichTextListStylePage::ShowToolTips()) m_indentRight->SetToolTip(_("The right indent.")); - itemBoxSizer65->Add(m_indentRight, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer57->Add(m_indentRight, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer39->Add(2, 1, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5); - wxStaticLine* itemStaticLine68 = new wxStaticLine( itemPanel37, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); - itemBoxSizer39->Add(itemStaticLine68, 0, wxGROW|wxTOP|wxBOTTOM, 5); + wxStaticLine* itemStaticLine65 = new wxStaticLine( itemPanel37, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); + itemBoxSizer39->Add(itemStaticLine65, 0, wxGROW|wxTOP|wxBOTTOM, 5); itemBoxSizer39->Add(2, 1, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5); - wxBoxSizer* itemBoxSizer70 = new wxBoxSizer(wxVERTICAL); - itemBoxSizer39->Add(itemBoxSizer70, 0, wxGROW, 5); - wxStaticText* itemStaticText71 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Spacing (tenths of a mm)"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer70->Add(itemStaticText71, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); + wxBoxSizer* itemBoxSizer67 = new wxBoxSizer(wxVERTICAL); + itemBoxSizer39->Add(itemBoxSizer67, 0, wxGROW, 5); + wxStaticText* itemStaticText68 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Spacing (tenths of a mm)"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer67->Add(itemStaticText68, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); - wxBoxSizer* itemBoxSizer72 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer70->Add(itemBoxSizer72, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer72->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL, 5); + wxBoxSizer* itemBoxSizer69 = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer67->Add(itemBoxSizer69, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer69->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL, 5); - wxFlexGridSizer* itemFlexGridSizer74 = new wxFlexGridSizer(0, 2, 0, 0); - itemBoxSizer72->Add(itemFlexGridSizer74, 0, wxALIGN_CENTER_VERTICAL, 5); - wxStaticText* itemStaticText75 = new wxStaticText( itemPanel37, wxID_STATIC, _("Before a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer74->Add(itemStaticText75, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer71 = new wxFlexGridSizer(0, 2, 0, 0); + itemBoxSizer69->Add(itemFlexGridSizer71, 0, wxALIGN_CENTER_VERTICAL, 5); + wxStaticText* itemStaticText72 = new wxStaticText( itemPanel37, wxID_STATIC, _("Before a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer71->Add(itemStaticText72, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer76 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer74->Add(itemBoxSizer76, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); m_spacingBefore = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); m_spacingBefore->SetHelpText(_("The spacing before the paragraph.")); if (wxRichTextListStylePage::ShowToolTips()) m_spacingBefore->SetToolTip(_("The spacing before the paragraph.")); - itemBoxSizer76->Add(m_spacingBefore, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer71->Add(m_spacingBefore, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText78 = new wxStaticText( itemPanel37, wxID_STATIC, _("After a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer74->Add(itemStaticText78, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticText74 = new wxStaticText( itemPanel37, wxID_STATIC, _("After a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer71->Add(itemStaticText74, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer79 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer74->Add(itemBoxSizer79, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); m_spacingAfter = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); m_spacingAfter->SetHelpText(_("The spacing after the paragraph.")); if (wxRichTextListStylePage::ShowToolTips()) m_spacingAfter->SetToolTip(_("The spacing after the paragraph.")); - itemBoxSizer79->Add(m_spacingAfter, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer71->Add(m_spacingAfter, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText81 = new wxStaticText( itemPanel37, wxID_STATIC, _("Line spacing:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer74->Add(itemStaticText81, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticText76 = new wxStaticText( itemPanel37, wxID_STATIC, _("Line spacing:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer71->Add(itemStaticText76, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer82 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer74->Add(itemBoxSizer82, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); wxArrayString m_spacingLineStrings; + m_spacingLineStrings.Add(_("(none)")); m_spacingLineStrings.Add(_("Single")); + m_spacingLineStrings.Add(_("1.1")); + m_spacingLineStrings.Add(_("1.2")); + m_spacingLineStrings.Add(_("1.3")); + m_spacingLineStrings.Add(_("1.4")); m_spacingLineStrings.Add(_("1.5")); + m_spacingLineStrings.Add(_("1.6")); + m_spacingLineStrings.Add(_("1.7")); + m_spacingLineStrings.Add(_("1.8")); + m_spacingLineStrings.Add(_("1.9")); m_spacingLineStrings.Add(_("2")); - m_spacingLine = new wxComboBox( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_LINESPACING, _("Single"), wxDefaultPosition, wxDefaultSize, m_spacingLineStrings, wxCB_READONLY ); - m_spacingLine->SetStringSelection(_("Single")); + m_spacingLine = new wxComboBox( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_LINESPACING, _("(none)"), wxDefaultPosition, wxSize(85, -1), m_spacingLineStrings, wxCB_READONLY ); + m_spacingLine->SetStringSelection(_("(none)")); m_spacingLine->SetHelpText(_("The line spacing.")); if (wxRichTextListStylePage::ShowToolTips()) m_spacingLine->SetToolTip(_("The line spacing.")); - itemBoxSizer82->Add(m_spacingLine, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer71->Add(m_spacingLine, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); itemNotebook9->AddPage(itemPanel37, _("Spacing")); @@ -631,14 +628,10 @@ bool wxRichTextListStylePage::TransferDataFromWindow() else attr->SetFlags(attr->GetFlags() & (~wxTEXT_ATTR_PARA_SPACING_BEFORE)); - int spacingIndex = m_spacingLine->GetSelection(); + int spacingIndex = m_spacingLine->GetSelection() - 1; int lineSpacing = 0; - if (spacingIndex == 0) - lineSpacing = 10; - else if (spacingIndex == 1) - lineSpacing = 15; - else if (spacingIndex == 2) - lineSpacing = 20; + if (spacingIndex > -1) + lineSpacing = 10 + spacingIndex; if (lineSpacing == 0) attr->SetFlags(attr->GetFlags() & (~wxTEXT_ATTR_LINE_SPACING)); @@ -785,19 +778,15 @@ void wxRichTextListStylePage::DoTransferDataToWindow() int index = 0; int lineSpacing = attr->GetLineSpacing(); - if (lineSpacing == 10) - index = 0; - else if (lineSpacing == 15) - index = 1; - else if (lineSpacing == 20) - index = 2; + if (lineSpacing >= 10 && lineSpacing <= 20) + index = (lineSpacing - 10) + 1; else - index = -1; + index = 0; m_spacingLine->SetSelection(index); } else - m_spacingLine->SetSelection(-1); + m_spacingLine->SetSelection(0); /// BULLETS if (attr->HasBulletStyle())