diff --git a/common/dialogs/dialog_image_editor_fbp.fbp b/common/dialogs/dialog_image_editor_fbp.fbp
index 6a2eda3005..b74767da11 100644
--- a/common/dialogs/dialog_image_editor_fbp.fbp
+++ b/common/dialogs/dialog_image_editor_fbp.fbp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
- <FileVersion major="1" minor="13" />
+ <FileVersion major="1" minor="15" />
<object class="Project" expanded="1">
- <property name="class_decoration"></property>
+ <property name="class_decoration" />
<property name="code_generation">C++</property>
<property name="disconnect_events">1</property>
<property name="disconnect_mode">source_name</property>
@@ -16,9 +16,9 @@
<property name="help_provider">none</property>
<property name="internationalize">1</property>
<property name="name">dialog_image_editor</property>
- <property name="namespace"></property>
+ <property name="namespace" />
<property name="path">.</property>
- <property name="precompiled_header"></property>
+ <property name="precompiled_header" />
<property name="relative_path">1</property>
<property name="skip_lua_events">1</property>
<property name="skip_php_events">1</property>
@@ -29,67 +29,67 @@
<object class="Dialog" expanded="1">
<property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
- <property name="bg"></property>
+ <property name="bg" />
<property name="center">wxBOTH</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="event_handler">impl_virtual</property>
- <property name="extra_style"></property>
- <property name="fg"></property>
- <property name="font"></property>
+ <property name="extra_style" />
+ <property name="fg" />
+ <property name="font" />
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
+ <property name="maximum_size" />
+ <property name="minimum_size" />
<property name="name">DIALOG_IMAGE_EDITOR_BASE</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="size">-1,-1</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h; forward_declare</property>
<property name="title">Image Editor</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnActivate"></event>
- <event name="OnActivateApp"></event>
- <event name="OnAuiFindManager"></event>
- <event name="OnAuiPaneButton"></event>
- <event name="OnAuiPaneClose"></event>
- <event name="OnAuiPaneMaximize"></event>
- <event name="OnAuiPaneRestore"></event>
- <event name="OnAuiRender"></event>
- <event name="OnChar"></event>
- <event name="OnClose"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnHibernate"></event>
- <event name="OnIconize"></event>
- <event name="OnIdle"></event>
- <event name="OnInitDialog"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
+ <property name="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnActivate" />
+ <event name="OnActivateApp" />
+ <event name="OnAuiFindManager" />
+ <event name="OnAuiPaneButton" />
+ <event name="OnAuiPaneClose" />
+ <event name="OnAuiPaneMaximize" />
+ <event name="OnAuiPaneRestore" />
+ <event name="OnAuiRender" />
+ <event name="OnChar" />
+ <event name="OnClose" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnHibernate" />
+ <event name="OnIconize" />
+ <event name="OnIdle" />
+ <event name="OnInitDialog" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
<object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">bSizerMain</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
@@ -98,7 +98,7 @@
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">bUpperSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
@@ -107,7 +107,7 @@
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">bSizerLeft</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
@@ -120,75 +120,75 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
+ <property name="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
- <property name="fg"></property>
+ <property name="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
<property name="minimum_size">256,256</property>
<property name="moveable">1</property>
<property name="name">m_panelDraw</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style">wxFULL_REPAINT_ON_RESIZE|wxSIMPLE_BORDER|wxTAB_TRAVERSAL</property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
+ <property name="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style">wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL|wxBORDER_SIMPLE</property>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
<event name="OnPaint">OnRedrawPanel</event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -196,7 +196,7 @@
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">bSizerRight</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
@@ -209,17 +209,17 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
+ <property name="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<property name="context_menu">1</property>
<property name="default">0</property>
<property name="default_pane">0</property>
@@ -227,65 +227,65 @@
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
- <property name="fg"></property>
+ <property name="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Grey</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_buttonGrey</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="validator_variable" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<event name="OnButtonClick">OnGreyScaleConvert</event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -307,78 +307,78 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
+ <property name="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
- <property name="fg"></property>
+ <property name="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Image Scale:</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
+ <property name="maximum_size" />
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_staticTextScale</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
+ <property name="tooltip" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
<property name="wrap">-1</property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnUpdateUI" />
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -390,86 +390,86 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
+ <property name="aui_layer" />
+ <property name="aui_name" />
+ <property name="aui_position" />
+ <property name="aui_row" />
+ <property name="best_size" />
+ <property name="bg" />
+ <property name="caption" />
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
- <property name="context_help"></property>
+ <property name="context_help" />
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
- <property name="fg"></property>
+ <property name="fg" />
<property name="floatable">1</property>
- <property name="font"></property>
+ <property name="font" />
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="max_size"></property>
+ <property name="max_size" />
<property name="maximize_button">0</property>
- <property name="maximum_size"></property>
+ <property name="maximum_size" />
<property name="maxlength">0</property>
- <property name="min_size"></property>
+ <property name="min_size" />
<property name="minimize_button">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="moveable">1</property>
<property name="name">m_textCtrlScale</property>
<property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
+ <property name="pane_position" />
+ <property name="pane_size" />
<property name="permission">protected</property>
<property name="pin_button">1</property>
- <property name="pos"></property>
+ <property name="pos" />
<property name="resize">Resizable</property>
<property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
+ <property name="size" />
+ <property name="style" />
+ <property name="subclass" />
<property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
+ <property name="tooltip" />
+ <property name="validator_data_type" />
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="value"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnText"></event>
- <event name="OnTextEnter"></event>
- <event name="OnTextMaxLen"></event>
- <event name="OnTextURL"></event>
- <event name="OnUpdateUI"></event>
+ <property name="validator_variable" />
+ <property name="value" />
+ <property name="window_extra_style" />
+ <property name="window_name" />
+ <property name="window_style" />
+ <event name="OnChar" />
+ <event name="OnEnterWindow" />
+ <event name="OnEraseBackground" />
+ <event name="OnKeyDown" />
+ <event name="OnKeyUp" />
+ <event name="OnKillFocus" />
+ <event name="OnLeaveWindow" />
+ <event name="OnLeftDClick" />
+ <event name="OnLeftDown" />
+ <event name="OnLeftUp" />
+ <event name="OnMiddleDClick" />
+ <event name="OnMiddleDown" />
+ <event name="OnMiddleUp" />
+ <event name="OnMotion" />
+ <event name="OnMouseEvents" />
+ <event name="OnMouseWheel" />
+ <event name="OnPaint" />
+ <event name="OnRightDClick" />
+ <event name="OnRightDown" />
+ <event name="OnRightUp" />
+ <event name="OnSetFocus" />
+ <event name="OnSize" />
+ <event name="OnText" />
+ <event name="OnTextEnter" />
+ <event name="OnTextMaxLen" />
+ <event name="OnTextURL" />
+ <event name="OnUpdateUI" />
</object>
</object>
</object>
@@ -491,17 +491,17 @@
<property name="OK">1</property>
<property name="Save">0</property>
<property name="Yes">0</property>
- <property name="minimum_size"></property>
+ <property name="minimum_size" />
<property name="name">m_sdbSizer</property>
<property name="permission">protected</property>
- <event name="OnApplyButtonClick"></event>
- <event name="OnCancelButtonClick"></event>
- <event name="OnContextHelpButtonClick"></event>
- <event name="OnHelpButtonClick"></event>
- <event name="OnNoButtonClick"></event>
- <event name="OnOKButtonClick"></event>
- <event name="OnSaveButtonClick"></event>
- <event name="OnYesButtonClick"></event>
+ <event name="OnApplyButtonClick" />
+ <event name="OnCancelButtonClick" />
+ <event name="OnContextHelpButtonClick" />
+ <event name="OnHelpButtonClick" />
+ <event name="OnNoButtonClick" />
+ <event name="OnOKButtonClick" />
+ <event name="OnSaveButtonClick" />
+ <event name="OnYesButtonClick" />
</object>
</object>
</object>
diff --git a/common/dialogs/panel_common_settings_base.cpp b/common/dialogs/panel_common_settings_base.cpp
index e05e8df98a..7ff9bdddb2 100644
--- a/common/dialogs/panel_common_settings_base.cpp
+++ b/common/dialogs/panel_common_settings_base.cpp
@@ -25,7 +25,7 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind
m_staticTextautosave = new wxStaticText( this, wxID_ANY, _("&Auto save:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextautosave->Wrap( -1 );
- gbSizer1->Add( m_staticTextautosave, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
+ gbSizer1->Add( m_staticTextautosave, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
wxBoxSizer* bSizer6;
bSizer6 = new wxBoxSizer( wxHORIZONTAL );
@@ -41,7 +41,7 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind
bSizer6->Add( minutesLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
- gbSizer1->Add( bSizer6, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 );
+ gbSizer1->Add( bSizer6, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP, 5 );
m_staticTextFileHistorySize = new wxStaticText( this, wxID_ANY, _("File history size:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextFileHistorySize->Wrap( -1 );
@@ -50,6 +50,10 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind
m_fileHistorySize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 100, 0 );
gbSizer1->Add( m_fileHistorySize, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
+ m_staticTextClear3DCache = new wxStaticText( this, wxID_ANY, _("3D cache file duration:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticTextClear3DCache->Wrap( -1 );
+ gbSizer1->Add( m_staticTextClear3DCache, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
+
wxBoxSizer* bSizer5;
bSizer5 = new wxBoxSizer( wxHORIZONTAL );
@@ -86,14 +90,10 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind
m_antialiasingFallback->SetSelection( 0 );
gbSizer1->Add( m_antialiasingFallback, wxGBPosition( 6, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
- m_staticTextClear3DCache = new wxStaticText( this, wxID_ANY, _("3D cache file duration:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticTextClear3DCache->Wrap( -1 );
- gbSizer1->Add( m_staticTextClear3DCache, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
-
gbSizer1->AddGrowableCol( 1 );
- bLeftSizer->Add( gbSizer1, 0, wxEXPAND|wxALL, 15 );
+ bLeftSizer->Add( gbSizer1, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 10 );
wxStaticBoxSizer* sizerHelperApps;
sizerHelperApps = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Helper Applications") ), wxVERTICAL );
@@ -150,10 +150,10 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind
bLeftSizer->Add( sizerHelperApps, 0, wxEXPAND|wxALL, 5 );
wxStaticBoxSizer* sbSizerIconsOpts;
- sbSizerIconsOpts = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User Interface") ), wxHORIZONTAL );
+ sbSizerIconsOpts = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User Interface") ), wxVERTICAL );
wxGridBagSizer* gbSizer4;
- gbSizer4 = new wxGridBagSizer( 20, 0 );
+ gbSizer4 = new wxGridBagSizer( 10, 0 );
gbSizer4->SetFlexibleDirection( wxBOTH );
gbSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -187,7 +187,7 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind
gbSizer4->AddGrowableCol( 1 );
gbSizer4->AddGrowableRow( 0 );
- sbSizerIconsOpts->Add( gbSizer4, 1, wxBOTTOM|wxRIGHT, 5 );
+ sbSizerIconsOpts->Add( gbSizer4, 0, wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
bLeftSizer->Add( sbSizerIconsOpts, 1, wxEXPAND|wxALL, 5 );
diff --git a/common/dialogs/panel_common_settings_base.fbp b/common/dialogs/panel_common_settings_base.fbp
index 656a9e8d92..05b066b397 100644
--- a/common/dialogs/panel_common_settings_base.fbp
+++ b/common/dialogs/panel_common_settings_base.fbp
@@ -64,8 +64,8 @@
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
- <property name="border">15</property>
- <property name="flag">wxEXPAND|wxALL</property>
+ <property name="border">10</property>
+ <property name="flag">wxEXPAND|wxTOP|wxBOTTOM|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxGridBagSizer" expanded="0">
<property name="empty_cell_size">-1,2</property>
@@ -82,7 +82,7 @@
<property name="border">5</property>
<property name="colspan">1</property>
<property name="column">0</property>
- <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+ <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP</property>
<property name="row">0</property>
<property name="rowspan">1</property>
<object class="wxStaticText" expanded="0">
@@ -146,7 +146,7 @@
<property name="border">5</property>
<property name="colspan">1</property>
<property name="column">1</property>
- <property name="flag">wxEXPAND</property>
+ <property name="flag">wxEXPAND|wxTOP</property>
<property name="row">0</property>
<property name="rowspan">1</property>
<object class="wxBoxSizer" expanded="0">
@@ -408,6 +408,70 @@
<property name="window_style"></property>
</object>
</object>
+ <object class="gbsizeritem" expanded="0">
+ <property name="border">5</property>
+ <property name="colspan">1</property>
+ <property name="column">0</property>
+ <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP</property>
+ <property name="row">2</property>
+ <property name="rowspan">1</property>
+ <object class="wxStaticText" expanded="0">
+ <property name="BottomDockable">1</property>
+ <property name="LeftDockable">1</property>
+ <property name="RightDockable">1</property>
+ <property name="TopDockable">1</property>
+ <property name="aui_layer"></property>
+ <property name="aui_name"></property>
+ <property name="aui_position"></property>
+ <property name="aui_row"></property>
+ <property name="best_size"></property>
+ <property name="bg"></property>
+ <property name="caption"></property>
+ <property name="caption_visible">1</property>
+ <property name="center_pane">0</property>
+ <property name="close_button">1</property>
+ <property name="context_help"></property>
+ <property name="context_menu">1</property>
+ <property name="default_pane">0</property>
+ <property name="dock">Dock</property>
+ <property name="dock_fixed">0</property>
+ <property name="docking">Left</property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="floatable">1</property>
+ <property name="font"></property>
+ <property name="gripper">0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+ <property name="label">3D cache file duration:</property>
+ <property name="markup">0</property>
+ <property name="max_size"></property>
+ <property name="maximize_button">0</property>
+ <property name="maximum_size"></property>
+ <property name="min_size"></property>
+ <property name="minimize_button">0</property>
+ <property name="minimum_size"></property>
+ <property name="moveable">1</property>
+ <property name="name">m_staticTextClear3DCache</property>
+ <property name="pane_border">1</property>
+ <property name="pane_position"></property>
+ <property name="pane_size"></property>
+ <property name="permission">protected</property>
+ <property name="pin_button">1</property>
+ <property name="pos"></property>
+ <property name="resize">Resizable</property>
+ <property name="show">1</property>
+ <property name="size"></property>
+ <property name="style"></property>
+ <property name="subclass">; ; forward_declare</property>
+ <property name="toolbar_pane">0</property>
+ <property name="tooltip"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <property name="wrap">-1</property>
+ </object>
+ </object>
<object class="gbsizeritem" expanded="0">
<property name="border">5</property>
<property name="colspan">1</property>
@@ -807,70 +871,6 @@
<property name="window_style"></property>
</object>
</object>
- <object class="gbsizeritem" expanded="0">
- <property name="border">5</property>
- <property name="colspan">1</property>
- <property name="column">0</property>
- <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP</property>
- <property name="row">2</property>
- <property name="rowspan">1</property>
- <object class="wxStaticText" expanded="0">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_layer"></property>
- <property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">3D cache file duration:</property>
- <property name="markup">0</property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
- <property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">m_staticTextClear3DCache</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="permission">protected</property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="resize">Resizable</property>
- <property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass">; ; forward_declare</property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <property name="wrap">-1</property>
- </object>
- </object>
</object>
</object>
<object class="sizeritem" expanded="1">
@@ -1404,13 +1404,13 @@
<property name="label">User Interface</property>
<property name="minimum_size"></property>
<property name="name">sbSizerIconsOpts</property>
- <property name="orient">wxHORIZONTAL</property>
+ <property name="orient">wxVERTICAL</property>
<property name="parent">1</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
- <property name="flag">wxBOTTOM|wxRIGHT</property>
- <property name="proportion">1</property>
+ <property name="flag">wxBOTTOM|wxRIGHT|wxEXPAND</property>
+ <property name="proportion">0</property>
<object class="wxGridBagSizer" expanded="1">
<property name="empty_cell_size"></property>
<property name="flexible_direction">wxBOTH</property>
@@ -1421,7 +1421,7 @@
<property name="name">gbSizer4</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">none</property>
- <property name="vgap">20</property>
+ <property name="vgap">10</property>
<object class="gbsizeritem" expanded="1">
<property name="border">5</property>
<property name="colspan">1</property>
diff --git a/common/dialogs/panel_common_settings_base.h b/common/dialogs/panel_common_settings_base.h
index 4ee69a878f..0bc66351b5 100644
--- a/common/dialogs/panel_common_settings_base.h
+++ b/common/dialogs/panel_common_settings_base.h
@@ -48,12 +48,12 @@ class PANEL_COMMON_SETTINGS_BASE : public RESETTABLE_PANEL
wxSpinCtrl* m_SaveTime;
wxStaticText* m_staticTextFileHistorySize;
wxSpinCtrl* m_fileHistorySize;
+ wxStaticText* m_staticTextClear3DCache;
wxSpinCtrl* m_Clear3DCacheFilesOlder;
wxStaticText* m_staticTextDays;
wxChoice* m_antialiasing;
wxStaticText* m_antialiasingFallbackLabel;
wxChoice* m_antialiasingFallback;
- wxStaticText* m_staticTextClear3DCache;
wxTextCtrl* m_textEditorPath;
wxBitmapButton* m_textEditorBtn;
wxRadioButton* m_defaultPDFViewer;
diff --git a/common/dialogs/panel_gal_display_options.cpp b/common/dialogs/panel_gal_display_options.cpp
index db4122a5db..126598a5c9 100644
--- a/common/dialogs/panel_gal_display_options.cpp
+++ b/common/dialogs/panel_gal_display_options.cpp
@@ -34,9 +34,7 @@ PANEL_GAL_DISPLAY_OPTIONS::PANEL_GAL_DISPLAY_OPTIONS( EDA_DRAW_FRAME* aFrame,
SetSizer( mainSizer );
// install GAL options pane
- KIGFX::GAL_DISPLAY_OPTIONS& galOptions = m_frame->GetGalDisplayOptions();
-
- m_galOptsPanel = new GAL_OPTIONS_PANEL( this, galOptions );
+ m_galOptsPanel = new GAL_OPTIONS_PANEL( this, m_frame );
mainSizer->Add( m_galOptsPanel, 1, wxEXPAND | wxLEFT, 5 );
// a spacer to take up the other half of the width
diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp
index 536710fd39..798af1af2b 100644
--- a/common/eda_draw_frame.cpp
+++ b/common/eda_draw_frame.cpp
@@ -1046,16 +1046,19 @@ void EDA_DRAW_FRAME::resolveCanvasType()
saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO );
// Switch to OpenGL, which will save the new setting if successful
- GetToolManager()->RunAction( ACTIONS::acceleratedGraphics, true );
+ SwitchCanvas( EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL );
// Switch back to Cairo if OpenGL is not supported
if( GetCanvas()->GetBackend() == EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE )
- GetToolManager()->RunAction( ACTIONS::standardGraphics, true );
+ SwitchCanvas( EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO );
+
+ HardRedraw();
}
else
{
// If they were on legacy, switch to Cairo
- GetToolManager()->RunAction( ACTIONS::standardGraphics, true );
+ SwitchCanvas( EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO );
+ HardRedraw();
}
}
diff --git a/common/tool/actions.cpp b/common/tool/actions.cpp
index 4723c1bd88..612911cda8 100644
--- a/common/tool/actions.cpp
+++ b/common/tool/actions.cpp
@@ -587,16 +587,6 @@ TOOL_ACTION ACTIONS::updateSchematicFromPcb( "common.Control.updateSchematicFrom
_( "Update Schematic from PCB..." ), _( "Update schematic with changes made to PCB" ),
update_sch_from_pcb_xpm );
-TOOL_ACTION ACTIONS::acceleratedGraphics( "common.Control.acceleratedGraphics",
- AS_GLOBAL, 0, "",
- _( "Accelerated Graphics" ), _( "Use hardware-accelerated graphics (recommended)" ),
- tools_xpm );
-
-TOOL_ACTION ACTIONS::standardGraphics( "common.Control.standardGraphics",
- AS_GLOBAL, 0, "",
- _( "Standard Graphics" ), _( "Use software graphics (fall-back)" ),
- tools_xpm );
-
TOOL_ACTION ACTIONS::configurePaths( "common.SuiteControl.configurePaths",
AS_GLOBAL, 0, "",
_( "Configure Paths..." ), _( "Edit path configuration environment variables" ),
diff --git a/common/tool/common_tools.cpp b/common/tool/common_tools.cpp
index fd612baea3..9e3d860ce8 100644
--- a/common/tool/common_tools.cpp
+++ b/common/tool/common_tools.cpp
@@ -584,22 +584,6 @@ int COMMON_TOOLS::ToggleCursorStyle( const TOOL_EVENT& aEvent )
}
-int COMMON_TOOLS::SwitchCanvas( const TOOL_EVENT& aEvent )
-{
- if( aEvent.IsAction( &ACTIONS::acceleratedGraphics ) )
- m_frame->SwitchCanvas( EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL );
-#ifndef __WXMAC__
- else if( aEvent.IsAction( &ACTIONS::standardGraphics ) )
- m_frame->SwitchCanvas( EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO );
-#endif
- else
- wxFAIL_MSG( "Unknown canvas type" );
-
- m_frame->HardRedraw();
- return 0;
-}
-
-
void COMMON_TOOLS::setTransitions()
{
Go( &COMMON_TOOLS::SelectionTool, ACTIONS::selectionTool.MakeEvent() );
@@ -656,8 +640,6 @@ void COMMON_TOOLS::setTransitions()
// Misc
Go( &COMMON_TOOLS::ToggleCursor, ACTIONS::toggleCursor.MakeEvent() );
Go( &COMMON_TOOLS::ToggleCursorStyle, ACTIONS::toggleCursorStyle.MakeEvent() );
- Go( &COMMON_TOOLS::SwitchCanvas, ACTIONS::acceleratedGraphics.MakeEvent() );
- Go( &COMMON_TOOLS::SwitchCanvas, ACTIONS::standardGraphics.MakeEvent() );
}
diff --git a/common/tool/editor_conditions.cpp b/common/tool/editor_conditions.cpp
index 6d2a6ef286..dcd2cc6d72 100644
--- a/common/tool/editor_conditions.cpp
+++ b/common/tool/editor_conditions.cpp
@@ -104,17 +104,6 @@ SELECTION_CONDITION EDITOR_CONDITIONS::FullscreenCursor()
}
-SELECTION_CONDITION EDITOR_CONDITIONS::CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE aType )
-{
- // The canvas type requires a draw frame
- EDA_DRAW_FRAME* drwFrame = dynamic_cast<EDA_DRAW_FRAME*>( m_frame );
-
- wxASSERT( drwFrame );
-
- return std::bind( &EDITOR_CONDITIONS::canvasTypeFunc, _1, drwFrame, aType );
-}
-
-
bool EDITOR_CONDITIONS::contentModifiedFunc( const SELECTION& aSelection, EDA_BASE_FRAME* aFrame )
{
return aFrame->IsContentModified();
@@ -170,9 +159,3 @@ bool EDITOR_CONDITIONS::cursorFunc( const SELECTION& aSelection, EDA_DRAW_FRAME*
return aFrame->GetGalDisplayOptions().m_fullscreenCursor;
}
-
-bool EDITOR_CONDITIONS::canvasTypeFunc( const SELECTION& aSelection, EDA_DRAW_FRAME* aFrame,
- EDA_DRAW_PANEL_GAL::GAL_TYPE aType )
-{
- return aFrame->GetCanvas()->GetBackend() == aType;
-}
diff --git a/common/widgets/gal_options_panel.cpp b/common/widgets/gal_options_panel.cpp
index 6bd3b25d0f..ae656d433b 100644
--- a/common/widgets/gal_options_panel.cpp
+++ b/common/widgets/gal_options_panel.cpp
@@ -31,7 +31,7 @@
#include <wx/statbox.h>
#include <widgets/gal_options_panel.h>
-
+#include <eda_draw_frame.h>
#include <common.h>
#include <config_map.h>
@@ -62,9 +62,10 @@ static const UTIL::CFG_MAP<KIGFX::GRID_SNAPPING> gridSnapConfigVals =
{ KIGFX::GRID_SNAPPING::NEVER, 2 }
};
-GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, KIGFX::GAL_DISPLAY_OPTIONS& aGalOpts ):
+GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFrame ) :
wxPanel( aParent, wxID_ANY ),
- m_galOptions( aGalOpts )
+ m_drawFrame( aDrawFrame ),
+ m_galOptions( aDrawFrame->GetGalDisplayOptions() )
{
// the main sizer that holds "columns" of settings
m_mainSizer = new wxBoxSizer( wxHORIZONTAL );
@@ -74,6 +75,25 @@ GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, KIGFX::GAL_DISPLAY_OPTI
wxBoxSizer* sLeftSizer = new wxBoxSizer( wxVERTICAL );
m_mainSizer->Add( sLeftSizer, 1, wxALL | wxEXPAND, 0 );
+ /*
+ * Rendering engine
+ */
+#ifndef __WXMAC__
+ {
+ wxString engineChoices[] = { _( "Accelerated graphics" ), _( "Fallback graphics" ) };
+ m_renderingEngine = new wxRadioBox( this, wxID_ANY, _( "Rendering Engine" ),
+ wxDefaultPosition, wxDefaultSize,
+ sizeof( engineChoices ) / sizeof( wxString ),
+ engineChoices, 1, wxRA_SPECIFY_COLS );
+ m_renderingEngine->SetItemToolTip( 0, _( "Hardware-accelerated graphics (recommended)" ) );
+ m_renderingEngine->SetItemToolTip( 1, _( "Software graphics (for computers which do not "
+ "support KiCad's hardware acceleration "
+ "requirements)" ) );
+
+ sLeftSizer->Add( m_renderingEngine, 0, wxTOP | wxBOTTOM | wxRIGHT | wxEXPAND, 5 );
+ }
+#endif
+
/*
* Grid settings subpanel
*/
@@ -188,11 +208,16 @@ GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, KIGFX::GAL_DISPLAY_OPTI
bool GAL_OPTIONS_PANEL::TransferDataToWindow()
{
- m_gridSnapOptions->SetSelection(
- UTIL::GetConfigForVal( gridSnapConfigVals, m_galOptions.m_gridSnapping ) );
+ if( m_drawFrame->GetCanvas()->GetBackend() == EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL )
+ m_renderingEngine->SetSelection( 0 );
+ else
+ m_renderingEngine->SetSelection( 1 );
- m_gridStyle->SetSelection( UTIL::GetConfigForVal(
- gridStyleSelectMap, m_galOptions.m_gridStyle ) );
+ m_gridSnapOptions->SetSelection( UTIL::GetConfigForVal( gridSnapConfigVals,
+ m_galOptions.m_gridSnapping ) );
+
+ m_gridStyle->SetSelection( UTIL::GetConfigForVal( gridStyleSelectMap,
+ m_galOptions.m_gridStyle ) );
m_gridLineWidth->SetValue( m_galOptions.m_gridLineWidth );
@@ -209,10 +234,10 @@ bool GAL_OPTIONS_PANEL::TransferDataToWindow()
bool GAL_OPTIONS_PANEL::TransferDataFromWindow()
{
m_galOptions.m_gridSnapping = UTIL::GetValFromConfig( gridSnapConfigVals,
- m_gridSnapOptions->GetSelection() );
+ m_gridSnapOptions->GetSelection() );
- m_galOptions.m_gridStyle = UTIL::GetValFromConfig(
- gridStyleSelectMap, m_gridStyle->GetSelection() );
+ m_galOptions.m_gridStyle = UTIL::GetValFromConfig( gridStyleSelectMap,
+ m_gridStyle->GetSelection() );
m_galOptions.m_gridLineWidth = m_gridLineWidth->GetValue();
@@ -222,5 +247,13 @@ bool GAL_OPTIONS_PANEL::TransferDataFromWindow()
m_galOptions.m_forceDisplayCursor = m_forceCursorDisplay->GetValue();
+ EDA_DRAW_PANEL_GAL::GAL_TYPE wantedType = m_renderingEngine->GetSelection() == 0 ?
+ EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL :
+ EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO;
+ EDA_DRAW_PANEL_GAL::GAL_TYPE currentType = m_drawFrame->GetCanvas()->GetBackend();
+
+ if( wantedType != currentType )
+ m_drawFrame->GetCanvas()->SwitchBackend( wantedType );
+
return true;
}
diff --git a/eeschema/dialogs/panel_eeschema_display_options.cpp b/eeschema/dialogs/panel_eeschema_display_options.cpp
index 4f048c45de..9576a180b0 100644
--- a/eeschema/dialogs/panel_eeschema_display_options.cpp
+++ b/eeschema/dialogs/panel_eeschema_display_options.cpp
@@ -33,8 +33,7 @@ PANEL_EESCHEMA_DISPLAY_OPTIONS::PANEL_EESCHEMA_DISPLAY_OPTIONS( SCH_EDIT_FRAME*
PANEL_EESCHEMA_DISPLAY_OPTIONS_BASE( aWindow ),
m_frame( aFrame )
{
- KIGFX::GAL_DISPLAY_OPTIONS& galOptions = m_frame->GetGalDisplayOptions();
- m_galOptsPanel = new GAL_OPTIONS_PANEL( this, galOptions );
+ m_galOptsPanel = new GAL_OPTIONS_PANEL( this, m_frame );
m_galOptionsSizer->Add( m_galOptsPanel, 1, wxEXPAND, 0 );
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index fd584b2642..0a52a360c8 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -273,12 +273,6 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
prefsMenu->AppendSeparator();
AddMenuLanguageList( prefsMenu, selTool );
-#ifndef __WXMAC__
- prefsMenu->AppendSeparator();
- prefsMenu->Add( ACTIONS::acceleratedGraphics, ACTION_MENU::CHECK );
- prefsMenu->Add( ACTIONS::standardGraphics, ACTION_MENU::CHECK );
-#endif
-
//-- Menubar -------------------------------------------------------------
//
diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index fa5a4c3154..41c22621d9 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -385,8 +385,6 @@ void SCH_EDIT_FRAME::setupUIConditions()
mgr->SetConditions( ACTIONS::millimetersUnits, CHECK( cond.Units( EDA_UNITS::MILLIMETRES ) ) );
mgr->SetConditions( ACTIONS::inchesUnits, CHECK( cond.Units( EDA_UNITS::INCHES ) ) );
mgr->SetConditions( ACTIONS::milsUnits, CHECK( cond.Units( EDA_UNITS::MILS ) ) );
- mgr->SetConditions( ACTIONS::acceleratedGraphics, CHECK( cond.CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL ) ) );
- mgr->SetConditions( ACTIONS::standardGraphics, CHECK( cond.CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO ) ) );
mgr->SetConditions( ACTIONS::cut, ENABLE( hasElements ) );
mgr->SetConditions( ACTIONS::copy, ENABLE( hasElements ) );
diff --git a/eeschema/symbol_editor/menubar_symbol_editor.cpp b/eeschema/symbol_editor/menubar_symbol_editor.cpp
index c1b7e076e6..05ad1e1976 100644
--- a/eeschema/symbol_editor/menubar_symbol_editor.cpp
+++ b/eeschema/symbol_editor/menubar_symbol_editor.cpp
@@ -168,12 +168,6 @@ void SYMBOL_EDIT_FRAME::ReCreateMenuBar()
prefsMenu->AppendSeparator();
AddMenuLanguageList( prefsMenu, selTool );
-#ifndef __WXMAC__
- prefsMenu->AppendSeparator();
- prefsMenu->Add( ACTIONS::acceleratedGraphics, ACTION_MENU::CHECK );
- prefsMenu->Add( ACTIONS::standardGraphics, ACTION_MENU::CHECK );
-#endif
-
//-- Menubar -------------------------------------------------------------
//
diff --git a/eeschema/symbol_editor/symbol_edit_frame.cpp b/eeschema/symbol_editor/symbol_edit_frame.cpp
index 34e0bf5da2..259ea6fcd4 100644
--- a/eeschema/symbol_editor/symbol_edit_frame.cpp
+++ b/eeschema/symbol_editor/symbol_edit_frame.cpp
@@ -390,9 +390,6 @@ void SYMBOL_EDIT_FRAME::setupUIConditions()
mgr->SetConditions( ACTIONS::inchesUnits, CHECK( cond.Units( EDA_UNITS::INCHES ) ) );
mgr->SetConditions( ACTIONS::milsUnits, CHECK( cond.Units( EDA_UNITS::MILS ) ) );
- mgr->SetConditions( ACTIONS::acceleratedGraphics, CHECK( cond.CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL ) ) );
- mgr->SetConditions( ACTIONS::standardGraphics, CHECK( cond.CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO ) ) );
-
mgr->SetConditions( ACTIONS::cut, ENABLE( isEditableCond ) );
mgr->SetConditions( ACTIONS::copy, ENABLE( haveSymbolCond ) );
mgr->SetConditions( ACTIONS::paste, ENABLE( isEditableCond && SELECTION_CONDITIONS::Idle ) );
diff --git a/gerbview/dialogs/panel_gerbview_display_options.cpp b/gerbview/dialogs/panel_gerbview_display_options.cpp
index f406ae7aab..0f66f7b663 100644
--- a/gerbview/dialogs/panel_gerbview_display_options.cpp
+++ b/gerbview/dialogs/panel_gerbview_display_options.cpp
@@ -33,8 +33,7 @@ PANEL_GERBVIEW_DISPLAY_OPTIONS::PANEL_GERBVIEW_DISPLAY_OPTIONS( GERBVIEW_FRAME *
PANEL_GERBVIEW_DISPLAY_OPTIONS_BASE( aWindow, wxID_ANY ),
m_Parent( aFrame )
{
- KIGFX::GAL_DISPLAY_OPTIONS& galOptions = m_Parent->GetGalDisplayOptions();
- m_galOptsPanel = new GAL_OPTIONS_PANEL( this, galOptions );
+ m_galOptsPanel = new GAL_OPTIONS_PANEL( this, m_Parent );
m_galOptionsSizer->Add( m_galOptsPanel, 0, wxEXPAND | wxLEFT, 5 );
}
diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp
index ac757cbc8c..851872e21c 100644
--- a/gerbview/gerbview_frame.cpp
+++ b/gerbview/gerbview_frame.cpp
@@ -1060,11 +1060,6 @@ void GERBVIEW_FRAME::setupUIConditions()
mgr->SetConditions( ACTIONS::milsUnits,
CHECK( cond.Units( EDA_UNITS::MILS ) ) );
- mgr->SetConditions( ACTIONS::acceleratedGraphics,
- CHECK( cond.CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL ) ) );
- mgr->SetConditions( ACTIONS::standardGraphics,
- CHECK( cond.CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO ) ) );
-
auto flashedDisplayOutlinesCond =
[this] ( const SELECTION& )
{
diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp
index 4b3f3fa248..8b91b007e3 100644
--- a/gerbview/menubar.cpp
+++ b/gerbview/menubar.cpp
@@ -217,12 +217,6 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
preferencesMenu->AppendSeparator();
AddMenuLanguageList( preferencesMenu, selTool );
-#ifndef __WXMAC__
- preferencesMenu->AppendSeparator();
- preferencesMenu->Add( ACTIONS::acceleratedGraphics, ACTION_MENU::CHECK );
- preferencesMenu->Add( ACTIONS::standardGraphics, ACTION_MENU::CHECK );
-#endif
-
//-- Menubar -------------------------------------------------------------
//
diff --git a/include/tool/actions.h b/include/tool/actions.h
index bb7bf00ef7..5813fa9dc8 100644
--- a/include/tool/actions.h
+++ b/include/tool/actions.h
@@ -165,8 +165,6 @@ public:
static TOOL_ACTION showFootprintEditor;
static TOOL_ACTION updatePcbFromSchematic;
static TOOL_ACTION updateSchematicFromPcb;
- static TOOL_ACTION acceleratedGraphics;
- static TOOL_ACTION standardGraphics;
// Internal
static TOOL_ACTION updateMenu;
diff --git a/include/tool/common_tools.h b/include/tool/common_tools.h
index bd31d15c09..dd9438305c 100644
--- a/include/tool/common_tools.h
+++ b/include/tool/common_tools.h
@@ -85,8 +85,6 @@ public:
int GridPreset( int idx );
int OnGridChanged();
- int SwitchCanvas( const TOOL_EVENT& aEvent );
-
private:
/**
* The set of "Zoom to Fit" types that can be performed.
diff --git a/include/tool/editor_conditions.h b/include/tool/editor_conditions.h
index 053caad57b..c7360a3f06 100644
--- a/include/tool/editor_conditions.h
+++ b/include/tool/editor_conditions.h
@@ -118,15 +118,6 @@ public:
*/
SELECTION_CONDITION FullscreenCursor();
- /**
- * Create a functor testing if the specified canvas is active in the frame.
- *
- * @note This requires the frame passed into the constructor be be derived from EDA_DRAW_FRAME.
- *
- * @return Functor testing the canvas type of the frame
- */
- SELECTION_CONDITION CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE aType );
-
protected:
///< Helper function used by ContentModified().
static bool contentModifiedFunc( const SELECTION& aSelection, EDA_BASE_FRAME* aFrame );
diff --git a/include/widgets/gal_options_panel.h b/include/widgets/gal_options_panel.h
index 11db79aaa9..3d9305703b 100644
--- a/include/widgets/gal_options_panel.h
+++ b/include/widgets/gal_options_panel.h
@@ -32,12 +32,13 @@ class wxBoxSizer;
class wxRadioBox;
class wxSpinCtrlDouble;
class wxStaticText;
+class EDA_DRAW_FRAME;
class GAL_OPTIONS_PANEL: public wxPanel
{
public:
- GAL_OPTIONS_PANEL( wxWindow* aParent, KIGFX::GAL_DISPLAY_OPTIONS& aGalOpts );
+ GAL_OPTIONS_PANEL( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFrame );
/**
* Load the panel controls from the given opt
@@ -50,24 +51,27 @@ public:
bool TransferDataFromWindow() override;
private:
- wxBoxSizer* m_mainSizer;
+ EDA_DRAW_FRAME* m_drawFrame;
- wxRadioBox* m_gridStyle;
+ wxBoxSizer* m_mainSizer;
- wxStaticText* l_gridLineWidth;
+ wxRadioBox* m_renderingEngine;
+
+ wxRadioBox* m_gridStyle;
+ wxStaticText* l_gridLineWidth;
wxSpinCtrlDouble* m_gridLineWidth;
- wxStaticText* l_gridLineWidthUnits;
+ wxStaticText* l_gridLineWidthUnits;
- wxStaticText* l_gridMinSpacing;
+ wxStaticText* l_gridMinSpacing;
wxSpinCtrlDouble* m_gridMinSpacing;
- wxStaticText* l_gridMinSpacingUnits;
+ wxStaticText* l_gridMinSpacingUnits;
- wxStaticText* l_gridSnapOptions;
- wxChoice* m_gridSnapOptions;
- wxStaticText* l_gridSnapSpace;
+ wxStaticText* l_gridSnapOptions;
+ wxChoice* m_gridSnapOptions;
+ wxStaticText* l_gridSnapSpace;
- wxRadioBox* m_cursorShape;
- wxCheckBox* m_forceCursorDisplay;
+ wxRadioBox* m_cursorShape;
+ wxCheckBox* m_forceCursorDisplay;
///< The GAL options to read/write
KIGFX::GAL_DISPLAY_OPTIONS& m_galOptions;
diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp
index 72f3c66b45..671730ffa7 100644
--- a/pagelayout_editor/menubar.cpp
+++ b/pagelayout_editor/menubar.cpp
@@ -148,7 +148,6 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
ACTION_MENU* inspectorMenu = new ACTION_MENU( false, selTool );
inspectorMenu->Add( PL_ACTIONS::showInspector );
-
//-- Preferences menu --------------------------------------------------
//
ACTION_MENU* preferencesMenu = new ACTION_MENU( false, selTool );
@@ -161,12 +160,6 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
// Language submenu
AddMenuLanguageList( preferencesMenu, selTool );
-#ifndef __WXMAC__
- preferencesMenu->AppendSeparator();
- preferencesMenu->Add( ACTIONS::acceleratedGraphics, ACTION_MENU::CHECK );
- preferencesMenu->Add( ACTIONS::standardGraphics, ACTION_MENU::CHECK );
-#endif
-
//-- Menubar -----------------------------------------------------------
//
menuBar->Append( fileMenu, _( "&File" ) );
diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp
index a98df9775d..5fbbeef995 100644
--- a/pagelayout_editor/pl_editor_frame.cpp
+++ b/pagelayout_editor/pl_editor_frame.cpp
@@ -267,9 +267,6 @@ void PL_EDITOR_FRAME::setupUIConditions()
mgr->SetConditions( ACTIONS::inchesUnits, CHECK( cond.Units( EDA_UNITS::INCHES ) ) );
mgr->SetConditions( ACTIONS::milsUnits, CHECK( cond.Units( EDA_UNITS::MILS ) ) );
- mgr->SetConditions( ACTIONS::acceleratedGraphics, CHECK( cond.CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL ) ) );
- mgr->SetConditions( ACTIONS::standardGraphics, CHECK( cond.CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO ) ) );
-
mgr->SetConditions( ACTIONS::cut, ENABLE( SELECTION_CONDITIONS::NotEmpty ) );
mgr->SetConditions( ACTIONS::copy, ENABLE( SELECTION_CONDITIONS::NotEmpty ) );
mgr->SetConditions( ACTIONS::paste, ENABLE( SELECTION_CONDITIONS::Idle ) );
diff --git a/pcbnew/dialogs/panel_display_options.cpp b/pcbnew/dialogs/panel_display_options.cpp
index 5c2cdb1fb3..37b6718772 100644
--- a/pcbnew/dialogs/panel_display_options.cpp
+++ b/pcbnew/dialogs/panel_display_options.cpp
@@ -44,9 +44,7 @@ PANEL_DISPLAY_OPTIONS::PANEL_DISPLAY_OPTIONS( PCB_BASE_FRAME* aFrame,
PANEL_DISPLAY_OPTIONS_BASE( aParent->GetTreebook() ),
m_frame( aFrame )
{
- KIGFX::GAL_DISPLAY_OPTIONS& galOptions = m_frame->GetGalDisplayOptions();
- m_galOptsPanel = new GAL_OPTIONS_PANEL( this, galOptions );
-
+ m_galOptsPanel = new GAL_OPTIONS_PANEL( this, m_frame );
m_galOptionsSizer->Add( m_galOptsPanel, 1, wxEXPAND, 0 );
m_optionsBook->SetSelection( dynamic_cast<PCB_EDIT_FRAME*>( m_frame ) ? 1 : 0 );
diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp
index 081d8f668d..47172e72bf 100644
--- a/pcbnew/footprint_edit_frame.cpp
+++ b/pcbnew/footprint_edit_frame.cpp
@@ -1000,8 +1000,6 @@ void FOOTPRINT_EDIT_FRAME::setupUIConditions()
mgr->SetConditions( ACTIONS::millimetersUnits, CHECK( cond.Units( EDA_UNITS::MILLIMETRES ) ) );
mgr->SetConditions( ACTIONS::inchesUnits, CHECK( cond.Units( EDA_UNITS::INCHES ) ) );
mgr->SetConditions( ACTIONS::milsUnits, CHECK( cond.Units( EDA_UNITS::MILS ) ) );
- mgr->SetConditions( ACTIONS::acceleratedGraphics, CHECK( cond.CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL ) ) );
- mgr->SetConditions( ACTIONS::standardGraphics, CHECK( cond.CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO ) ) );
mgr->SetConditions( ACTIONS::cut, ENABLE( cond.HasItems() ) );
mgr->SetConditions( ACTIONS::copy, ENABLE( cond.HasItems() ) );
diff --git a/pcbnew/menubar_footprint_editor.cpp b/pcbnew/menubar_footprint_editor.cpp
index db1fdc13b0..a1f3f96119 100644
--- a/pcbnew/menubar_footprint_editor.cpp
+++ b/pcbnew/menubar_footprint_editor.cpp
@@ -237,12 +237,6 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
prefsMenu->AppendSeparator();
AddMenuLanguageList( prefsMenu, selTool );
-#ifndef __WXMAC__
- prefsMenu->AppendSeparator();
- prefsMenu->Add( ACTIONS::acceleratedGraphics, ACTION_MENU::CHECK );
- prefsMenu->Add( ACTIONS::standardGraphics, ACTION_MENU::CHECK );
-#endif
-
//--MenuBar -----------------------------------------------------------
//
menuBar->Append( fileMenu, _( "&File" ) );
diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp
index 5dd6189aa0..281a69b557 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -445,12 +445,6 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
prefsMenu->AppendSeparator();
AddMenuLanguageList( prefsMenu, selTool );
-#ifndef __WXMAC__
- prefsMenu->AppendSeparator();
- prefsMenu->Add( ACTIONS::acceleratedGraphics, ACTION_MENU::CHECK );
- prefsMenu->Add( ACTIONS::standardGraphics, ACTION_MENU::CHECK );
-#endif
-
//--MenuBar -----------------------------------------------------------
//
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index 02b117b512..760b85493c 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -518,8 +518,6 @@ void PCB_EDIT_FRAME::setupUIConditions()
mgr->SetConditions( ACTIONS::millimetersUnits, CHECK( cond.Units( EDA_UNITS::MILLIMETRES ) ) );
mgr->SetConditions( ACTIONS::inchesUnits, CHECK( cond.Units( EDA_UNITS::INCHES ) ) );
mgr->SetConditions( ACTIONS::milsUnits, CHECK( cond.Units( EDA_UNITS::MILS ) ) );
- mgr->SetConditions( ACTIONS::acceleratedGraphics, CHECK( cond.CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL ) ) );
- mgr->SetConditions( ACTIONS::standardGraphics, CHECK( cond.CanvasType( EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO ) ) );
mgr->SetConditions( ACTIONS::cut, ENABLE( cond.HasItems() ) );
mgr->SetConditions( ACTIONS::copy, ENABLE( cond.HasItems() ) );