Skip to content

M
magicseteditor
Commit 1833bbca authored by coppro's avatar coppro
Browse files
Options

Removed "sides" label, as it causes lock-ups on wxGTK.

parent fb9b3d0f
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 11 deletions
src/gui/symbol/basic_shape_editor.cpp
View file @ 1833bbca
...@@ -35,7 +35,7 @@ void SymbolBasicShapeEditor::draw(DC& dc) { ...@@ -35,7 +35,7 @@ void SymbolBasicShapeEditor::draw(DC& dc) {
void SymbolBasicShapeEditor::initUI(wxToolBar* tb, wxMenuBar* mb) { void SymbolBasicShapeEditor::initUI(wxToolBar* tb, wxMenuBar* mb) {
sides = new wxSpinCtrl( tb, ID_SIDES, _("3"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 3, 50, 3); sides = new wxSpinCtrl( tb, ID_SIDES, _("3"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 3, 50, 3);
sidesL = new wxStaticText(tb, ID_SIDES, _(" ") + _LABEL_("sides") + _(": ")); // sidesL = new wxStaticText(tb, ID_SIDES, _(" ") + _LABEL_("sides") + _(": "));
sides->SetHelpText(_HELP_("sides")); sides->SetHelpText(_HELP_("sides"));
sides->SetSize(50, -1); sides->SetSize(50, -1);
tb->AddSeparator(); tb->AddSeparator();
...@@ -43,7 +43,7 @@ void SymbolBasicShapeEditor::initUI(wxToolBar* tb, wxMenuBar* mb) { ...@@ -43,7 +43,7 @@ void SymbolBasicShapeEditor::initUI(wxToolBar* tb, wxMenuBar* mb) {
tb->AddTool(ID_SHAPE_RECTANGLE, _TOOL_("rectangle"), load_resource_tool_image(_("rectangle")), wxNullBitmap, wxITEM_CHECK, _TOOLTIP_("rectangle"), _HELP_("rectangle")); tb->AddTool(ID_SHAPE_RECTANGLE, _TOOL_("rectangle"), load_resource_tool_image(_("rectangle")), wxNullBitmap, wxITEM_CHECK, _TOOLTIP_("rectangle"), _HELP_("rectangle"));
tb->AddTool(ID_SHAPE_POLYGON, _TOOL_("polygon"), load_resource_tool_image(_("triangle")), wxNullBitmap, wxITEM_CHECK, _TOOLTIP_("polygon"), _HELP_("polygon")); tb->AddTool(ID_SHAPE_POLYGON, _TOOL_("polygon"), load_resource_tool_image(_("triangle")), wxNullBitmap, wxITEM_CHECK, _TOOLTIP_("polygon"), _HELP_("polygon"));
tb->AddTool(ID_SHAPE_STAR, _TOOL_("star"), load_resource_tool_image(_("star")), wxNullBitmap, wxITEM_CHECK, _TOOLTIP_("star"), _HELP_("star")); tb->AddTool(ID_SHAPE_STAR, _TOOL_("star"), load_resource_tool_image(_("star")), wxNullBitmap, wxITEM_CHECK, _TOOLTIP_("star"), _HELP_("star"));
tb->AddControl(sidesL); // tb->AddControl(sidesL);
tb->AddControl(sides); tb->AddControl(sides);
tb->Realize(); tb->Realize();
control.SetCursor(*wxCROSS_CURSOR); control.SetCursor(*wxCROSS_CURSOR);
...@@ -54,12 +54,10 @@ void SymbolBasicShapeEditor::destroyUI(wxToolBar* tb, wxMenuBar* mb) { ...@@ -54,12 +54,10 @@ void SymbolBasicShapeEditor::destroyUI(wxToolBar* tb, wxMenuBar* mb) {
tb->DeleteTool(ID_SHAPE_RECTANGLE); tb->DeleteTool(ID_SHAPE_RECTANGLE);
tb->DeleteTool(ID_SHAPE_POLYGON); tb->DeleteTool(ID_SHAPE_POLYGON);
tb->DeleteTool(ID_SHAPE_STAR); tb->DeleteTool(ID_SHAPE_STAR);
tb->RemoveChild(sidesL);
tb->RemoveChild(sides);
// HACK: hardcoded size of rest of toolbar // HACK: hardcoded size of rest of toolbar
tb->DeleteToolByPos(7); // delete separator tb->DeleteToolByPos(7); // delete separator
tb->DeleteToolByPos(7); // delete sidesL // tb->DeleteTool(ID_SIDES_LBEL); // delete sidesL
tb->DeleteToolByPos(7); // delete sides tb->DeleteTool(ID_SIDES); // delete sides
#if wxVERSION_NUMBER < 2600 #if wxVERSION_NUMBER < 2600
delete sides; delete sides;
delete sidesL; delete sidesL;
...@@ -214,11 +212,11 @@ void SymbolBasicShapeEditor::makeCenteredShape(const Vector2D& c, Vector2D r, bo ...@@ -214,11 +212,11 @@ void SymbolBasicShapeEditor::makeCenteredShape(const Vector2D& c, Vector2D r, bo
int n = sides->GetValue(); // number of sides int n = sides->GetValue(); // number of sides
if (mode == ID_SHAPE_POLYGON) { if (mode == ID_SHAPE_POLYGON) {
switch (n) { switch (n) {
case 3: shape->name = capitalize(_TYPE_("triangle")); case 3: shape->name = capitalize(_TYPE_("triangle")); break;
case 4: shape->name = capitalize(_TYPE_("rhombus")); case 4: shape->name = capitalize(_TYPE_("rhombus")); break;
case 5: shape->name = capitalize(_TYPE_("pentagon")); case 5: shape->name = capitalize(_TYPE_("pentagon")); break;
case 6: shape->name = capitalize(_TYPE_("hexagon")); case 6: shape->name = capitalize(_TYPE_("hexagon")); break;
default: shape->name = capitalize(_TYPE_("polygon")); default: shape->name = capitalize(_TYPE_("polygon")); break;
} }
} else { // star } else { // star
shape->name = capitalize(_TYPE_("star")); shape->name = capitalize(_TYPE_("star"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment