KiCad

Merge lp:~xzcvczx/kicad/help-menu-icons-fix into lp:kicad/product

  1. help-menu-icons-fix
  2. Merge into product
Proposed by xzcvczx
Status: Merged
Merged at revision: 6221
Proposed branch: lp:~xzcvczx/kicad/help-menu-icons-fix
Merge into: lp:kicad/product
Diff against target: 45 lines (+6/-6)
2 files modified
gerbview/menubar.cpp (+3/-3)
pagelayout_editor/menubar.cpp (+3/-3)
To merge this branch: bzr merge lp:~xzcvczx/kicad/help-menu-icons-fix
Reviewer Review Type Date Requested Status
Nick Østergaard (community) Approve
KiCad Lead Developers Pending
Review via email: mp+272457@code.launchpad.net

Description of the change

fixed order of icons in the help menu for gerbview and page layout editor

To post a comment you must log in.
Revision history for this message
Nick Østergaard (nickoe) wrote :

Looks ok to me

review: Approve
Revision history for this message
Wayne Stambaugh (stambaughw) wrote :

Patch committed in product branch r6221. Thank you for your contribution to KiCad.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gerbview/menubar.cpp'
2--- gerbview/menubar.cpp 2015-09-23 18:59:31 +0000
3+++ gerbview/menubar.cpp 2015-09-25 18:04:50 +0000
4@@ -223,15 +223,15 @@
5 wxID_HELP,
6 _( "Gerbview &Manual" ),
7 _( "Open the GerbView Manual" ),
8- KiBitmap( help_xpm ) );
9+ KiBitmap( online_help_xpm ) );
10
11 AddMenuItem( helpMenu,
12 wxID_INDEX,
13 _( "&Getting Started in KiCad" ),
14 _( "Open \"Getting Started in KiCad\" guide for beginners" ),
15- KiBitmap( online_help_xpm ) );
16+ KiBitmap( help_xpm ) );
17
18- // About GerbView
19+ // About Kicad
20 AddMenuItem( helpMenu,
21 wxID_ABOUT,
22 _( "&About Kicad" ),
23
24=== modified file 'pagelayout_editor/menubar.cpp'
25--- pagelayout_editor/menubar.cpp 2015-09-23 19:41:51 +0000
26+++ pagelayout_editor/menubar.cpp 2015-09-25 18:04:50 +0000
27@@ -150,15 +150,15 @@
28 wxID_HELP,
29 _( "Page Layout Editor &Manual" ),
30 _( "Open the Page Layout Editor Manual" ),
31- KiBitmap( help_xpm ) );
32+ KiBitmap( online_help_xpm ) );
33
34 AddMenuItem( helpMenu,
35 wxID_INDEX,
36 _( "&Getting Started in KiCad" ),
37 _( "Open \"Getting Started in KiCad\" guide for beginners" ),
38- KiBitmap( online_help_xpm ) );
39+ KiBitmap( help_xpm ) );
40
41- // About GerbView
42+ // About Kicad
43 AddMenuItem( helpMenu,
44 wxID_ABOUT,
45 _( "&About Kicad" ),