Browse Source
Implement a framework to handle wxUpdateUIEvents for tool actions
Implement a framework to handle wxUpdateUIEvents for tool actions
This allows for the tool framework to keep track of a universal set of conditions for the UI state (enabled/checked/shown) for controls of actions. It removes the need for the main menubar menus to be CONDITIONAL_MENUs and be rebuilt on each open, and instead makes the updates of the check and enabling of items handled in the native wxWidgets way. This commit switchs the 3d viewer and kicad project manager window over to this system.pull/16/head
Ian McInerney
5 years ago
27 changed files with 851 additions and 452 deletions
-
3133d-viewer/3d_viewer/3d_menubar.cpp
-
93d-viewer/3d_viewer/3d_toolbar.cpp
-
1063d-viewer/3d_viewer/eda_3d_viewer.cpp
-
73d-viewer/3d_viewer/eda_3d_viewer.h
-
723d-viewer/3d_viewer/tools/3d_conditions.cpp
-
913d-viewer/3d_viewer/tools/3d_conditions.h
-
13d-viewer/CMakeLists.txt
-
1common/CMakeLists.txt
-
89common/eda_base_frame.cpp
-
37common/languages_menu.cpp
-
26common/tool/action_manager.cpp
-
37common/tool/action_menu.cpp
-
26common/tool/conditional_menu.cpp
-
8common/tool/tool_dispatcher.cpp
-
2eeschema/menubar.cpp
-
49include/eda_base_frame.h
-
5include/menus_helpers.h
-
74include/tool/action_manager.h
-
23include/tool/action_menu.h
-
2include/tool/action_toolbar.h
-
21include/tool/conditional_menu.h
-
29include/tool/selection_conditions.h
-
10include/tool/tool_dispatcher.h
-
33include/tool/tools_holder.h
-
72kicad/kicad_manager_frame.cpp
-
8kicad/kicad_manager_frame.h
-
152kicad/menubar.cpp
@ -0,0 +1,72 @@ |
|||
/*
|
|||
* This program source code file is part of KiCad, a free EDA CAD application. |
|||
* |
|||
* Copyright (C) 2020 Ian McInerney <ian.s.mcinerney at ieee.org> |
|||
* Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. |
|||
* |
|||
* This program is free software; you can redistribute it and/or |
|||
* modify it under the terms of the GNU General Public License |
|||
* as published by the Free Software Foundation; either version 2 |
|||
* of the License, or (at your option) any later version. |
|||
* |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program; if not, you may find one here: |
|||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|||
* or you may search the http://www.gnu.org website for the version 2 license,
|
|||
* or you may write to the Free Software Foundation, Inc., |
|||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA |
|||
*/ |
|||
|
|||
#include <3d_canvas/board_adapter.h>
|
|||
#include <3d_viewer/tools/3d_conditions.h>
|
|||
|
|||
#include <functional>
|
|||
|
|||
using namespace std::placeholders; |
|||
|
|||
|
|||
SELECTION_CONDITION EDA_3D_CONDITIONS::MaterialMode( MATERIAL_MODE aMaterial ) |
|||
{ |
|||
return std::bind( &EDA_3D_CONDITIONS::materialModeFunction, _1, m_adapter, aMaterial ); |
|||
} |
|||
|
|||
|
|||
SELECTION_CONDITION EDA_3D_CONDITIONS::Flag( DISPLAY3D_FLG aFlag ) |
|||
{ |
|||
return std::bind( &EDA_3D_CONDITIONS::flagFunction, _1, m_adapter, aFlag ); |
|||
} |
|||
|
|||
|
|||
SELECTION_CONDITION EDA_3D_CONDITIONS::GridSize( GRID3D_TYPE aGridSize ) |
|||
{ |
|||
return std::bind( &EDA_3D_CONDITIONS::gridSizeFunction, _1, m_adapter, aGridSize ); |
|||
} |
|||
|
|||
|
|||
bool EDA_3D_CONDITIONS::materialModeFunction( const SELECTION& aSelection, |
|||
BOARD_ADAPTER* aAdapter, |
|||
MATERIAL_MODE aMaterial ) |
|||
{ |
|||
return aAdapter->MaterialModeGet() == aMaterial; |
|||
} |
|||
|
|||
|
|||
bool EDA_3D_CONDITIONS::flagFunction( const SELECTION& aSelection, |
|||
BOARD_ADAPTER* aAdapter, |
|||
DISPLAY3D_FLG aFlag ) |
|||
{ |
|||
return aAdapter->GetFlag( aFlag ); |
|||
} |
|||
|
|||
|
|||
bool EDA_3D_CONDITIONS::gridSizeFunction( const SELECTION& aSelection, |
|||
BOARD_ADAPTER* aAdapter, |
|||
GRID3D_TYPE aGridSize ) |
|||
{ |
|||
return aAdapter->GridGet() == aGridSize; |
|||
} |
|||
@ -0,0 +1,91 @@ |
|||
/* |
|||
* This program source code file is part of KiCad, a free EDA CAD application. |
|||
* |
|||
* Copyright (C) 2020 Ian McInerney <ian.s.mcinerney at ieee.org> |
|||
* Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. |
|||
* |
|||
* This program is free software; you can redistribute it and/or |
|||
* modify it under the terms of the GNU General Public License |
|||
* as published by the Free Software Foundation; either version 2 |
|||
* of the License, or (at your option) any later version. |
|||
* |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program; if not, you may find one here: |
|||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html |
|||
* or you may search the http://www.gnu.org website for the version 2 license, |
|||
* or you may write to the Free Software Foundation, Inc., |
|||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA |
|||
*/ |
|||
|
|||
#ifndef _3D_CONDITIONS_H_ |
|||
#define _3D_CONDITIONS_H_ |
|||
|
|||
#include <3d_enums.h> |
|||
#include <tool/selection.h> |
|||
#include <tool/selection_conditions.h> |
|||
|
|||
|
|||
class BOARD_ADAPTER; |
|||
|
|||
class EDA_3D_CONDITIONS : public SELECTION_CONDITIONS |
|||
{ |
|||
public: |
|||
/** |
|||
* Define conditions for a 3D viewer frame. |
|||
* |
|||
* @param aAdapter is the board adapter to query for information. |
|||
*/ |
|||
EDA_3D_CONDITIONS( BOARD_ADAPTER* aAdapter ) : |
|||
m_adapter( aAdapter ) |
|||
{} |
|||
|
|||
/** |
|||
* Creates a functor that tests if a specific material mode is active. |
|||
* |
|||
* @param aAdapter is the board adapter the setting is in |
|||
* @param aMaterial is the material mode to test for. |
|||
* @return Functor testing if a material mode is active. |
|||
*/ |
|||
SELECTION_CONDITION MaterialMode( MATERIAL_MODE aMaterial ); |
|||
|
|||
/** |
|||
* Creates a functor that tests if the board adapter has a flag set currently. |
|||
* |
|||
* @param aAdapter is the board adapter the setting is in |
|||
* @param aFlag is the flag to test for. |
|||
* @return Functor testing if the flag is set. |
|||
*/ |
|||
SELECTION_CONDITION Flag( DISPLAY3D_FLG aFlag ); |
|||
|
|||
/** |
|||
* Creates a functor that tests the current grid size. |
|||
* |
|||
* @param aAdapter is the board adapter the setting is in |
|||
* @param aGridSize is the grid size to test for. |
|||
* @return Functor testing if the flag is set. |
|||
*/ |
|||
SELECTION_CONDITION GridSize( GRID3D_TYPE aGridSize ); |
|||
|
|||
private: |
|||
///> Helper function used by MaterialMode() |
|||
static bool materialModeFunction( const SELECTION& aSelection, BOARD_ADAPTER* aAdapter, |
|||
MATERIAL_MODE aMaterial ); |
|||
|
|||
///> Helper function used by Flag() |
|||
static bool flagFunction( const SELECTION& aSelection, BOARD_ADAPTER* aAdapter, |
|||
DISPLAY3D_FLG aFlag ); |
|||
|
|||
///> Helper function used by GridDize() |
|||
static bool gridSizeFunction( const SELECTION& aSelection, BOARD_ADAPTER* aAdapter, |
|||
GRID3D_TYPE aGridSize ); |
|||
|
|||
///> The board adapter to read the 3D viewer state from |
|||
BOARD_ADAPTER* m_adapter; |
|||
}; |
|||
|
|||
#endif /* _3D_CONDITIONS_H_ */ |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue