Re: [Kicad-developers] [PATCH] GerbView: Minor cleanup of Menus + Toolbar for consistency.

[Wayne Stambaugh]

Clemens,

I merged your patch.  Thank you for your contribution to KiCad.

Cheers,

Wayne

On 02/27/2018 05:35 PM, Clemens Koller wrote:
> replace: File -> File(s) when wxFD_MULTIPLE
> replace: Load -> Open
> replace: Erase -> Clear
> add Excellon / Gerber where it makes sense
> re-sort File menu
> 
> Regards,
> 
> Clemens
> 
> 
> 
> ___
> 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] GerbView: Minor cleanup of Menus + Toolbar for consistency.

[Clemens Koller]

replace: File -> File(s) when wxFD_MULTIPLE
replace: Load -> Open
replace: Erase -> Clear
add Excellon / Gerber where it makes sense
re-sort File menu

Regards,

Clemens
>From 058dc2b1eea83876f314eaa338c7193af52fdbb5 Mon Sep 17 00:00:00 2001
From: Clemens Koller 
Date: Tue, 27 Feb 2018 23:30:50 +0100
Subject: GerbView: Minor cleanup of Menus + Toolbar for consistency.

replace: File -> File(s) when wxFD_MULTIPLE
replace: Load -> Open
replace: Erase -> Clear
add Excellon / Gerber where it makes sense
re-sort File menu

diff --git a/gerbview/files.cpp b/gerbview/files.cpp
index 381ade3f5..9bd899e2c 100644
--- a/gerbview/files.cpp
+++ b/gerbview/files.cpp
@@ -197,7 +197,7 @@ bool GERBVIEW_FRAME::LoadGerberFiles( const wxString& aFullFileName )
 currentPath.RemoveLast();
 }
 
-wxFileDialog dlg( this, _( "Open Gerber File" ),
+wxFileDialog dlg( this, _( "Open Gerber File(s)" ),
   currentPath,
   filename.GetFullName(),
   filetypes,
@@ -337,7 +337,7 @@ bool GERBVIEW_FRAME::LoadExcellonFiles( const wxString& aFullFileName )
 else
 currentPath = m_mruPath;
 
-wxFileDialog dlg( this, _( "Open Drill File" ),
+wxFileDialog dlg( this, _( "Open Excellon Drill File(s)" ),
   currentPath, filename.GetFullName(), filetypes,
   wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_MULTIPLE | wxFD_CHANGE_DIR );
 
diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp
index 9dae741ab..a3ac0ab0e 100644
--- a/gerbview/menubar.cpp
+++ b/gerbview/menubar.cpp
@@ -59,28 +59,28 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
 // Menu File:
 wxMenu* fileMenu = new wxMenu;
 
-// Load Gerber files
+// Open Gerber file(s)
 AddMenuItem( fileMenu, wxID_FILE,
- _( "Load  File..." ),
- _( "Load a new Gerber file on the current layer. Previous data will be deleted" ),
+ _( "Open  File(s)..." ),
+ _( "Open Gerber file(s) on the current layer. Previous data will be deleted" ),
  KiBitmap( load_gerber_xpm ) );
 
-// Load Excellon drill files
+// Open Excellon drill file(s)
 AddMenuItem( fileMenu, ID_GERBVIEW_LOAD_DRILL_FILE,
- _( "Load  Drill File..." ),
- _( "Load excellon drill file" ),
+ _( "Open  Drill File(s)..." ),
+ _( "Open Excellon drill file(s) on the current layer. Previous data will be deleted" ),
  KiBitmap( gerbview_drill_file_xpm ) );
 
-// Load Gerber job files
+// Open Gerber job files
 AddMenuItem( fileMenu, ID_GERBVIEW_LOAD_JOB_FILE,
- _( "Load Gerber  File..." ),
- _( "Load a Gerber job file, and load gerber files depending on the job" ),
+ _( "Open Gerber  File..." ),
+ _( "Open a Gerber job file, and it's associated gerber files depending on the job" ),
  KiBitmap( gerber_job_file_xpm ) );
 
-// Load Zip archive files
+// Open Zip archive files
 AddMenuItem( fileMenu, ID_GERBVIEW_LOAD_ZIP_ARCHIVE_FILE,
- _( "Load  Archive File..." ),
- _( "Load a zipped archive (Gerber and drill) file" ),
+ _( "Open  Archive File..." ),
+ _( "Open a zipped archive (Gerber and Drill) file" ),
  KiBitmap( zip_xpm ) );
 
 // Recent gerber files
@@ -111,22 +111,8 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
 m_drillFileHistory.UseMenu( openRecentDrlMenu );
 m_drillFileHistory.AddFilesToMenu( );
 AddMenuItem( fileMenu, openRecentDrlMenu, wxID_ANY,
- _( "Open Recent Dri File" ),
- _( "Open a recently opened drill file" ),
- KiBitmap( recent_xpm ) );
-
-// Recent drill files
-static wxMenu* openRecentZipArchiveMenu;
-
-if( openRecentZipArchiveMenu )
-m_zipFileHistory.RemoveMenu( openRecentZipArchiveMenu );
-
-openRecentZipArchiveMenu = new wxMenu();
-m_zipFileHistory.UseMenu( openRecentZipArchiveMenu );
-m_zipFileHistory.AddFilesToMenu( );
-AddMenuItem( fileMenu, openRecentZipArchiveMenu, wxID_ANY,
- _( "Open Recent Zip  File" ),
- _( "Open a recently opened zip archive file" ),
+ _( "Open Recent Excellon Dri File" ),
+ _( "Open a recently opened Excellon drill file" ),
  KiBitmap( recent_xpm ) );
 
 // Recent job files
@@ -139,17 +125,31 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
 m_jobFileHistory.UseMenu( openRecentJobFilesMenu );
 m_jobFileHistory.AddFilesToMenu( );
 AddMenuItem( fileMenu, openRecentJobFilesMenu, wxID_ANY,
- _( "Open Recent  File" ),
+ _( "Open Recent Gerber  File" ),
  _( "Open a recently opened gerber job file" ),