From ce04fea5942b08030a0e1734767112a638a09226 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 24 Oct 2007 14:21:08 +0000 Subject: [PATCH] Small usability improvements git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/richtext/richtextstyledlg.h | 1 + src/richtext/richtextdialogs.pjd | 2114 +++++++++++++++++++++++- src/richtext/richtextstyledlg.cpp | 41 +- 3 files changed, 2083 insertions(+), 73 deletions(-) diff --git a/include/wx/richtext/richtextstyledlg.h b/include/wx/richtext/richtextstyledlg.h index 9992ffeb29..3e2a6c774a 100644 --- a/include/wx/richtext/richtextstyledlg.h +++ b/include/wx/richtext/richtextstyledlg.h @@ -210,6 +210,7 @@ public: enum { ID_RICHTEXTSTYLEORGANISERDIALOG = 10500, ID_RICHTEXTSTYLEORGANISERDIALOG_STYLES = 10501, + ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE = 10510, ID_RICHTEXTSTYLEORGANISERDIALOG_PREVIEW = 10509, ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR = 10504, ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA = 10505, diff --git a/src/richtext/richtextdialogs.pjd b/src/richtext/richtextdialogs.pjd index 3903f17406..b9f3d5aca1 100644 --- a/src/richtext/richtextdialogs.pjd +++ b/src/richtext/richtextdialogs.pjd @@ -6,13 +6,14 @@ "" "" "" - 285 "" 0 0 0 + 1 1 1 + 1 0 "Julian Smart" "(c) Julian Smart" @@ -44,12 +45,6 @@ // Licence: ///////////////////////////////////////////////////////////////////////////// -" - " -/*! - * %BODY% - */ - " "///////////////////////////////////////////////////////////////////////////// // Name: %SYMBOLS-FILENAME% @@ -83,6 +78,14 @@ #include "wx/wx.h" #endif +" + " /// %BODY% +" + " +/*! + * %BODY% + */ + " "app_resources.h" "app_resources.cpp" @@ -94,6 +97,7 @@ "" "<None>" "iso-8859-1" + "utf-8" "utf-8" "" 0 @@ -106,7 +110,9 @@ 1 1 1 + 0 1 + 0 @@ -183,7 +189,7 @@ 1 1 0 - 0 + 1 "Windows" "html-document" @@ -207,7 +213,10 @@ 10000 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTFONTPAGE" 10000 "wxRichTextFontPage" @@ -228,6 +237,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 1 @@ -260,6 +276,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -282,6 +299,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -306,6 +324,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -330,6 +349,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -354,6 +374,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -369,7 +390,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Font:" -1 @@ -383,6 +410,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -410,6 +442,7 @@ 1 0 0 + 0 0 "" "" @@ -428,7 +461,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnFaceTextCtrlUpdated" "ID_RICHTEXTFONTPAGE_FACETEXTCTRL" 10001 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_faceTextCtrl" "" 0 @@ -442,6 +481,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -455,8 +499,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -480,9 +525,11 @@ 1 0 0 + 0 0 "" "" + 0 "wxRichTextFontListBox: ID_RICHTEXTFONTPAGE_FACELISTBOX" @@ -497,10 +544,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTFONTPAGE_FACELISTBOX" 10002 + "" "wxRichTextFontListBox" "wxWindow" - "m_faceListBox" 1 + 0 + "" + "" + "m_faceListBox" 1 "Lists the available fonts." "" @@ -512,6 +563,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -539,10 +595,11 @@ 1 1 0 + 0 1 - "" "" "" + "" @@ -567,6 +624,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -582,7 +640,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Size:" -1 @@ -596,6 +660,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -623,6 +692,7 @@ 1 0 0 + 0 0 "" "" @@ -641,7 +711,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnSizeTextCtrlUpdated" "ID_RICHTEXTFONTPAGE_SIZETEXTCTRL" 10005 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_sizeTextCtrl" "" 0 @@ -655,6 +731,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -668,8 +749,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -693,9 +775,11 @@ 1 0 0 + 0 0 "" "" + 0 "wxListBox: ID_RICHTEXTFONTPAGE_SIZELISTBOX" @@ -711,7 +795,13 @@ "wxEVT_COMMAND_LISTBOX_SELECTED|OnSizeListBoxSelected" "ID_RICHTEXTFONTPAGE_SIZELISTBOX" 10006 + "" "wxListBox" + "wxListBox" + 1 + 0 + "" + "" "m_sizeListBox" "" "" @@ -725,6 +815,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -755,6 +850,7 @@ 1 1 0 + 0 1 "" "" @@ -783,6 +879,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -807,6 +904,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -822,7 +920,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Font st&yle:" -1 @@ -836,6 +940,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -863,6 +972,7 @@ 1 0 0 + 0 0 "" "" @@ -881,7 +991,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnStyleCtrlSelected" "ID_RICHTEXTFONTPAGE_STYLECTRL" 10007 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_styleCtrl" "" "" @@ -895,6 +1011,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -916,6 +1037,7 @@ 1 1 0 + 0 0 "" "" @@ -943,6 +1065,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -958,7 +1081,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Font &weight:" -1 @@ -972,6 +1101,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -999,6 +1133,7 @@ 1 0 0 + 0 0 "" "" @@ -1017,7 +1152,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnWeightCtrlSelected" "ID_RICHTEXTFONTPAGE_WEIGHTCTRL" 10004 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_weightCtrl" "" "" @@ -1031,6 +1172,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -1052,6 +1198,7 @@ 1 1 0 + 0 0 "" "" @@ -1079,6 +1226,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -1094,7 +1242,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Underlining:" -1 @@ -1108,6 +1262,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -1135,6 +1294,7 @@ 1 0 0 + 0 0 "" "" @@ -1153,7 +1313,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnUnderliningCtrlSelected" "ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL" 10008 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_underliningCtrl" "" "" @@ -1167,6 +1333,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -1188,6 +1359,7 @@ 1 1 0 + 0 0 "" "" @@ -1215,6 +1387,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -1230,7 +1403,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Colour:" -1 @@ -1244,6 +1423,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -1271,6 +1455,7 @@ 1 0 0 + 0 0 "" "" @@ -1288,10 +1473,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTFONTPAGE_COLOURCTRL" 10009 + "" "wxRichTextColourSwatchCtrl" "wxWindow" - "m_colourCtrl" 1 + 0 + "" + "" + "m_colourCtrl" 1 "Click to change the text colour." "" @@ -1303,6 +1492,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -1330,10 +1524,11 @@ 1 1 0 + 0 0 - "" "" "" + "" @@ -1359,6 +1554,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -1375,7 +1571,13 @@ "wxEVT_COMMAND_CHECKBOX_CLICKED|OnStrikethroughctrlClick" "ID_RICHTEXTFONTPAGE_STRIKETHROUGHCTRL" 10010 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_strikethroughCtrl" "&Strikethrough" 0 @@ -1383,6 +1585,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -1410,6 +1617,7 @@ 1 1 0 + 0 0 "" "" @@ -1428,7 +1636,13 @@ "wxEVT_COMMAND_CHECKBOX_CLICKED|OnCapsctrlClick" "ID_RICHTEXTFONTPAGE_CAPSCTRL" 10011 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_capitalsCtrl" "Ca&pitals" 0 @@ -1436,6 +1650,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -1463,6 +1682,7 @@ 1 1 0 + 0 0 "" "" @@ -1490,6 +1710,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -1506,10 +1727,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTFONTPAGE_PREVIEWCTRL" 10003 + "" "wxRichTextFontPreviewCtrl" "wxWindow" - "m_previewCtrl" 1 + 0 + "" + "" + "m_previewCtrl" 1 "Shows a preview of the font settings." "" @@ -1521,6 +1746,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -1548,10 +1778,11 @@ 1 1 0 + 0 0 - "" "" "" + "" @@ -1570,7 +1801,10 @@ 10100 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTINDENTSSPACINGPAGE" 10100 "wxRichTextIndentsSpacingPage" @@ -1591,6 +1825,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 1 @@ -1623,6 +1864,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -1637,7 +1879,16 @@ "wbBoxSizerProxy" "Vertical" "" + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 0 + 0 0 "<Any platform>" @@ -1662,6 +1913,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -1686,6 +1938,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -1710,6 +1963,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -1725,7 +1979,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Alignment" -1 @@ -1739,6 +1999,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -1766,6 +2031,7 @@ 1 0 0 + 0 0 "" "" @@ -1792,6 +2058,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -1816,6 +2083,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -1841,6 +2109,7 @@ 1 0 0 + 0 0 "<Any platform>" @@ -1857,7 +2126,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnAlignmentLeftSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_LEFT" 10102 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentLeft" "&Left" 0 @@ -1871,6 +2146,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -1890,6 +2170,7 @@ 1 1 0 + 0 0 "" "" @@ -1908,7 +2189,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnAlignmentRightSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_RIGHT" 10110 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentRight" "&Right" 0 @@ -1922,6 +2209,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -1941,6 +2233,7 @@ 1 1 0 + 0 0 "" "" @@ -1959,7 +2252,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnAlignmentJustifiedSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_JUSTIFIED" 10111 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentJustified" "&Justified" 0 @@ -1973,6 +2272,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -1992,6 +2296,7 @@ 1 1 0 + 0 0 "" "" @@ -2010,7 +2315,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnAlignmentCentredSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_CENTRED" 10112 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentCentred" "Cen&tred" 0 @@ -2024,6 +2335,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2043,6 +2359,7 @@ 1 1 0 + 0 0 "" "" @@ -2061,7 +2378,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnAlignmentIndeterminateSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_INDETERMINATE" 10101 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentIndeterminate" "&Indeterminate" 0 @@ -2075,6 +2398,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2094,6 +2422,7 @@ 1 1 0 + 0 0 "" "" @@ -2123,6 +2452,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -2139,7 +2469,13 @@ "wbStaticLineProxy" "wxID_STATIC" 5105 + "" "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" "" "" "" @@ -2172,6 +2508,7 @@ 0 1 0 + 0 0 @@ -2196,6 +2533,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -2221,6 +2559,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -2236,7 +2575,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Indentation (tenths of a mm)" -1 @@ -2250,6 +2595,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2277,6 +2627,7 @@ 1 0 0 + 0 0 "" "" @@ -2303,6 +2654,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -2327,6 +2679,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -2358,6 +2711,7 @@ 0 0 0 + 0 0 "wxStaticText: wxID_STATIC" @@ -2372,7 +2726,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Left:" -1 @@ -2386,6 +2746,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2413,6 +2778,7 @@ 1 1 0 + 0 0 "" "" @@ -2439,6 +2805,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -2455,7 +2822,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftUpdated" "ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT" 10103 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_indentLeft" "" 0 @@ -2469,6 +2842,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2482,8 +2860,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -2507,9 +2886,11 @@ 1 1 0 + 0 0 "" "" + 0 @@ -2525,7 +2906,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Left (&first line):" -1 @@ -2539,6 +2926,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2566,6 +2958,7 @@ 1 1 0 + 0 0 "" "" @@ -2592,6 +2985,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -2608,7 +3002,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftFirstUpdated" "ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST" 10104 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_indentLeftFirst" "" 0 @@ -2622,6 +3022,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2635,8 +3040,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -2660,9 +3066,11 @@ 1 1 0 + 0 0 "" "" + 0 @@ -2678,7 +3086,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Right:" -1 @@ -2692,6 +3106,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2719,6 +3138,7 @@ 1 1 0 + 0 0 "" "" @@ -2745,6 +3165,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -2761,7 +3182,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnIndentRightUpdated" "ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT" 10113 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_indentRight" "" 0 @@ -2775,6 +3202,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2788,8 +3220,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -2813,9 +3246,11 @@ 1 1 0 + 0 0 "" "" + 0 @@ -2831,7 +3266,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Outline level:" -1 @@ -2845,6 +3286,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2872,6 +3318,7 @@ 1 1 0 + 0 0 "" "" @@ -2890,7 +3337,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextOutlinelevelSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL" 10105 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_outlineLevelCtrl" "Normal|1|2|3|4|5|6|7|8|9" "Normal" @@ -2904,6 +3357,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -2925,6 +3383,7 @@ 1 1 0 + 0 0 "" "" @@ -2954,6 +3413,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -2970,7 +3430,13 @@ "wbStaticLineProxy" "wxID_STATIC" 5105 + "" "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" "" "" "" @@ -3003,6 +3469,7 @@ 1 1 0 + 0 0 @@ -3027,6 +3494,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -3052,6 +3520,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -3067,7 +3536,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Spacing (tenths of a mm)" -1 @@ -3081,6 +3556,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3108,6 +3588,7 @@ 1 0 0 + 0 0 "" "" @@ -3134,6 +3615,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -3158,6 +3640,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -3189,6 +3672,7 @@ 0 0 0 + 0 0 "wxStaticText: wxID_STATIC" @@ -3203,7 +3687,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Before a paragraph:" -1 @@ -3217,6 +3707,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3244,6 +3739,7 @@ 1 1 0 + 0 0 "" "" @@ -3270,6 +3766,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -3286,7 +3783,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingBeforeUpdated" "ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE" 10114 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_spacingBefore" "" 0 @@ -3300,6 +3803,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3313,8 +3821,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -3338,9 +3847,11 @@ 1 1 0 + 0 0 "" "" + 0 @@ -3356,7 +3867,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&After a paragraph:" -1 @@ -3370,6 +3887,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3397,6 +3919,7 @@ 1 1 0 + 0 0 "" "" @@ -3423,6 +3946,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -3439,7 +3963,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingAfterUpdated" "ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER" 10116 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_spacingAfter" "" 0 @@ -3453,6 +3983,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3466,8 +4001,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -3491,9 +4027,11 @@ 1 1 0 + 0 0 "" "" + 0 @@ -3509,7 +4047,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "L&ine spacing:" -1 @@ -3523,6 +4067,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3550,6 +4099,7 @@ 1 1 0 + 0 0 "" "" @@ -3576,6 +4126,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -3592,7 +4143,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnSpacingLineSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE" 10115 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_spacingLine" "Single|1.5|2" "Single" @@ -3606,6 +4163,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -3627,6 +4189,7 @@ 1 1 0 + 0 0 "" "" @@ -3658,6 +4221,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -3674,10 +4238,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTINDENTSSPACINGPAGE_PREVIEW_CTRL" 10109 + "" "wxRichTextCtrl" "wxWindow" - "m_previewCtrl" 1 + 0 + "" + "" + "m_previewCtrl" 1 "Shows a preview of the paragraph settings." "" @@ -3689,6 +4257,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3716,10 +4289,11 @@ 1 1 0 + 0 0 - "" "%PARENT%, %ID%, wxEmptyString, %POSITION%, %SIZE%, %STYLE%" "" + "" @@ -3738,7 +4312,10 @@ 10200 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTTABSPAGE" 10200 "wxRichTextTabsPage" @@ -3759,6 +4336,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 1 @@ -3791,6 +4375,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -3814,6 +4399,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -3838,6 +4424,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -3862,6 +4449,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -3886,6 +4474,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -3901,7 +4490,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Position (tenths of a mm):" -1 @@ -3915,6 +4510,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3942,6 +4542,7 @@ 1 0 0 + 0 0 "" "" @@ -3959,7 +4560,13 @@ "wbTextCtrlProxy" "ID_RICHTEXTTABSPAGE_TABEDIT" 10213 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_tabEditCtrl" "" 0 @@ -3973,6 +4580,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3986,8 +4598,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -4011,9 +4624,11 @@ 1 1 0 + 0 0 "" "" + 0 "wxListBox: ID_RICHTEXTTABSPAGE_TABLIST" @@ -4029,7 +4644,13 @@ "wxEVT_COMMAND_LISTBOX_SELECTED|OnTablistSelected" "ID_RICHTEXTTABSPAGE_TABLIST" 10214 + "" "wxListBox" + "wxListBox" + 1 + 0 + "" + "" "m_tabListCtrl" "The tab positions." "" @@ -4043,6 +4664,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -4073,6 +4699,7 @@ 0 1 0 + 0 0 "" "" @@ -4100,6 +4727,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -4125,6 +4753,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -4140,7 +4769,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "" -1 @@ -4154,6 +4789,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -4181,6 +4821,7 @@ 0 1 0 + 0 0 "" "" @@ -4200,12 +4841,25 @@ "wxEVT_UPDATE_UI|OnNewTabUpdate" "ID_RICHTEXTTABSPAGE_NEW_TAB" 10201 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "&New" 0 "Click to create a new tab position." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -4235,6 +4889,7 @@ 1 1 0 + 0 0 "" "" @@ -4254,12 +4909,25 @@ "wxEVT_UPDATE_UI|OnDeleteTabUpdate" "ID_RICHTEXTTABSPAGE_DELETE_TAB" 10202 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "&Delete" 0 "Click to delete the selected tab position." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -4289,6 +4957,7 @@ 0 1 0 + 0 0 "" "" @@ -4308,12 +4977,25 @@ "wxEVT_UPDATE_UI|OnDeleteAllTabsUpdate" "ID_RICHTEXTTABSPAGE_DELETE_ALL_TABS" 10203 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Delete A&ll" 0 "Click to delete all tab positions." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -4343,6 +5025,7 @@ 0 1 0 + 0 0 "" "" @@ -4366,7 +5049,10 @@ 10300 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTBULLETSPAGE" 10300 "wxRichTextBulletsPage" @@ -4387,6 +5073,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 1 @@ -4419,6 +5112,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -4442,6 +5136,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -4466,6 +5161,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -4490,6 +5186,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -4514,6 +5211,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -4529,7 +5227,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Bullet style:" -1 @@ -4543,6 +5247,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -4570,6 +5279,7 @@ 1 0 0 + 0 0 "" "" @@ -4588,7 +5298,13 @@ "wxEVT_COMMAND_LISTBOX_SELECTED|OnStylelistboxSelected" "ID_RICHTEXTBULLETSPAGE_STYLELISTBOX" 10305 + "" "wxListBox" + "wxListBox" + 1 + 0 + "" + "" "m_styleListBox" "" "" @@ -4602,6 +5318,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -4632,6 +5353,7 @@ 1 1 0 + 0 0 "" "" @@ -4658,6 +5380,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -4675,7 +5398,13 @@ "wxEVT_UPDATE_UI|OnPeriodctrlUpdate" "ID_RICHTEXTBULLETSPAGE_PERIODCTRL" 10313 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_periodCtrl" "Peri&od" 0 @@ -4683,6 +5412,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -4710,6 +5444,7 @@ 1 1 0 + 0 0 "" "" @@ -4729,7 +5464,13 @@ "wxEVT_UPDATE_UI|OnParenthesesctrlUpdate" "ID_RICHTEXTBULLETSPAGE_PARENTHESESCTRL" 10311 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_parenthesesCtrl" "(*)" 0 @@ -4737,6 +5478,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -4764,6 +5510,7 @@ 1 1 0 + 0 0 "" "" @@ -4783,7 +5530,13 @@ "wxEVT_UPDATE_UI|OnRightParenthesisCtrlUpdate" "ID_RICHTEXTBULLETSPAGE_RIGHTPARENTHESISCTRL" 10306 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_rightParenthesisCtrl" "*)" 0 @@ -4791,6 +5544,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -4818,6 +5576,7 @@ 1 1 0 + 0 0 "" "" @@ -4845,6 +5604,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -4861,7 +5621,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Bullet &Alignment:" -1 @@ -4875,6 +5641,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -4902,6 +5673,7 @@ 1 0 0 + 0 0 "" "" @@ -4920,7 +5692,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnBulletAlignmentCtrlSelected" "ID_RICHTEXTBULLETSPAGE_BULLETALIGNMENTCTRL" 10315 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_bulletAlignmentCtrl" "Left|Centre|Right" "Left" @@ -4934,6 +5712,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -4955,6 +5738,7 @@ 1 1 0 + 0 1 "" "" @@ -4982,6 +5766,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -4998,7 +5783,13 @@ "wbStaticLineProxy" "wxID_STATIC" 5105 + "" "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" "" "" "" @@ -5031,6 +5822,7 @@ 0 0 0 + 0 0 @@ -5055,6 +5847,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -5080,6 +5873,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -5096,7 +5890,13 @@ "wxEVT_UPDATE_UI|OnSymbolstaticUpdate" "ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC" 10301 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Symbol:" -1 @@ -5110,6 +5910,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -5137,6 +5942,7 @@ 1 0 0 + 0 0 "" "" @@ -5163,6 +5969,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -5181,7 +5988,13 @@ "wxEVT_UPDATE_UI|OnSymbolctrlUpdate" "ID_RICHTEXTBULLETSPAGE_SYMBOLCTRL" 10307 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_symbolCtrl" "" "" @@ -5195,6 +6008,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -5216,6 +6034,7 @@ 1 1 0 + 0 1 "" "" @@ -5235,12 +6054,25 @@ "wxEVT_UPDATE_UI|OnChooseSymbolUpdate" "ID_RICHTEXTBULLETSPAGE_CHOOSE_SYMBOL" 10308 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Ch&oose..." 0 "Click to browse for a symbol." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -5270,6 +6102,7 @@ 1 1 0 + 0 0 "" "" @@ -5297,6 +6130,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -5314,7 +6148,13 @@ "wxEVT_UPDATE_UI|OnSymbolstaticUpdate" "ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC" 10301 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Symbol &font:" -1 @@ -5328,6 +6168,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -5355,6 +6200,7 @@ 1 0 0 + 0 0 "" "" @@ -5375,7 +6221,13 @@ "wxEVT_UPDATE_UI|OnSymbolfontctrlUIUpdate" "ID_RICHTEXTBULLETSPAGE_SYMBOLFONTCTRL" 10309 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_symbolFontCtrl" "" "" @@ -5389,6 +6241,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -5410,6 +6267,7 @@ 1 1 0 + 0 0 "" "" @@ -5436,6 +6294,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -5453,7 +6312,13 @@ "wxEVT_UPDATE_UI|OnNamestaticUpdate" "ID_RICHTEXTBULLETSPAGE_NAMESTATIC" 10303 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "S&tandard bullet name:" -1 @@ -5467,6 +6332,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -5494,6 +6364,7 @@ 1 0 0 + 0 0 "" "" @@ -5514,7 +6385,13 @@ "wxEVT_UPDATE_UI|OnNamectrlUIUpdate" "ID_RICHTEXTBULLETSPAGE_NAMECTRL" 10304 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_bulletNameCtrl" "" "" @@ -5528,6 +6405,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -5549,6 +6431,7 @@ 1 1 0 + 0 0 "" "" @@ -5575,6 +6458,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -5592,7 +6476,13 @@ "wxEVT_UPDATE_UI|OnNumberstaticUpdate" "ID_RICHTEXTBULLETSPAGE_NUMBERSTATIC" 10302 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Number:" -1 @@ -5606,6 +6496,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -5633,6 +6528,7 @@ 1 0 0 + 0 0 "" "" @@ -5655,7 +6551,13 @@ "wxEVT_UPDATE_UI|OnNumberctrlUpdate" "ID_RICHTEXTBULLETSPAGE_NUMBERCTRL" 10310 + "" "wxSpinCtrl" + "wxSpinCtrl" + 1 + 0 + "" + "" "m_numberCtrl" 0 100000 @@ -5670,6 +6572,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -5695,6 +6602,7 @@ 1 1 0 + 0 0 "" "" @@ -5723,6 +6631,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -5739,10 +6648,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTBULLETSPAGE_PREVIEW_CTRL" 10314 + "" "wxRichTextCtrl" "wxWindow" - "m_previewCtrl" 1 + 0 + "" + "" + "m_previewCtrl" 1 "Shows a preview of the bullet settings." "" @@ -5754,6 +6667,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -5781,10 +6699,11 @@ 1 1 0 + 0 0 - "" "%PARENT%, %ID%, wxEmptyString, %POSITION%, %SIZE%, %STYLE%" "" + "" @@ -5803,7 +6722,10 @@ 10400 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTSTYLEPAGE" 10403 "wxRichTextStylePage" @@ -5824,6 +6746,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 1 @@ -5856,6 +6785,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -5879,6 +6809,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -5903,6 +6834,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -5927,6 +6859,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -5951,6 +6884,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -5966,7 +6900,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Style:" -1 @@ -5980,6 +6920,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -6007,6 +6952,7 @@ 1 0 0 + 0 0 "" "" @@ -6024,7 +6970,13 @@ "wbTextCtrlProxy" "ID_RICHTEXTSTYLEPAGE_STYLE_NAME" 10404 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_styleName" "" 0 @@ -6038,6 +6990,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -6051,8 +7008,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -6076,9 +7034,11 @@ 1 1 0 + 0 0 "" "" + 0 "wxStaticText: wxID_STATIC" @@ -6093,7 +7053,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Based on:" -1 @@ -6107,6 +7073,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -6134,6 +7105,7 @@ 1 0 0 + 0 0 "" "" @@ -6151,7 +7123,13 @@ "wbComboBoxProxy" "ID_RICHTEXTSTYLEPAGE_BASED_ON" 10405 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_basedOn" "" "" @@ -6165,6 +7143,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -6186,6 +7169,7 @@ 1 1 0 + 0 0 "" "" @@ -6203,7 +7187,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Next style:" -1 @@ -6217,6 +7207,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -6244,6 +7239,7 @@ 1 0 0 + 0 0 "" "" @@ -6262,7 +7258,13 @@ "wxEVT_UPDATE_UI|OnNextStyleUpdate" "ID_RICHTEXTSTYLEPAGE_NEXT_STYLE" 10406 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_nextStyle" "" "" @@ -6276,6 +7278,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -6297,6 +7304,7 @@ 1 1 0 + 0 0 "" "" @@ -6325,6 +7333,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -6345,7 +7354,10 @@ 10600 0 "" + 0 + "" 0 + 0 "m_fontName|wxString|FontName||0" "m_symbol|wxString|Symbol||0" "m_fromUnicode|bool|FromUnicode|true|0" @@ -6370,6 +7382,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 1 0 1 @@ -6402,6 +7421,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -6425,6 +7445,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -6449,6 +7470,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -6473,6 +7495,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -6497,6 +7520,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -6512,7 +7536,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Font:" -1 @@ -6526,6 +7556,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -6553,6 +7588,7 @@ 1 1 0 + 0 0 "" "" @@ -6571,7 +7607,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnFontCtrlSelected" "ID_SYMBOLPICKERDIALOG_FONT" 10602 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_fontCtrl" "" "" @@ -6585,6 +7627,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -6606,6 +7653,7 @@ 1 1 0 + 0 0 "" "" @@ -6632,6 +7680,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -6648,7 +7697,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Subset:" -1 @@ -6662,6 +7717,11 @@ "__UNICODE__" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -6689,6 +7749,7 @@ 1 1 0 + 0 0 "" "" @@ -6707,7 +7768,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnSubsetSelected" "ID_SYMBOLPICKERDIALOG_SUBSET" 10605 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_subsetCtrl" "" "" @@ -6721,6 +7788,11 @@ "__UNICODE__" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -6742,6 +7814,7 @@ 1 1 0 + 0 0 "" "" @@ -6761,10 +7834,14 @@ "wbForeignCtrlProxy" "ID_SYMBOLPICKERDIALOG_LISTCTRL" 10608 + "" "wxSymbolListCtrl" "wxWindow" - "m_symbolsCtrl" 1 + 0 + "" + "" + "m_symbolsCtrl" 1 "" "" @@ -6776,6 +7853,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -6803,10 +7885,11 @@ 1 1 0 + 0 0 - "" "" "" + "" "wxBoxSizer H" @@ -6830,6 +7913,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -6845,7 +7929,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "m_symbolStaticCtrl" "xxxx" -1 @@ -6859,6 +7949,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -6886,6 +7981,7 @@ 1 1 0 + 0 0 "" "" @@ -6912,6 +8008,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -6928,7 +8025,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Character code:" -1 @@ -6942,6 +8045,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -6969,6 +8077,7 @@ 1 1 0 + 0 0 "" "" @@ -6986,7 +8095,13 @@ "wbTextCtrlProxy" "ID_SYMBOLPICKERDIALOG_CHARACTERCODE" 10601 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_characterCodeCtrl" "" 0 @@ -7000,6 +8115,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -7013,8 +8133,9 @@ 1 0 0 - 0 + 0 0 + 0 0 0 0 @@ -7038,9 +8159,11 @@ 1 1 0 + 0 0 "" "" + 0 "Spacer" @@ -7064,6 +8187,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -7080,7 +8204,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&From:" -1 @@ -7094,6 +8224,11 @@ "__UNICODE__" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -7121,6 +8256,7 @@ 1 1 0 + 0 0 "" "" @@ -7139,7 +8275,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnFromUnicodeSelected" "ID_SYMBOLPICKERDIALOG_FROM" 10603 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_fromUnicodeCtrl" "ASCII|Unicode" "ASCII" @@ -7153,6 +8295,11 @@ "__UNICODE__" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -7174,6 +8321,7 @@ 1 1 0 + 0 0 "" "" @@ -7201,6 +8349,7 @@ 0 0 0 + 0 0 "__WXMSW__,__WXGTK__,__WXOS2__,__WXMGL__,__WXMOTIF__,__WXCOCOA__,__WXX11__,__WXPALMOS__" @@ -7225,6 +8374,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -7242,12 +8392,25 @@ "wxEVT_UPDATE_UI|OnOkUpdate" "wxID_OK" 5100 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Insert" 1 "Inserts the chosen symbol." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -7277,6 +8440,7 @@ 1 1 0 + 0 0 "" "" @@ -7294,12 +8458,25 @@ "wbButtonProxy" "wxID_CANCEL" 5101 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Close" 0 "Closes the dialog without inserting a symbol." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -7329,6 +8506,7 @@ 1 1 0 + 0 0 "" "" @@ -7356,6 +8534,7 @@ 0 0 0 + 0 0 "__WXMAC__" @@ -7380,6 +8559,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -7396,12 +8576,25 @@ "wbButtonProxy" "wxID_CANCEL" 5101 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Close" 0 "Closes the dialog without inserting a symbol." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -7431,6 +8624,7 @@ 1 1 0 + 0 0 "" "" @@ -7449,12 +8643,25 @@ "wxEVT_UPDATE_UI|OnOkUpdate" "wxID_OK" 5100 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Insert" 1 "Inserts the chosen symbol." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -7484,6 +8691,7 @@ 1 1 0 + 0 0 "" "" @@ -7506,7 +8714,10 @@ 10500 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTSTYLEORGANISERDIALOG" 10500 "wxRichTextStyleOrganiserDialog" @@ -7527,6 +8738,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 1 0 1 @@ -7559,6 +8777,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -7572,15 +8791,8 @@ "wbBoxSizerProxy" "Vertical" "" - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 0 + 0 0 "<Any platform>" @@ -7605,6 +8817,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -7629,6 +8842,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -7653,6 +8867,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -7668,7 +8883,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Styles:" -1 @@ -7682,6 +8903,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -7709,6 +8935,7 @@ 1 0 0 + 0 0 "" "" @@ -7726,10 +8953,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTSTYLEORGANISERDIALOG_STYLES" 10501 + "" "wxRichTextStyleListCtrl" "wxWindow" - "m_stylesListBox" 1 + 0 + "" + "" + "m_stylesListBox" 1 "The available styles." "" @@ -7741,6 +8972,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -7757,7 +8993,7 @@ "listCtrlStyle" -1 -1 - 200 + 280 350 "Expand" "Centre" @@ -7768,10 +9004,11 @@ 1 1 0 + 0 0 - "" "" "" + "" @@ -7796,10 +9033,11 @@ 0 0 0 + 0 0 "<Any platform>" - "wxStaticText: wxID_STATIC" + "wxStaticText: ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE" "dialog-control-document" "" "statictext" @@ -7809,9 +9047,15 @@ 0 "18/10/2006" "wbStaticTextProxy" - "wxID_STATIC" - 5105 + "ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE" + 10510 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" " " -1 @@ -7825,6 +9069,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -7843,7 +9092,7 @@ -1 -1 -1 - "Left" + "Expand" "Centre" 0 5 @@ -7852,6 +9101,7 @@ 1 0 0 + 0 0 "" "" @@ -7869,10 +9119,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTSTYLEORGANISERDIALOG_PREVIEW" 10509 + "" "wxRichTextCtrl" "wxWindow" - "m_previewCtrl" 1 + 0 + "" + "" + "m_previewCtrl" 1 "The style preview." "" @@ -7884,6 +9138,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -7911,10 +9170,11 @@ 1 1 0 + 0 0 - "" "%PARENT%, %ID%, wxEmptyString, %POSITION%, %SIZE%, %STYLE%" "" + "" @@ -7939,6 +9199,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -7954,7 +9215,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" " " -1 @@ -7968,6 +9235,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -7995,6 +9267,7 @@ 1 0 0 + 0 0 "" "" @@ -8014,12 +9287,25 @@ "wxEVT_UPDATE_UI|OnNewCharUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR" 10504 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_newCharacter" "New &Character Style..." 0 "Click to create a new character style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8049,6 +9335,7 @@ 1 1 0 + 0 0 "" "" @@ -8068,12 +9355,25 @@ "wxEVT_UPDATE_UI|OnNewParaUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA" 10505 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_newParagraph" "New &Paragraph Style..." 0 "Click to create a new paragraph style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8103,6 +9403,7 @@ 0 1 0 + 0 0 "" "" @@ -8122,12 +9423,25 @@ "wxEVT_UPDATE_UI|OnNewListUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_LIST" 10508 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_newList" "New &List Style..." 0 "Click to create a new list style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8157,6 +9471,7 @@ 0 1 0 + 0 0 "" "" @@ -8183,6 +9498,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -8201,12 +9517,25 @@ "wxEVT_UPDATE_UI|OnApplyUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_APPLY" 10503 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_applyStyle" "&Apply Style" 0 "Click to apply the selected style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8236,6 +9565,7 @@ 1 1 0 + 0 0 "" "" @@ -8255,12 +9585,25 @@ "wxEVT_UPDATE_UI|OnRenameUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_RENAME" 10502 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_renameStyle" "&Rename Style..." 0 "Click to rename the selected style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8290,6 +9633,7 @@ 0 1 0 + 0 0 "" "" @@ -8309,12 +9653,25 @@ "wxEVT_UPDATE_UI|OnEditUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_EDIT" 10506 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_editStyle" "&Edit Style..." 0 "Click to edit the selected style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8344,6 +9701,7 @@ 0 1 0 + 0 0 "" "" @@ -8363,12 +9721,25 @@ "wxEVT_UPDATE_UI|OnDeleteUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_DELETE" 10507 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_deleteStyle" "&Delete Style..." 0 "Click to delete the selected style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8398,6 +9769,7 @@ 0 1 0 + 0 0 "" "" @@ -8424,6 +9796,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -8440,12 +9813,25 @@ "wbButtonProxy" "wxID_CANCEL" 5101 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_closeButton" "Close" 1 "Click to close this window." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8475,6 +9861,7 @@ 1 1 0 + 0 0 "" "" @@ -8503,6 +9890,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -8518,7 +9906,13 @@ "wbCheckBoxProxy" "ID_RICHTEXTSTYLEORGANISERDIALOG_RESTART_NUMBERING" 10511 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_restartNumberingCtrl" "&Restart numbering" 0 @@ -8526,6 +9920,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -8553,6 +9952,7 @@ 1 1 0 + 0 0 "" "" @@ -8579,6 +9979,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -8595,12 +9996,25 @@ "wbButtonProxy" "wxID_OK" 5100 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_okButton" "OK" 1 "Click to confirm your selection." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8630,6 +10044,7 @@ 1 1 0 + 0 0 "" "" @@ -8647,12 +10062,25 @@ "wbButtonProxy" "wxID_CANCEL" 5101 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_cancelButton" "Cancel" 0 "Click to cancel this window." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8682,6 +10110,7 @@ 1 1 0 + 0 0 "" "" @@ -8704,7 +10133,10 @@ 10600 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTLISTSTYLEPAGE" 10616 "wxRichTextListStylePage" @@ -8725,6 +10157,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 1 @@ -8757,6 +10196,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -8780,6 +10220,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -8804,6 +10245,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -8828,6 +10270,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -8843,7 +10286,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&List level:" -1 @@ -8857,6 +10306,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -8884,6 +10338,7 @@ 1 1 0 + 0 0 "" "" @@ -8906,7 +10361,13 @@ "wxEVT_UPDATE_UI|OnLevelUIUpdate" "ID_RICHTEXTLISTSTYLEPAGE_LEVEL" 10617 + "" "wxSpinCtrl" + "wxSpinCtrl" + 1 + 0 + "" + "" "m_levelCtrl" 1 10 @@ -8921,6 +10382,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -8946,6 +10412,7 @@ 1 1 0 + 0 0 "" "" @@ -8972,6 +10439,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -8989,12 +10457,25 @@ "wxEVT_COMMAND_BUTTON_CLICKED|OnChooseFontClick" "ID_RICHTEXTLISTSTYLEPAGE_CHOOSE_FONT" 10604 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "&Font for Level..." 0 "Click to choose the font for this level." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -9024,6 +10505,7 @@ 1 1 0 + 0 0 "" "" @@ -9042,7 +10524,13 @@ "wbNotebookProxy" "ID_RICHTEXTLISTSTYLEPAGE_NOTEBOOK" 10618 + "" "wxNotebook" + "wxNotebook" + 1 + 0 + "" + "" "" 0 "" @@ -9055,6 +10543,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 1 0 @@ -9089,6 +10582,7 @@ 1 1 0 + 0 0 "" "" @@ -9105,13 +10599,14 @@ "wbPanelProxy" "ID_RICHTEXTLISTSTYLEPAGE_BULLETS" 10619 + "" "wxPanel" "wxPanel" - "" 0 0 "" "" + "" "" "" "" @@ -9120,6 +10615,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 1 0 0 @@ -9133,6 +10635,7 @@ 0 0 1 + 0 0 0 "" @@ -9150,10 +10653,12 @@ 1 1 0 + 0 0 "" "" "" + 0 "Bullet style" "" @@ -9178,6 +10683,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -9202,6 +10708,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -9226,6 +10733,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -9241,7 +10749,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Bullet style:" -1 @@ -9255,6 +10769,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -9282,6 +10801,7 @@ 1 0 0 + 0 0 "" "" @@ -9300,7 +10820,13 @@ "wxEVT_COMMAND_LISTBOX_SELECTED|OnStylelistboxSelected" "ID_RICHTEXTLISTSTYLEPAGE_STYLELISTBOX" 10620 + "" "wxListBox" + "wxListBox" + 1 + 0 + "" + "" "m_styleListBox" "" "" @@ -9314,6 +10840,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -9344,6 +10875,7 @@ 1 1 0 + 0 0 "" "" @@ -9370,6 +10902,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -9387,7 +10920,13 @@ "wxEVT_UPDATE_UI|OnPeriodctrlUpdate" "ID_RICHTEXTLISTSTYLEPAGE_PERIODCTRL" 10627 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_periodCtrl" "Peri&od" 0 @@ -9395,6 +10934,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -9422,6 +10966,7 @@ 1 1 0 + 0 0 "" "" @@ -9441,7 +10986,13 @@ "wxEVT_UPDATE_UI|OnParenthesesctrlUpdate" "ID_RICHTEXTLISTSTYLEPAGE_PARENTHESESCTRL" 10626 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_parenthesesCtrl" "(*)" 0 @@ -9449,6 +11000,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -9476,6 +11032,7 @@ 1 1 0 + 0 0 "" "" @@ -9495,7 +11052,13 @@ "wxEVT_UPDATE_UI|OnRightParenthesisCtrlUpdate" "ID_RICHTEXTLISTSTYLEPAGE_RIGHTPARENTHESISCTRL" 10602 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_rightParenthesisCtrl" "*)" 0 @@ -9503,6 +11066,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -9530,6 +11098,7 @@ 1 1 0 + 0 0 "" "" @@ -9557,6 +11126,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -9573,7 +11143,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Bullet &Alignment:" -1 @@ -9587,6 +11163,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -9614,6 +11195,7 @@ 1 0 0 + 0 0 "" "" @@ -9632,7 +11214,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnBulletAlignmentCtrlSelected" "ID_RICHTEXTLISTSTYLEPAGE_BULLETALIGNMENTCTRL" 10603 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_bulletAlignmentCtrl" "Left|Centre|Right" "Left" @@ -9646,6 +11234,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -9667,6 +11260,7 @@ 1 1 0 + 0 1 "" "" @@ -9694,6 +11288,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -9710,7 +11305,13 @@ "wbStaticLineProxy" "wxID_STATIC" 5105 + "" "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" "" "" "" @@ -9743,6 +11344,7 @@ 1 1 0 + 0 0 @@ -9767,6 +11369,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -9792,6 +11395,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -9808,7 +11412,13 @@ "wxEVT_UPDATE_UI|OnSymbolstaticUpdate" "ID_RICHTEXTLISTSTYLEPAGE_SYMBOLSTATIC" 10621 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Symbol:" -1 @@ -9822,6 +11432,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -9849,6 +11464,7 @@ 1 0 0 + 0 0 "" "" @@ -9875,6 +11491,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -9893,7 +11510,13 @@ "wxEVT_UPDATE_UI|OnSymbolctrlUIUpdate" "ID_RICHTEXTLISTSTYLEPAGE_SYMBOLCTRL" 10622 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_symbolCtrl" "" "" @@ -9907,6 +11530,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -9928,6 +11556,7 @@ 1 1 0 + 0 1 "" "" @@ -9947,12 +11576,25 @@ "wxEVT_UPDATE_UI|OnChooseSymbolUpdate" "ID_RICHTEXTLISTSTYLEPAGE_CHOOSE_SYMBOL" 10623 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Ch&oose..." 0 "Click to browse for a symbol." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -9982,6 +11624,7 @@ 1 1 0 + 0 0 "" "" @@ -10009,6 +11652,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -10026,7 +11670,13 @@ "wxEVT_UPDATE_UI|OnSymbolstaticUpdate" "ID_RICHTEXTLISTSTYLEPAGE_SYMBOLSTATIC" 10624 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Symbol &font:" -1 @@ -10040,6 +11690,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10067,6 +11722,7 @@ 1 0 0 + 0 0 "" "" @@ -10087,7 +11743,13 @@ "wxEVT_UPDATE_UI|OnSymbolfontctrlUIUpdate" "ID_RICHTEXTLISTSTYLEPAGE_SYMBOLFONTCTRL" 10625 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_symbolFontCtrl" "" "" @@ -10101,6 +11763,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -10122,6 +11789,7 @@ 1 1 0 + 0 0 "" "" @@ -10148,6 +11816,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -10165,7 +11834,13 @@ "wxEVT_UPDATE_UI|OnNamestaticUpdate" "ID_RICHTEXTLISTSTYLEPAGE_NAMESTATIC" 10600 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "S&tandard bullet name:" -1 @@ -10179,6 +11854,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10206,6 +11886,7 @@ 1 0 0 + 0 0 "" "" @@ -10226,7 +11907,13 @@ "wxEVT_UPDATE_UI|OnNamectrlUIUpdate" "ID_RICHTEXTLISTSTYLEPAGE_NAMECTRL" 10601 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_bulletNameCtrl" "" "" @@ -10240,6 +11927,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -10261,6 +11953,7 @@ 1 1 0 + 0 0 "" "" @@ -10282,13 +11975,14 @@ "wbPanelProxy" "ID_RICHTEXTLISTSTYLEPAGE_SPACING" 10628 + "" "wxPanel" "wxPanel" - "" 0 0 "" "" + "" "" "" "" @@ -10297,6 +11991,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 1 0 0 @@ -10310,6 +12011,7 @@ 0 0 1 + 0 0 0 "" @@ -10327,10 +12029,12 @@ 1 1 0 + 0 0 "" "" "" + 0 "Spacing" "" @@ -10355,6 +12059,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -10379,6 +12084,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -10403,6 +12109,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -10418,7 +12125,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Alignment" -1 @@ -10432,6 +12145,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10459,6 +12177,7 @@ 1 0 0 + 0 0 "" "" @@ -10485,6 +12204,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -10509,6 +12229,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -10534,6 +12255,7 @@ 1 0 0 + 0 0 "<Any platform>" @@ -10550,7 +12272,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnRichtextliststylepageAlignleftSelected" "ID_RICHTEXTLISTSTYLEPAGE_ALIGNLEFT" 10629 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentLeft" "&Left" 0 @@ -10564,6 +12292,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -10583,6 +12316,7 @@ 1 1 0 + 0 0 "" "" @@ -10601,7 +12335,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnRichtextliststylepageAlignrightSelected" "ID_RICHTEXTLISTSTYLEPAGE_ALIGNRIGHT" 10630 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentRight" "&Right" 0 @@ -10615,6 +12355,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10634,6 +12379,7 @@ 1 1 0 + 0 0 "" "" @@ -10652,7 +12398,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnRichtextliststylepageJustifiedSelected" "ID_RICHTEXTLISTSTYLEPAGE_JUSTIFIED" 10631 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentJustified" "&Justified" 0 @@ -10666,6 +12418,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10685,6 +12442,7 @@ 1 1 0 + 0 0 "" "" @@ -10703,7 +12461,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnRichtextliststylepageCenteredSelected" "ID_RICHTEXTLISTSTYLEPAGE_CENTERED" 10632 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentCentred" "Cen&tred" 0 @@ -10717,6 +12481,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10736,6 +12505,7 @@ 1 1 0 + 0 0 "" "" @@ -10754,7 +12524,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnRichtextliststylepageAlignindeterminateSelected" "ID_RICHTEXTLISTSTYLEPAGE_ALIGNINDETERMINATE" 10633 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentIndeterminate" "&Indeterminate" 0 @@ -10768,6 +12544,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10787,6 +12568,7 @@ 1 1 0 + 0 0 "" "" @@ -10816,6 +12598,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -10832,7 +12615,13 @@ "wbStaticLineProxy" "wxID_STATIC" 5105 + "" "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" "" "" "" @@ -10865,6 +12654,7 @@ 0 1 0 + 0 0 @@ -10889,6 +12679,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -10914,6 +12705,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -10929,7 +12721,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Indentation (tenths of a mm)" -1 @@ -10943,6 +12741,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10970,6 +12773,7 @@ 1 0 0 + 0 0 "" "" @@ -10996,6 +12800,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -11020,6 +12825,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -11051,6 +12857,7 @@ 0 0 0 + 0 0 "wxStaticText: wxID_STATIC" @@ -11065,7 +12872,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Left:" -1 @@ -11079,6 +12892,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11106,6 +12924,7 @@ 1 1 0 + 0 0 "" "" @@ -11132,6 +12951,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -11148,7 +12968,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftUpdated" "ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT" 10634 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_indentLeft" "" 0 @@ -11162,6 +12988,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11175,8 +13006,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -11200,9 +13032,11 @@ 1 1 0 + 0 0 "" "" + 0 @@ -11218,7 +13052,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Left (&first line):" -1 @@ -11232,6 +13072,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11259,6 +13104,7 @@ 1 1 0 + 0 0 "" "" @@ -11285,6 +13131,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -11301,7 +13148,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnIndentFirstLineUpdated" "ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE" 10635 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_indentLeftFirst" "" 0 @@ -11315,6 +13168,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11328,8 +13186,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -11353,9 +13212,11 @@ 1 1 0 + 0 0 "" "" + 0 @@ -11371,7 +13232,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Right:" -1 @@ -11385,6 +13252,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11412,6 +13284,7 @@ 1 1 0 + 0 0 "" "" @@ -11438,6 +13311,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -11454,7 +13328,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnIndentRightUpdated" "ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT" 10636 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_indentRight" "" 0 @@ -11468,6 +13348,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11481,8 +13366,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -11506,9 +13392,11 @@ 1 1 0 + 0 0 "" "" + 0 @@ -11536,6 +13424,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -11552,7 +13441,13 @@ "wbStaticLineProxy" "wxID_STATIC" 5105 + "" "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" "" "" "" @@ -11585,6 +13480,7 @@ 1 1 0 + 0 0 @@ -11609,6 +13505,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -11634,6 +13531,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -11649,7 +13547,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Spacing (tenths of a mm)" -1 @@ -11663,6 +13567,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11690,6 +13599,7 @@ 1 0 0 + 0 0 "" "" @@ -11716,6 +13626,7 @@ 1 1 0 + 0 0 "<Any platform>" @@ -11740,6 +13651,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -11771,6 +13683,7 @@ 0 0 0 + 0 0 "wxStaticText: wxID_STATIC" @@ -11785,7 +13698,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Before a paragraph:" -1 @@ -11799,6 +13718,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11826,6 +13750,7 @@ 1 1 0 + 0 0 "" "" @@ -11852,6 +13777,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -11868,7 +13794,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingBeforeUpdated" "ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE" 10637 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_spacingBefore" "" 0 @@ -11882,6 +13814,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11895,8 +13832,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -11920,9 +13858,11 @@ 1 1 0 + 0 0 "" "" + 0 @@ -11938,7 +13878,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "After a paragraph:" -1 @@ -11952,6 +13898,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11979,6 +13930,7 @@ 1 1 0 + 0 0 "" "" @@ -12005,6 +13957,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -12021,7 +13974,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingAfterUpdated" "ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER" 10638 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_spacingAfter" "" 0 @@ -12035,6 +13994,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -12048,8 +14012,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -12073,9 +14038,11 @@ 1 1 0 + 0 0 "" "" + 0 @@ -12091,7 +14058,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Line spacing:" -1 @@ -12105,6 +14078,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -12132,6 +14110,7 @@ 1 1 0 + 0 0 "" "" @@ -12158,6 +14137,7 @@ 0 0 0 + 0 0 "<Any platform>" @@ -12174,7 +14154,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnLineSpacingSelected" "ID_RICHTEXTLISTSTYLEPAGE_LINESPACING" 10639 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_spacingLine" "Single|1.5|2" "Single" @@ -12188,6 +14174,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -12209,6 +14200,7 @@ 1 1 0 + 0 0 "" "" @@ -12234,10 +14226,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTLISTSTYLEPAGE_RICHTEXTCTRL" 10640 + "" "wxRichTextCtrl" "wxWindow" - "m_previewCtrl" 1 + 0 + "" + "" + "m_previewCtrl" 1 "Shows a preview of the bullet settings." "" @@ -12249,6 +14245,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -12276,10 +14277,11 @@ 1 1 0 + 0 0 - "" "%PARENT%, %ID%, wxEmptyString, %POSITION%, %SIZE%, %STYLE%" "" + "" diff --git a/src/richtext/richtextstyledlg.cpp b/src/richtext/richtextstyledlg.cpp index 784d18e6df..fac149e861 100644 --- a/src/richtext/richtextstyledlg.cpp +++ b/src/richtext/richtextstyledlg.cpp @@ -126,7 +126,7 @@ bool wxRichTextStyleOrganiserDialog::Create( int flags, wxRichTextStyleSheet* sh m_flags = flags; ////@begin wxRichTextStyleOrganiserDialog creation - SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS|wxDIALOG_EX_CONTEXTHELP); + SetExtraStyle(wxWS_EX_BLOCK_EVENTS|wxDIALOG_EX_CONTEXTHELP); wxDialog::Create( parent, id, caption, pos, size, style ); CreateControls(); @@ -190,21 +190,21 @@ void wxRichTextStyleOrganiserDialog::CreateControls() wxStaticText* itemStaticText6 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Styles:"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); - m_stylesListBox = new wxRichTextStyleListCtrl( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_STYLES, wxDefaultPosition, wxSize(200, 350), wxSIMPLE_BORDER|listCtrlStyle ); + m_stylesListBox = new wxRichTextStyleListCtrl( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_STYLES, wxDefaultPosition, wxSize(280, 350), wxSIMPLE_BORDER|listCtrlStyle ); m_stylesListBox->SetHelpText(_("The available styles.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_stylesListBox->SetToolTip(_("The available styles.")); itemBoxSizer5->Add(m_stylesListBox, 1, wxGROW|wxALL, 5); wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL); m_buttonSizerParent->Add(itemBoxSizer8, 0, wxGROW, 5); - wxStaticText* itemStaticText9 = new wxStaticText( itemDialog1, wxID_STATIC, _(" "), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer8->Add(itemStaticText9, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); + wxStaticText* itemStaticText9 = new wxStaticText( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE, _(" "), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer8->Add(itemStaticText9, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5); m_previewCtrl = new wxRichTextCtrl( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_PREVIEW, wxEmptyString, wxDefaultPosition, wxSize(310, 200), wxSIMPLE_BORDER|wxTE_READONLY ); m_previewCtrl->SetHelpText(_("The style preview.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_previewCtrl->SetToolTip(_("The style preview.")); itemBoxSizer8->Add(m_previewCtrl, 1, wxGROW|wxALL, 5); @@ -216,19 +216,19 @@ void wxRichTextStyleOrganiserDialog::CreateControls() m_newCharacter = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR, _("New &Character Style..."), wxDefaultPosition, wxDefaultSize, 0 ); m_newCharacter->SetHelpText(_("Click to create a new character style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_newCharacter->SetToolTip(_("Click to create a new character style.")); m_buttonSizer->Add(m_newCharacter, 0, wxGROW|wxALL, 5); m_newParagraph = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA, _("New &Paragraph Style..."), wxDefaultPosition, wxDefaultSize, 0 ); m_newParagraph->SetHelpText(_("Click to create a new paragraph style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_newParagraph->SetToolTip(_("Click to create a new paragraph style.")); m_buttonSizer->Add(m_newParagraph, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); m_newList = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_LIST, _("New &List Style..."), wxDefaultPosition, wxDefaultSize, 0 ); m_newList->SetHelpText(_("Click to create a new list style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_newList->SetToolTip(_("Click to create a new list style.")); m_buttonSizer->Add(m_newList, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); @@ -236,25 +236,25 @@ void wxRichTextStyleOrganiserDialog::CreateControls() m_applyStyle = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_APPLY, _("&Apply Style"), wxDefaultPosition, wxDefaultSize, 0 ); m_applyStyle->SetHelpText(_("Click to apply the selected style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_applyStyle->SetToolTip(_("Click to apply the selected style.")); m_buttonSizer->Add(m_applyStyle, 0, wxGROW|wxALL, 5); m_renameStyle = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_RENAME, _("&Rename Style..."), wxDefaultPosition, wxDefaultSize, 0 ); m_renameStyle->SetHelpText(_("Click to rename the selected style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_renameStyle->SetToolTip(_("Click to rename the selected style.")); m_buttonSizer->Add(m_renameStyle, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); m_editStyle = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_EDIT, _("&Edit Style..."), wxDefaultPosition, wxDefaultSize, 0 ); m_editStyle->SetHelpText(_("Click to edit the selected style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_editStyle->SetToolTip(_("Click to edit the selected style.")); m_buttonSizer->Add(m_editStyle, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); m_deleteStyle = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_DELETE, _("&Delete Style..."), wxDefaultPosition, wxDefaultSize, 0 ); m_deleteStyle->SetHelpText(_("Click to delete the selected style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_deleteStyle->SetToolTip(_("Click to delete the selected style.")); m_buttonSizer->Add(m_deleteStyle, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); @@ -263,7 +263,7 @@ void wxRichTextStyleOrganiserDialog::CreateControls() m_closeButton = new wxButton( itemDialog1, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); m_closeButton->SetDefault(); m_closeButton->SetHelpText(_("Click to close this window.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_closeButton->SetToolTip(_("Click to close this window.")); m_buttonSizer->Add(m_closeButton, 0, wxGROW|wxALL, 5); @@ -273,7 +273,7 @@ void wxRichTextStyleOrganiserDialog::CreateControls() m_restartNumberingCtrl = new wxCheckBox( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_RESTART_NUMBERING, _("&Restart numbering"), wxDefaultPosition, wxDefaultSize, 0 ); m_restartNumberingCtrl->SetValue(false); m_restartNumberingCtrl->SetHelpText(_("Check to restart numbering.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_restartNumberingCtrl->SetToolTip(_("Check to restart numbering.")); m_bottomButtonSizer->Add(m_restartNumberingCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -282,13 +282,13 @@ void wxRichTextStyleOrganiserDialog::CreateControls() m_okButton = new wxButton( itemDialog1, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 ); m_okButton->SetDefault(); m_okButton->SetHelpText(_("Click to confirm your selection.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_okButton->SetToolTip(_("Click to confirm your selection.")); m_bottomButtonSizer->Add(m_okButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); m_cancelButton = new wxButton( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); m_cancelButton->SetHelpText(_("Click to cancel this window.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_cancelButton->SetToolTip(_("Click to cancel this window.")); m_bottomButtonSizer->Add(m_cancelButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -426,6 +426,10 @@ iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n"); wxRichTextListStyleDefinition* listDef = wxDynamicCast(def, wxRichTextListStyleDefinition); + wxStaticText* labelCtrl = (wxStaticText*) FindWindow(ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE); + if (labelCtrl) + labelCtrl->SetLabel(def->GetName() + wxT(":")); + wxTextAttr attr(def->GetStyleMergedWithBase(GetStyleSheet())); wxFont font(m_previewCtrl->GetFont()); @@ -478,6 +482,9 @@ iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n"); void wxRichTextStyleOrganiserDialog::ClearPreview() { m_previewCtrl->Clear(); + wxStaticText* labelCtrl = (wxStaticText*) FindWindow(ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE); + if (labelCtrl) + labelCtrl->SetLabel(wxEmptyString); } bool wxRichTextStyleOrganiserDialog::ApplyStyle(wxRichTextCtrl* ctrl) -- 2.45.2