Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use % instead of percent in Size dialog; controls more legible on wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-11-18 11:14:17 +00:00
parent c7af4603c0
commit ae057c54ec
2 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/richtext/richtextdialogs.pjd
View File

@@ -15161,14 +15161,6 @@
<string name="proxy-type">"wbBoxSizerProxy"</string>
<string name="proxy-Orientation">"Vertical"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-AlignH">"Centre"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
@@ -16551,7 +16543,7 @@
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_unitsW"</string>
<string name="proxy-Strings">"px|cm|percent"</string>
<string name="proxy-Strings">"px|cm|%"</string>
<string name="proxy-Initial value">"px"</string>
<string name="proxy-Help text">"Units for the object width."</string>
<string name="proxy-Tooltip text">""</string>
@@ -16888,7 +16880,7 @@
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_unitsH"</string>
<string name="proxy-Strings">"px|cm|percent"</string>
<string name="proxy-Strings">"px|cm|%"</string>
<string name="proxy-Initial value">"px"</string>
<string name="proxy-Help text">"Units for the object height."</string>
<string name="proxy-Tooltip text">""</string>
@@ -17128,7 +17120,7 @@
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_unitsMinW"</string>
<string name="proxy-Strings">"px|cm|percent"</string>
<string name="proxy-Strings">"px|cm|%"</string>
<string name="proxy-Initial value">"px"</string>
<string name="proxy-Help text">"Units for the minimum object width."</string>
<string name="proxy-Tooltip text">""</string>
@@ -17368,7 +17360,7 @@
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_unitsMinH"</string>
<string name="proxy-Strings">"px|cm|percent"</string>
<string name="proxy-Strings">"px|cm|%"</string>
<string name="proxy-Initial value">"px"</string>
<string name="proxy-Help text">"Units for the minimum object height."</string>
<string name="proxy-Tooltip text">""</string>
@@ -17608,7 +17600,7 @@
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_unitsMaxW"</string>
<string name="proxy-Strings">"px|cm|percent"</string>
<string name="proxy-Strings">"px|cm|%"</string>
<string name="proxy-Initial value">"px"</string>
<string name="proxy-Help text">"Units for the maximum object width."</string>
<string name="proxy-Tooltip text">""</string>
@@ -17848,7 +17840,7 @@
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_unitsMaxH"</string>
<string name="proxy-Strings">"px|cm|percent"</string>
<string name="proxy-Strings">"px|cm|%"</string>
<string name="proxy-Initial value">"px"</string>
<string name="proxy-Help text">"Units for the maximum object height."</string>
<string name="proxy-Tooltip text">""</string>
@@ -18628,7 +18620,7 @@
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_unitsLeft"</string>
<string name="proxy-Strings">"px|cm|percent"</string>
<string name="proxy-Strings">"px|cm|%"</string>
<string name="proxy-Initial value">"px"</string>
<string name="proxy-Help text">"Units for the left position."</string>
<string name="proxy-Tooltip text">""</string>
@@ -18965,7 +18957,7 @@
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_unitsTop"</string>
<string name="proxy-Strings">"px|cm|percent"</string>
<string name="proxy-Strings">"px|cm|%"</string>
<string name="proxy-Initial value">"px"</string>
<string name="proxy-Help text">"Units for the top position."</string>
<string name="proxy-Tooltip text">""</string>
@@ -19302,7 +19294,7 @@
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_unitsRight"</string>
<string name="proxy-Strings">"px|cm|percent"</string>
<string name="proxy-Strings">"px|cm|%"</string>
<string name="proxy-Initial value">"px"</string>
<string name="proxy-Help text">"Units for the right position."</string>
<string name="proxy-Tooltip text">""</string>
@@ -19639,7 +19631,7 @@
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_unitsBottom"</string>
<string name="proxy-Strings">"px|cm|percent"</string>
<string name="proxy-Strings">"px|cm|%"</string>
<string name="proxy-Initial value">"px"</string>
<string name="proxy-Help text">"Units for the bottom position."</string>
<string name="proxy-Tooltip text">""</string>
@@ -20014,6 +20006,14 @@
<string name="proxy-type">"wbBoxSizerProxy"</string>
<string name="proxy-Orientation">"Vertical"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-AlignH">"Centre"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
@@ -22634,6 +22634,14 @@
<string name="proxy-type">"wbBoxSizerProxy"</string>
<string name="proxy-Orientation">"Vertical"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-AlignH">"Centre"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>

20
src/richtext/richtextsizepage.cpp
View File

