kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #35597
Re: [PATCH] Adjust Menubar of 3D Viewer to common style
-
To:
KiCad Developers <kicad-developers@xxxxxxxxxxxxxxxxxxx>
-
From:
Thomas Pointhuber <thomas.pointhuber@xxxxxx>
-
Date:
Thu, 26 Apr 2018 21:58:14 +0200
-
Autocrypt:
addr=thomas.pointhuber@xxxxxx; prefer-encrypt=mutual; keydata= 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 Pm/7xjyRQ7uil90nCFwzjw==
-
Openpgp:
preference=signencrypt
-
User-agent:
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0
Hi,
I did some rebase and rewrite of the patch and removed for now the
changes in "file" and "edit" to have something hopefully mergable. It
consists of two patches. The first adds some new entries, the second one
removes all those menus which are available in an already existing
dialog and thus removes some complexity from the menus.
Available also on GitHub:
https://github.com/pointhi/kicad-source-mirror/tree/3d_viewer_menu-2
Regards,
Thomas
From e07d87ae41db6c64c65aba91b95d1d28b6960e8a Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@xxxxxx>
Date: Thu, 26 Apr 2018 20:58:49 +0200
Subject: [PATCH 1/2] Adjust Menubar of 3D Viewer to common style
---
3d-viewer/3d_viewer/3d_menubar.cpp | 96 ++++++++++++++++++++++++++++++
1 file changed, 96 insertions(+)
diff --git a/3d-viewer/3d_viewer/3d_menubar.cpp b/3d-viewer/3d_viewer/3d_menubar.cpp
index 9c00afb79..39386ca4c 100644
--- a/3d-viewer/3d_viewer/3d_menubar.cpp
+++ b/3d-viewer/3d_viewer/3d_menubar.cpp
@@ -34,6 +34,7 @@
#include <3d_canvas/cinfo3d_visu.h>
#include <menus_helpers.h>
#include <3d_viewer_id.h>
+#include "help_common_strings.h"
extern struct EDA_HOTKEY_CONFIG g_3DViewer_Hokeys_Descr[];
@@ -44,6 +45,7 @@ void EDA_3D_VIEWER::CreateMenuBar()
wxMenuBar* menuBar = new wxMenuBar;
wxMenu* fileMenu = new wxMenu;
wxMenu* editMenu = new wxMenu;
+ wxMenu* viewMenu = new wxMenu;
wxMenu* prefsMenu = new wxMenu;
wxMenu* helpMenu = new wxMenu;
@@ -68,6 +70,72 @@ void EDA_3D_VIEWER::CreateMenuBar()
_( "Copy 3D Image" ),
KiBitmap( copy_xpm ) );
+ menuBar->Append( viewMenu, _( "&View" ) );
+
+ AddMenuItem( viewMenu, ID_ZOOM_IN,
+ _( "Zoom &In" ), HELP_ZOOM_IN,
+ KiBitmap( zoom_in_xpm ) );
+
+ AddMenuItem( viewMenu, ID_ZOOM_OUT,
+ _( "Zoom &Out" ), HELP_ZOOM_OUT,
+ KiBitmap( zoom_out_xpm ) );
+
+ AddMenuItem( viewMenu, ID_ZOOM_PAGE,
+ _( "Zoom to &Fit" ), HELP_ZOOM_FIT,
+ KiBitmap( zoom_fit_in_page_xpm ) );
+
+ AddMenuItem( viewMenu, ID_ZOOM_REDRAW,
+ _( "&Redraw" ), HELP_ZOOM_REDRAW,
+ KiBitmap( zoom_redraw_xpm ) );
+
+ viewMenu->AppendSeparator();
+
+ AddMenuItem( viewMenu, ID_ROTATE3D_X_NEG,
+ _( "Rotate X <-" ),
+ KiBitmap( rotate_neg_x_xpm ) );
+
+ AddMenuItem( viewMenu, ID_ROTATE3D_X_POS,
+ _( "Rotate X ->" ),
+ KiBitmap( rotate_pos_x_xpm ) );
+
+ viewMenu->AppendSeparator();
+
+ AddMenuItem( viewMenu, ID_ROTATE3D_Y_NEG,
+ _( "Rotate Y <-" ),
+ KiBitmap( rotate_neg_y_xpm ) );
+
+ AddMenuItem( viewMenu, ID_ROTATE3D_Y_POS,
+ _( "Rotate Y ->" ),
+ KiBitmap( rotate_pos_y_xpm ) );
+
+ viewMenu->AppendSeparator();
+
+ AddMenuItem( viewMenu, ID_ROTATE3D_Z_NEG,
+ _( "Rotate Z <-" ),
+ KiBitmap( rotate_neg_z_xpm ) );
+
+ AddMenuItem( viewMenu, ID_ROTATE3D_Z_POS,
+ _( "Rotate Z ->" ),
+ KiBitmap( rotate_pos_z_xpm ) );
+
+ viewMenu->AppendSeparator();
+
+ AddMenuItem( viewMenu, ID_MOVE3D_LEFT,
+ _( "Move left" ),
+ KiBitmap( left_xpm ) );
+
+ AddMenuItem( viewMenu, ID_MOVE3D_RIGHT,
+ _( "Move right" ),
+ KiBitmap( right_xpm ) );
+
+ AddMenuItem( viewMenu, ID_MOVE3D_UP,
+ _( "Move up" ),
+ KiBitmap( up_xpm ) );
+
+ AddMenuItem( viewMenu, ID_MOVE3D_DOWN,
+ _( "Move down" ),
+ KiBitmap( down_xpm ) );
+
menuBar->Append( prefsMenu, _( "&Preferences" ) );
AddMenuItem( prefsMenu, ID_MENU3D_MOUSEWHEEL_PANNING,
@@ -76,6 +144,10 @@ void EDA_3D_VIEWER::CreateMenuBar()
prefsMenu->AppendSeparator();
+ AddMenuItem( prefsMenu, ID_TOOL_SET_VISIBLE_ITEMS,
+ _( "Display Options" ),
+ KiBitmap( read_setup_xpm ) );
+
AddMenuItem( prefsMenu, ID_MENU3D_REALISTIC_MODE,
_( "Realistic Mode" ),
KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK );
@@ -304,12 +376,36 @@ void EDA_3D_VIEWER::CreateMenuBar()
// /////////////////////////////////////////////////////////////////////////
menuBar->Append( helpMenu, _( "&Help" ) );
+ AddMenuItem( helpMenu, wxID_HELP,
+ _( "Pcbnew &Manual" ),
+ _( "Open Pcbnew Manual" ),
+ KiBitmap( online_help_xpm ) );
+
+ AddMenuItem( helpMenu, wxID_INDEX,
+ _( "&Getting Started in KiCad" ),
+ _( "Open \"Getting Started in KiCad\" guide for beginners" ),
+ KiBitmap( help_xpm ) );
+
wxString text = AddHotkeyName( _( "&List Hotkeys..." ), g_3DViewer_Hokeys_Descr, HK_HELP );
AddMenuItem( helpMenu, ID_MENU3D_HELP_HOTKEY_SHOW_CURRENT_LIST,
text,
_( "Displays the current hotkeys list and corresponding commands" ),
KiBitmap( hotkeys_xpm ) );
+ helpMenu->AppendSeparator();
+
+ AddMenuItem( helpMenu, ID_HELP_GET_INVOLVED,
+ _( "Get &Involved" ),
+ _( "Contribute to KiCad (opens a web browser)" ),
+ KiBitmap( info_xpm ) );
+
+ helpMenu->AppendSeparator();
+
+ AddMenuItem( helpMenu, wxID_ABOUT,
+ _( "&About KiCad" ),
+ _( "Display KiCad About dialog" ),
+ KiBitmap( about_xpm ) );
+
SetMenuBar( menuBar );
SetMenuBarOptionsState();
}
--
2.17.0
From 6571583004cbf8c4c1bd7da798ebd81a9b572a50 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@xxxxxx>
Date: Thu, 26 Apr 2018 21:28:08 +0200
Subject: [PATCH 2/2] Remove Items from Menubar of 3D Viewer which are
available over dialog
---
3d-viewer/3d_viewer/3d_menubar.cpp | 97 ------------------------------
1 file changed, 97 deletions(-)
diff --git a/3d-viewer/3d_viewer/3d_menubar.cpp b/3d-viewer/3d_viewer/3d_menubar.cpp
index 39386ca4c..c07f40cb2 100644
--- a/3d-viewer/3d_viewer/3d_menubar.cpp
+++ b/3d-viewer/3d_viewer/3d_menubar.cpp
@@ -148,10 +148,6 @@ void EDA_3D_VIEWER::CreateMenuBar()
_( "Display Options" ),
KiBitmap( read_setup_xpm ) );
- AddMenuItem( prefsMenu, ID_MENU3D_REALISTIC_MODE,
- _( "Realistic Mode" ),
- KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK );
-
wxMenu * renderEngineList = new wxMenu;
AddMenuItem( prefsMenu, renderEngineList, ID_MENU3D_ENGINE,
_( "Render Engine" ), KiBitmap( render_mode_xpm ) );
@@ -310,60 +306,6 @@ void EDA_3D_VIEWER::CreateMenuBar()
else
gridlistMenu->Check( ID_MENU3D_GRID_NOGRID, true );
-
- // Display elements options
- // /////////////////////////////////////////////////////////////////////////
- prefsMenu->AppendSeparator();
-
- AddMenuItem( prefsMenu, ID_MENU3D_SHOW_BOARD_BODY,
- _( "Show Board Bod&y" ), KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK );
-
- AddMenuItem( prefsMenu, ID_MENU3D_ZONE_ONOFF,
- _( "Show Zone &Filling" ), KiBitmap( add_zone_xpm ), wxITEM_CHECK );
-
- wxMenu * moduleAttributes = new wxMenu;
- AddMenuItem( prefsMenu, moduleAttributes, ID_MENU3D_MODULE_ONOFF,
- _( "Show 3D M&odels" ), KiBitmap( shape_3d_xpm ) );
- moduleAttributes->AppendCheckItem( ID_MENU3D_MODULE_ONOFF_ATTRIBUTES_NORMAL,
- _( "Through Hole" ),
- _( "Footprint Properties -> Placement type -> Through hole" ) );
-
- moduleAttributes->AppendCheckItem( ID_MENU3D_MODULE_ONOFF_ATTRIBUTES_NORMAL_INSERT,
- _( "Surface Mount" ),
- _( "Footprint Properties -> Placement type -> Surface mount" ) );
-
- moduleAttributes->AppendCheckItem( ID_MENU3D_MODULE_ONOFF_ATTRIBUTES_VIRTUAL,
- _( "Virtual" ),
- _( "Footprint Properties -> Placement type -> Virtual (eg: edge connectors, test points, mechanical parts)" ) );
-
- // Layer options
- // /////////////////////////////////////////////////////////////////////////
- prefsMenu->AppendSeparator();
-
- wxMenu * layersMenu = new wxMenu;
- AddMenuItem( prefsMenu, layersMenu, ID_MENU3D_LAYERS,
- _( "Show &Layers" ), KiBitmap( tools_xpm ) );
-
- AddMenuItem( layersMenu, ID_MENU3D_ADHESIVE_ONOFF,
- _( "Show &Adhesive Layers" ), KiBitmap( tools_xpm ), wxITEM_CHECK );
-
- AddMenuItem( layersMenu, ID_MENU3D_SILKSCREEN_ONOFF,
- _( "Show &Silkscreen Layers" ), KiBitmap( text_xpm ), wxITEM_CHECK );
-
- AddMenuItem( layersMenu, ID_MENU3D_SOLDER_MASK_ONOFF,
- _( "Show Solder &Mask Layers" ), KiBitmap( pads_mask_layers_xpm ), wxITEM_CHECK );
-
- AddMenuItem( layersMenu, ID_MENU3D_SOLDER_PASTE_ONOFF,
- _( "Show Solder &Paste Layers" ), KiBitmap( pads_mask_layers_xpm ), wxITEM_CHECK );
-
- // Other layers are not "board" layers, and are not shown in realistic mode
- // These menus will be disabled in in realistic mode
- AddMenuItem( layersMenu, ID_MENU3D_COMMENTS_ONOFF,
- _( "Show &Comments and Drawings Layers" ), KiBitmap( editor_xpm ), wxITEM_CHECK );
-
- AddMenuItem( layersMenu, ID_MENU3D_ECO_ONOFF,
- _( "Show &Eco Layers" ), KiBitmap( editor_xpm ), wxITEM_CHECK );
-
// Reset options
// /////////////////////////////////////////////////////////////////////////
prefsMenu->AppendSeparator();
@@ -436,13 +378,6 @@ void EDA_3D_VIEWER::SetMenuBarOptionsState()
item = menuBar->FindItem( ID_MENU3D_ENGINE_RAYTRACING );
item->Check( m_settings.RenderEngineGet() == RENDER_ENGINE_RAYTRACING );
- item = menuBar->FindItem( ID_MENU3D_REALISTIC_MODE );
- item->Check( m_settings.GetFlag( FL_USE_REALISTIC_MODE ) );
- item = menuBar->FindItem( ID_MENU3D_COMMENTS_ONOFF );
- item->Enable( !m_settings.GetFlag( FL_USE_REALISTIC_MODE ) );
- item = menuBar->FindItem( ID_MENU3D_ECO_ONOFF );
- item->Enable( !m_settings.GetFlag( FL_USE_REALISTIC_MODE ) );
-
item = menuBar->FindItem( ID_MENU3D_FL_RENDER_MATERIAL_MODE_NORMAL );
item->Check( m_settings.MaterialModeGet() == MATERIAL_MODE_NORMAL );
@@ -482,39 +417,7 @@ void EDA_3D_VIEWER::SetMenuBarOptionsState()
item->Check( m_settings.GetFlag( FL_RENDER_RAYTRACING_PROCEDURAL_TEXTURES ) );
- item = menuBar->FindItem( ID_MENU3D_SHOW_BOARD_BODY );
- item->Check( m_settings.GetFlag( FL_SHOW_BOARD_BODY ) );
-
- item = menuBar->FindItem( ID_MENU3D_MODULE_ONOFF_ATTRIBUTES_NORMAL );
- item->Check( m_settings.GetFlag( FL_MODULE_ATTRIBUTES_NORMAL ) );
-
- item = menuBar->FindItem( ID_MENU3D_MODULE_ONOFF_ATTRIBUTES_NORMAL_INSERT );
- item->Check( m_settings.GetFlag( FL_MODULE_ATTRIBUTES_NORMAL_INSERT ) );
-
- item = menuBar->FindItem( ID_MENU3D_MODULE_ONOFF_ATTRIBUTES_VIRTUAL );
- item->Check( m_settings.GetFlag( FL_MODULE_ATTRIBUTES_VIRTUAL ) );
-
- item = menuBar->FindItem( ID_MENU3D_ZONE_ONOFF );
- item->Check( m_settings.GetFlag( FL_ZONE ) );
-
item = menuBar->FindItem( ID_MENU3D_AXIS_ONOFF );
item->Check( m_settings.GetFlag( FL_AXIS ) );
- item = menuBar->FindItem( ID_MENU3D_ADHESIVE_ONOFF );
- item->Check( m_settings.GetFlag( FL_ADHESIVE ) );
-
- item = menuBar->FindItem( ID_MENU3D_SILKSCREEN_ONOFF );
- item->Check( m_settings.GetFlag( FL_SILKSCREEN ) );
-
- item = menuBar->FindItem( ID_MENU3D_SOLDER_MASK_ONOFF );
- item->Check( m_settings.GetFlag( FL_SOLDERMASK ) );
-
- item = menuBar->FindItem( ID_MENU3D_SOLDER_PASTE_ONOFF );
- item->Check( m_settings.GetFlag( FL_SOLDERPASTE ) );
-
- item = menuBar->FindItem( ID_MENU3D_COMMENTS_ONOFF );
- item->Check( m_settings.GetFlag( FL_COMMENTS ) );
-
- item = menuBar->FindItem( ID_MENU3D_ECO_ONOFF );
- item->Check( m_settings.GetFlag( FL_ECO ));
}
--
2.17.0
Attachment:
signature.asc
Description: OpenPGP digital signature
Follow ups