Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
Thomas, I merged your patches. Thank you for your contribution to KiCad. Cheers, Wayne On 05/05/2018 11:41 AM, Thomas Pointhuber wrote: Hi Wayne, I updated the patches accordingly. Regard, Thomas Am 2018-05-04 um 18:09 schrieb Wayne Stambaugh: Yes, please update your patch to use the terms "Clockwise" and "Counterclockwise" which is consistent with the rest of kicad. Thanks, Wayne ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
Hi Wayne, I updated the patches accordingly. Regard, Thomas Am 2018-05-04 um 18:09 schrieb Wayne Stambaugh: > Yes, please update your patch to use the terms "Clockwise" and > "Counterclockwise" which is consistent with the rest of kicad. > > Thanks, > > Wayne > From 8fd84d7b122235af0a0cabec41e5379f41006ae8 Mon Sep 17 00:00:00 2001 From: Thomas PointhuberDate: 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 ++ 3d-viewer/3d_viewer/3d_toolbar.cpp | 12 ++-- 2 files changed, 102 insertions(+), 6 deletions(-) diff --git a/3d-viewer/3d_viewer/3d_menubar.cpp b/3d-viewer/3d_viewer/3d_menubar.cpp index 9c00afb79..e04d018a3 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 #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, _( "" ) ); + +AddMenuItem( viewMenu, ID_ZOOM_IN, + _( "Zoom " ), HELP_ZOOM_IN, + KiBitmap( zoom_in_xpm ) ); + +AddMenuItem( viewMenu, ID_ZOOM_OUT, + _( "Zoom " ), HELP_ZOOM_OUT, + KiBitmap( zoom_out_xpm ) ); + +AddMenuItem( viewMenu, ID_ZOOM_PAGE, + _( "Zoom to " ), HELP_ZOOM_FIT, + KiBitmap( zoom_fit_in_page_xpm ) ); + +AddMenuItem( viewMenu, ID_ZOOM_REDRAW, + _( "" ), HELP_ZOOM_REDRAW, + KiBitmap( zoom_redraw_xpm ) ); + +viewMenu->AppendSeparator(); + +AddMenuItem( viewMenu, ID_ROTATE3D_X_NEG, + _( "Rotate X Clockwise" ), + KiBitmap( rotate_neg_x_xpm ) ); + +AddMenuItem( viewMenu, ID_ROTATE3D_X_POS, + _( "Rotate X Counterclockwise" ), + KiBitmap( rotate_pos_x_xpm ) ); + +viewMenu->AppendSeparator(); + +AddMenuItem( viewMenu, ID_ROTATE3D_Y_NEG, + _( "Rotate Y Clockwise" ), + KiBitmap( rotate_neg_y_xpm ) ); + +AddMenuItem( viewMenu, ID_ROTATE3D_Y_POS, + _( "Rotate Y Counterclockwise" ), + KiBitmap( rotate_pos_y_xpm ) ); + +viewMenu->AppendSeparator(); + +AddMenuItem( viewMenu, ID_ROTATE3D_Z_NEG, + _( "Rotate Z Clockwise" ), + KiBitmap( rotate_neg_z_xpm ) ); + +AddMenuItem( viewMenu, ID_ROTATE3D_Z_POS, + _( "Rotate Z Counterclockwise" ), + 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, _( "" ) ); 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, _( "" ) ); +AddMenuItem( helpMenu, wxID_HELP, + _( "Pcbnew " ), + _( "Open Pcbnew Manual" ), + KiBitmap( online_help_xpm ) ); + +AddMenuItem( helpMenu, wxID_INDEX, + _( " Started in KiCad" ), + _( "Open \"Getting Started in KiCad\" guide for beginners" ), + KiBitmap( help_xpm ) ); + wxString text = AddHotkeyName( _( " 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" ),
Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
Yes, please update your patch to use the terms "Clockwise" and "Counterclockwise" which is consistent with the rest of kicad. Thanks, Wayne On 05/04/2018 11:32 AM, Thomas Pointhuber wrote: > so I should change it to CW and CCW? I assume the tooltip text of the > panel should also be change accordingly. > > Regards, Thomas > > > Am 2018-05-03 um 19:44 schrieb Wayne Stambaugh: >> On 5/3/2018 1:28 PM, jp charras wrote: >>> Le 03/05/2018 à 18:44, Wayne Stambaugh a écrit : I did notice one thing that is a bit odd in the first patch. The rotate menu entries use -> and <- to signify clockwise and counter-clockwise directions. I'm not sure this is clear to the user. If we need to avoid the verbosity of CW and CCW then maybe we should use + and - instead. >>> I am never thrilled by using + and - instead of CW and CCW. >>> >>> Just because I do not know what is the meaning of + (or -) >>> >>> If + is the positive rotation using mathematical positive angle rotation >>> definition, it is >>> equivalent to CCW. >>> But I am not sure this is the way it is understood by all users and I find >>> this notation ambiguous. >>> >> Me neither. I prefer CW and CCW. + and - were suggestions as an >> improvement over -> and <-. It appears that the menu icons actually >> show the correct axis rotation. >> >> ___ >> Mailing list: https://launchpad.net/~kicad-developers >> Post to : kicad-developers@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~kicad-developers >> More help : https://help.launchpad.net/ListHelp > > > > > ___ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp > ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
so I should change it to CW and CCW? I assume the tooltip text of the panel should also be change accordingly. Regards, Thomas Am 2018-05-03 um 19:44 schrieb Wayne Stambaugh: > On 5/3/2018 1:28 PM, jp charras wrote: >> Le 03/05/2018 à 18:44, Wayne Stambaugh a écrit : >>> I did notice one thing that is a bit odd in the first patch. The rotate >>> menu entries use -> and <- to signify clockwise and counter-clockwise >>> directions. I'm not sure this is clear to the user. If we need to >>> avoid the verbosity of CW and CCW then maybe we should use + and - instead. >>> >> I am never thrilled by using + and - instead of CW and CCW. >> >> Just because I do not know what is the meaning of + (or -) >> >> If + is the positive rotation using mathematical positive angle rotation >> definition, it is >> equivalent to CCW. >> But I am not sure this is the way it is understood by all users and I find >> this notation ambiguous. >> > Me neither. I prefer CW and CCW. + and - were suggestions as an > improvement over -> and <-. It appears that the menu icons actually > show the correct axis rotation. > > ___ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp signature.asc Description: OpenPGP digital signature ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
On 5/3/2018 1:28 PM, jp charras wrote: > Le 03/05/2018 à 18:44, Wayne Stambaugh a écrit : >> I did notice one thing that is a bit odd in the first patch. The rotate >> menu entries use -> and <- to signify clockwise and counter-clockwise >> directions. I'm not sure this is clear to the user. If we need to >> avoid the verbosity of CW and CCW then maybe we should use + and - instead. >> > > I am never thrilled by using + and - instead of CW and CCW. > > Just because I do not know what is the meaning of + (or -) > > If + is the positive rotation using mathematical positive angle rotation > definition, it is > equivalent to CCW. > But I am not sure this is the way it is understood by all users and I find > this notation ambiguous. > Me neither. I prefer CW and CCW. + and - were suggestions as an improvement over -> and <-. It appears that the menu icons actually show the correct axis rotation. ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
Le 03/05/2018 à 18:44, Wayne Stambaugh a écrit : > I did notice one thing that is a bit odd in the first patch. The rotate > menu entries use -> and <- to signify clockwise and counter-clockwise > directions. I'm not sure this is clear to the user. If we need to > avoid the verbosity of CW and CCW then maybe we should use + and - instead. > I am never thrilled by using + and - instead of CW and CCW. Just because I do not know what is the meaning of + (or -) If + is the positive rotation using mathematical positive angle rotation definition, it is equivalent to CCW. But I am not sure this is the way it is understood by all users and I find this notation ambiguous. -- Jean-Pierre CHARRAS ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
I did notice one thing that is a bit odd in the first patch. The rotate menu entries use -> and <- to signify clockwise and counter-clockwise directions. I'm not sure this is clear to the user. If we need to avoid the verbosity of CW and CCW then maybe we should use + and - instead. On 5/3/2018 11:06 AM, Jeff Young wrote: > I like removing them. I always found it odd that they were in a menu > structure. > >> On 3 May 2018, at 15:58, Wayne Stambaughwrote: >> >> Hi Thomas, >> >> The first patch is fine. Removing all of the settings from the >> preferences menu that are in the configuration options dialog may not be >> acceptable to other users. Personally, I don't have a preference since >> I do not change these options very often. Other users may not share my >> ambivalence about this. Anyone strongly opposed to removing these >> settings from the preferences menu before I merge the second patch? >> >> Cheers, >> >> Wayne >> >> On 5/2/2018 1:17 PM, Thomas Pointhuber wrote: >>> it would be cool to merge this before rc2 :) >>> >>> Regards, Thomas >>> >>> >>> Am 2018-04-26 um 21:58 schrieb Thomas Pointhuber: 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 >>> >>> >>> >>> >>> ___ >>> Mailing list: https://launchpad.net/~kicad-developers >>> Post to : kicad-developers@lists.launchpad.net >>> Unsubscribe : https://launchpad.net/~kicad-developers >>> More help : https://help.launchpad.net/ListHelp >>> >> >> ___ >> Mailing list: https://launchpad.net/~kicad-developers >> Post to : kicad-developers@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~kicad-developers >> More help : https://help.launchpad.net/ListHelp > ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
I like removing them. I always found it odd that they were in a menu structure. > On 3 May 2018, at 15:58, Wayne Stambaughwrote: > > Hi Thomas, > > The first patch is fine. Removing all of the settings from the > preferences menu that are in the configuration options dialog may not be > acceptable to other users. Personally, I don't have a preference since > I do not change these options very often. Other users may not share my > ambivalence about this. Anyone strongly opposed to removing these > settings from the preferences menu before I merge the second patch? > > Cheers, > > Wayne > > On 5/2/2018 1:17 PM, Thomas Pointhuber wrote: >> it would be cool to merge this before rc2 :) >> >> Regards, Thomas >> >> >> Am 2018-04-26 um 21:58 schrieb Thomas Pointhuber: >>> 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 >>> >> >> >> >> >> ___ >> Mailing list: https://launchpad.net/~kicad-developers >> Post to : kicad-developers@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~kicad-developers >> More help : https://help.launchpad.net/ListHelp >> > > ___ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
Hi Thomas, The first patch is fine. Removing all of the settings from the preferences menu that are in the configuration options dialog may not be acceptable to other users. Personally, I don't have a preference since I do not change these options very often. Other users may not share my ambivalence about this. Anyone strongly opposed to removing these settings from the preferences menu before I merge the second patch? Cheers, Wayne On 5/2/2018 1:17 PM, Thomas Pointhuber wrote: > it would be cool to merge this before rc2 :) > > Regards, Thomas > > > Am 2018-04-26 um 21:58 schrieb Thomas Pointhuber: >> 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 >> > > > > > ___ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp > ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
it would be cool to merge this before rc2 :) Regards, Thomas Am 2018-04-26 um 21:58 schrieb Thomas Pointhuber: > 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 > signature.asc Description: OpenPGP digital signature ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
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 PointhuberDate: 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 #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, _( "" ) ); + +AddMenuItem( viewMenu, ID_ZOOM_IN, + _( "Zoom " ), HELP_ZOOM_IN, + KiBitmap( zoom_in_xpm ) ); + +AddMenuItem( viewMenu, ID_ZOOM_OUT, + _( "Zoom " ), HELP_ZOOM_OUT, + KiBitmap( zoom_out_xpm ) ); + +AddMenuItem( viewMenu, ID_ZOOM_PAGE, + _( "Zoom to " ), HELP_ZOOM_FIT, + KiBitmap( zoom_fit_in_page_xpm ) ); + +AddMenuItem( viewMenu, ID_ZOOM_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, _( "" ) ); 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, _( "" ) ); +AddMenuItem( helpMenu, wxID_HELP, + _( "Pcbnew " ), + _( "Open Pcbnew Manual" ), + KiBitmap( online_help_xpm ) ); + +AddMenuItem( helpMenu, wxID_INDEX, + _( " Started in KiCad" ), + _( "Open \"Getting Started in KiCad\" guide for beginners" ), + KiBitmap( help_xpm ) ); + wxString text = AddHotkeyName( _( " Hotkeys..." ), g_3DViewer_Hokeys_Descr, HK_HELP ); AddMenuItem( helpMenu, ID_MENU3D_HELP_HOTKEY_SHOW_CURRENT_LIST, text, _( "Displays the current
Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
Hi Thomas, It’s a bit of a mess. The 3D viewer isn’t a separate application, and so shouldn’t really have its own menus at all, and certainly not a File menu. But for 5.0, it is what it is, and we need somewhere to put the other two export options. Eeschema is different because it is (sort of) an Application, and its Export to Clipboard exports the document instead of the selection (the later being the normal Copy action). So I’d still say Edit menu, but I agree that it’s not clear-cut. Cheers, Jeff. > On 9 Apr 2018, at 13:31, Thomas Pointhuberwrote: > > Hi Jeff, > > I would still place the clipboard option into the file menu. Preferably > below the Export Entry because it would be more logical to find. The > current location of the clipboard item is because Eeschema also located > this menu item in the exports menu and I simpily tried for consistency. > > Regards, Thomas > > > Am 2018-04-06 um 16:12 schrieb Jeff Young: >> Hi Thomas, >> >> I don’t think I’d nest the two export options just for the sake of >> consistency. Nested menus are harder to use, and should only be resorted to >> when necessary (either when room on the menu is an issue, or when >> progressive disclosure is desired). >> >> Copy 3D Image goes to the clipboard, and therefore must stay on the Edit >> menu (although it could be shortened to just Copy). >> >> The Preferences & View menu stuff looks good. I agree that we should get >> rid of all the menu options that are in the Display Options dialog. >> >> Cheers, >> Jeff. >> >> >>> On 4 Apr 2018, at 13:34, Thomas Pointhuber wrote: >>> >>> Hi, >>> >>> some time ago there were adjustments to have a common design of the >>> menubar in all applications. This initial patch does some basic >>> adjustions of the 3D-Viewer in this direction, but things like >>> displaying Hotkeys was not added. >>> >>> >>> One question regarding improvements based on that patch would be: >>> >>> There exists now a "Display Options" Dialog. In my point of view this >>> would allow us to remove quite a few submenus. What do you think about >>> that? Currently you need to cause a resize event to get the view updated >>> (https://bugs.launchpad.net/kicad/+bug/1612419), which means using the >>> Dialog requires the same number of events for an action and thus the >>> submenu does not even provide better efficiency. >>> >>> >>> Patch can also be found on GitHub: >>> https://github.com/pointhi/kicad-source-mirror/tree/3d_viewer_menu >>> >>> >>> Regards, Thomas >>> >>> <0001-Adjust-Menubar-of-3D-Viewer-to-common-style.patch>___ >>> Mailing list: https://launchpad.net/~kicad-developers >>> Post to : kicad-developers@lists.launchpad.net >>> Unsubscribe : https://launchpad.net/~kicad-developers >>> More help : https://help.launchpad.net/ListHelp > > ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
Hi Jeff, I would still place the clipboard option into the file menu. Preferably below the Export Entry because it would be more logical to find. The current location of the clipboard item is because Eeschema also located this menu item in the exports menu and I simpily tried for consistency. Regards, Thomas Am 2018-04-06 um 16:12 schrieb Jeff Young: > Hi Thomas, > > I don’t think I’d nest the two export options just for the sake of > consistency. Nested menus are harder to use, and should only be resorted to > when necessary (either when room on the menu is an issue, or when progressive > disclosure is desired). > > Copy 3D Image goes to the clipboard, and therefore must stay on the Edit menu > (although it could be shortened to just Copy). > > The Preferences & View menu stuff looks good. I agree that we should get rid > of all the menu options that are in the Display Options dialog. > > Cheers, > Jeff. > > >> On 4 Apr 2018, at 13:34, Thomas Pointhuberwrote: >> >> Hi, >> >> some time ago there were adjustments to have a common design of the >> menubar in all applications. This initial patch does some basic >> adjustions of the 3D-Viewer in this direction, but things like >> displaying Hotkeys was not added. >> >> >> One question regarding improvements based on that patch would be: >> >> There exists now a "Display Options" Dialog. In my point of view this >> would allow us to remove quite a few submenus. What do you think about >> that? Currently you need to cause a resize event to get the view updated >> (https://bugs.launchpad.net/kicad/+bug/1612419), which means using the >> Dialog requires the same number of events for an action and thus the >> submenu does not even provide better efficiency. >> >> >> Patch can also be found on GitHub: >> https://github.com/pointhi/kicad-source-mirror/tree/3d_viewer_menu >> >> >> Regards, Thomas >> >> <0001-Adjust-Menubar-of-3D-Viewer-to-common-style.patch>___ >> Mailing list: https://launchpad.net/~kicad-developers >> Post to : kicad-developers@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~kicad-developers >> More help : https://help.launchpad.net/ListHelp signature.asc Description: OpenPGP digital signature ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
Hi Thomas, I don’t think I’d nest the two export options just for the sake of consistency. Nested menus are harder to use, and should only be resorted to when necessary (either when room on the menu is an issue, or when progressive disclosure is desired). Copy 3D Image goes to the clipboard, and therefore must stay on the Edit menu (although it could be shortened to just Copy). The Preferences & View menu stuff looks good. I agree that we should get rid of all the menu options that are in the Display Options dialog. Cheers, Jeff. > On 4 Apr 2018, at 13:34, Thomas Pointhuberwrote: > > Hi, > > some time ago there were adjustments to have a common design of the > menubar in all applications. This initial patch does some basic > adjustions of the 3D-Viewer in this direction, but things like > displaying Hotkeys was not added. > > > One question regarding improvements based on that patch would be: > > There exists now a "Display Options" Dialog. In my point of view this > would allow us to remove quite a few submenus. What do you think about > that? Currently you need to cause a resize event to get the view updated > (https://bugs.launchpad.net/kicad/+bug/1612419), which means using the > Dialog requires the same number of events for an action and thus the > submenu does not even provide better efficiency. > > > Patch can also be found on GitHub: > https://github.com/pointhi/kicad-source-mirror/tree/3d_viewer_menu > > > Regards, Thomas > > <0001-Adjust-Menubar-of-3D-Viewer-to-common-style.patch>___ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
[Kicad-developers] [PATCH] Adjust Menubar of 3D Viewer to common style
Hi, some time ago there were adjustments to have a common design of the menubar in all applications. This initial patch does some basic adjustions of the 3D-Viewer in this direction, but things like displaying Hotkeys was not added. One question regarding improvements based on that patch would be: There exists now a "Display Options" Dialog. In my point of view this would allow us to remove quite a few submenus. What do you think about that? Currently you need to cause a resize event to get the view updated (https://bugs.launchpad.net/kicad/+bug/1612419), which means using the Dialog requires the same number of events for an action and thus the submenu does not even provide better efficiency. Patch can also be found on GitHub: https://github.com/pointhi/kicad-source-mirror/tree/3d_viewer_menu Regards, Thomas From 53e344fe2ee450b852f49b635ac89542080e0dd8 Mon Sep 17 00:00:00 2001 From: Thomas PointhuberDate: Wed, 4 Apr 2018 14:17:20 +0200 Subject: [PATCH] Adjust Menubar of 3D Viewer to common style --- 3d-viewer/3d_viewer/3d_toolbar.cpp | 124 + 1 file changed, 112 insertions(+), 12 deletions(-) diff --git a/3d-viewer/3d_viewer/3d_toolbar.cpp b/3d-viewer/3d_viewer/3d_toolbar.cpp index 3027b1dee..d5c1ec240 100644 --- a/3d-viewer/3d_viewer/3d_toolbar.cpp +++ b/3d-viewer/3d_viewer/3d_toolbar.cpp @@ -35,6 +35,8 @@ #include #include <3d_viewer_id.h> +#include "help_common_strings.h" + void EDA_3D_VIEWER::ReCreateMainToolbar() { @@ -141,30 +143,100 @@ 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; menuBar->Append( fileMenu, _( "" ) ); -AddMenuItem( fileMenu, ID_MENU_SCREENCOPY_PNG, - _( "Export Current View as PNG..." ), +// Export options +// / +wxMenu* exportMenu = new wxMenu; + +AddMenuItem( exportMenu, ID_MENU_SCREENCOPY_PNG, + _( "PNG..." ), _( "Export Current View as PNG..." ), KiBitmap( export_xpm ) ); -AddMenuItem( fileMenu, ID_MENU_SCREENCOPY_JPEG, - _( "Export Current View as JPEG..." ), +AddMenuItem( exportMenu, ID_MENU_SCREENCOPY_JPEG, + _( "JPEG..." ), _( "Export Current View as JPEG..." ), KiBitmap( export_xpm ) ); +AddMenuItem( exportMenu, ID_TOOL_SCREENCOPY_TOCLIBBOARD, + _( "3D View to Clipboard" ), + KiBitmap( copy_xpm ) ); + +AddMenuItem( fileMenu, exportMenu, + ID_GEN_EXPORT_FILE, _( "E" ), + _( "Export Current View" ), KiBitmap( export_xpm ) ); + fileMenu->AppendSeparator(); -AddMenuItem( fileMenu, wxID_EXIT, - _( "" ), - KiBitmap( exit_xpm ) ); +AddMenuItem( fileMenu, wxID_EXIT, _( "" ), _( "Close 3D Viewer" ), KiBitmap( exit_xpm ) ); -menuBar->Append( editMenu, _( "" ) ); +menuBar->Append( viewMenu, _( "" ) ); -AddMenuItem( editMenu, ID_TOOL_SCREENCOPY_TOCLIBBOARD, - _( "Copy 3D Image" ), - KiBitmap( copy_xpm ) ); +AddMenuItem( viewMenu, ID_ZOOM_IN, + _( "Zoom " ), HELP_ZOOM_IN, + KiBitmap( zoom_in_xpm ) ); + +AddMenuItem( viewMenu, ID_ZOOM_OUT, + _( "Zoom " ), HELP_ZOOM_OUT, + KiBitmap( zoom_out_xpm ) ); + +AddMenuItem( viewMenu, ID_ZOOM_PAGE, + _( "Zoom to " ), HELP_ZOOM_FIT, + KiBitmap( zoom_fit_in_page_xpm ) ); + +AddMenuItem( viewMenu, ID_ZOOM_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" ), +