@@ -337,7 +337,7 @@ void wxRichTextSizePage::CreateControls()
wxArrayString m_unitsWStrings;
m_unitsWStrings.Add(_("px"));
m_unitsWStrings.Add(_("cm"));
m_unitsWStrings.Add(_("percent"));
m_unitsWStrings.Add(_("%"));
m_unitsW = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_W, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsWStrings, wxCB_READONLY );
m_unitsW->SetStringSelection(_("px"));
m_unitsW->SetHelpText(_("Units for the object width."));
@@ -371,7 +371,7 @@ void wxRichTextSizePage::CreateControls()
wxArrayString m_unitsHStrings;
m_unitsHStrings.Add(_("px"));
m_unitsHStrings.Add(_("cm"));
m_unitsHStrings.Add(_("percent"));
m_unitsHStrings.Add(_("%"));
m_unitsH = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_H, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsHStrings, wxCB_READONLY );
m_unitsH->SetStringSelection(_("px"));
m_unitsH->SetHelpText(_("Units for the object height."));
@@ -398,7 +398,7 @@ void wxRichTextSizePage::CreateControls()
wxArrayString m_unitsMinWStrings;
m_unitsMinWStrings.Add(_("px"));
m_unitsMinWStrings.Add(_("cm"));
m_unitsMinWStrings.Add(_("percent"));
m_unitsMinWStrings.Add(_("%"));
m_unitsMinW = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_MIN_W, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsMinWStrings, wxCB_READONLY );
m_unitsMinW->SetStringSelection(_("px"));
m_unitsMinW->SetHelpText(_("Units for the minimum object width."));
@@ -425,7 +425,7 @@ void wxRichTextSizePage::CreateControls()
wxArrayString m_unitsMinHStrings;
m_unitsMinHStrings.Add(_("px"));
m_unitsMinHStrings.Add(_("cm"));
m_unitsMinHStrings.Add(_("percent"));
m_unitsMinHStrings.Add(_("%"));
m_unitsMinH = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_MIN_H, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsMinHStrings, wxCB_READONLY );
m_unitsMinH->SetStringSelection(_("px"));
m_unitsMinH->SetHelpText(_("Units for the minimum object height."));
@@ -452,7 +452,7 @@ void wxRichTextSizePage::CreateControls()
wxArrayString m_unitsMaxWStrings;
m_unitsMaxWStrings.Add(_("px"));
m_unitsMaxWStrings.Add(_("cm"));
m_unitsMaxWStrings.Add(_("percent"));
m_unitsMaxWStrings.Add(_("%"));
m_unitsMaxW = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_MAX_W, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsMaxWStrings, wxCB_READONLY );
m_unitsMaxW->SetStringSelection(_("px"));
m_unitsMaxW->SetHelpText(_("Units for the maximum object width."));
@@ -479,7 +479,7 @@ void wxRichTextSizePage::CreateControls()
wxArrayString m_unitsMaxHStrings;
m_unitsMaxHStrings.Add(_("px"));
m_unitsMaxHStrings.Add(_("cm"));
m_unitsMaxHStrings.Add(_("percent"));
m_unitsMaxHStrings.Add(_("%"));
m_unitsMaxH = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_MAX_H, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsMaxHStrings, wxCB_READONLY );
m_unitsMaxH->SetStringSelection(_("px"));
m_unitsMaxH->SetHelpText(_("Units for the maximum object height."));
@@ -553,7 +553,7 @@ void wxRichTextSizePage::CreateControls()
wxArrayString m_unitsLeftStrings;
m_unitsLeftStrings.Add(_("px"));
m_unitsLeftStrings.Add(_("cm"));
m_unitsLeftStrings.Add(_("percent"));
m_unitsLeftStrings.Add(_("%"));
m_unitsLeft = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_LEFT_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsLeftStrings, wxCB_READONLY );
m_unitsLeft->SetStringSelection(_("px"));
m_unitsLeft->SetHelpText(_("Units for the left position."));
@@ -588,7 +588,7 @@ void wxRichTextSizePage::CreateControls()
wxArrayString m_unitsTopStrings;
m_unitsTopStrings.Add(_("px"));
m_unitsTopStrings.Add(_("cm"));
m_unitsTopStrings.Add(_("percent"));
m_unitsTopStrings.Add(_("%"));
m_unitsTop = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_TOP_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsTopStrings, wxCB_READONLY );
m_unitsTop->SetStringSelection(_("px"));
m_unitsTop->SetHelpText(_("Units for the top position."));
@@ -623,7 +623,7 @@ void wxRichTextSizePage::CreateControls()
wxArrayString m_unitsRightStrings;
m_unitsRightStrings.Add(_("px"));
m_unitsRightStrings.Add(_("cm"));
m_unitsRightStrings.Add(_("percent"));
m_unitsRightStrings.Add(_("%"));
m_unitsRight = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_RIGHT_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsRightStrings, wxCB_READONLY );
m_unitsRight->SetStringSelection(_("px"));
m_unitsRight->SetHelpText(_("Units for the right position."));
@@ -658,7 +658,7 @@ void wxRichTextSizePage::CreateControls()
wxArrayString m_unitsBottomStrings;
m_unitsBottomStrings.Add(_("px"));
m_unitsBottomStrings.Add(_("cm"));
m_unitsBottomStrings.Add(_("percent"));
m_unitsBottomStrings.Add(_("%"));
m_unitsBottom = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_BOTTOM_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsBottomStrings, wxCB_READONLY );
m_unitsBottom->SetStringSelection(_("px"));
m_unitsBottom->SetHelpText(_("Units for the bottom position."));