From 50a388fe56bb53db519dfc68f5306ec79555e774 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Wed, 4 Jan 2017 15:24:45 -0500 Subject: [PATCH] Page setting menu entry consistency fixes. Move the page setting menu entry from the edit menu to the file menu in Eeschema so it is consistent with Pcbnew. Change the page setting menu entry tooltip in Pcbnew so it is the same as Eeschema. --- eeschema/menubar.cpp | 17 ++++++++--------- pcbnew/menubar_pcbframe.cpp | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 106a30b1d5..5a4fea0771 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2009-2014 Wayne Stambaugh + * Copyright (C) 2009-2016 Wayne Stambaugh * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or @@ -395,6 +395,12 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) aParentMenu->AppendSeparator(); + // Edit page layout: + AddMenuItem( aParentMenu, ID_SHEET_SET, + _( "Pa&ge Settings" ), + _( "Settings for sheet size and frame references" ), + KiBitmap( sheetset_xpm ) ); + AddMenuItem( aParentMenu, wxID_PRINT, _( "Pri&nt" ), @@ -458,13 +464,6 @@ void prepareEditMenu( wxMenu* aParentMenu ) AddMenuItem( aParentMenu, wxID_REPLACE, text, HELP_REPLACE, KiBitmap( find_replace_xpm ) ); - // Edit page layout: - aParentMenu->AppendSeparator(); - AddMenuItem( aParentMenu, ID_SHEET_SET, - _( "Pa&ge Settings (Size and Texts)" ), - _( "Settings for sheet size and frame references" ), - KiBitmap( sheetset_xpm ) ); - // Import footprint association .cmp file which can be created by Pcbnew: aParentMenu->AppendSeparator(); AddMenuItem( aParentMenu, ID_BACKANNO_ITEMS, @@ -620,4 +619,4 @@ void prepareImportExportMenu( wxMenu* aParentMenu ) _( "&Import Hotkeys" ), _( "Load an existing hotkey configuration file" ), KiBitmap( hotkeys_import_xpm ) ); -} \ No newline at end of file +} diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp index f9e8507bf2..4ae3ba64e3 100644 --- a/pcbnew/menubar_pcbframe.cpp +++ b/pcbnew/menubar_pcbframe.cpp @@ -237,8 +237,8 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() filesMenu->AppendSeparator(); AddMenuItem( filesMenu, ID_SHEET_SET, - _( "Page s&ettings" ), - _( "Page settings for paper size and texts" ), + _( "Page S&ettings" ), + _( "Settings for sheet size and frame references" ), KiBitmap( sheetset_xpm ) ); AddMenuItem( filesMenu, wxID_PRINT,