Merge lp:~mangelajo/kicad/highcontrast-hotkey into lp:kicad/product

[Miguel Angel Ajo]

High contrast mode hotkey.

Hotkey for high contrast mode

[lp:~mangelajo/kicad/highcontrast-hotkey]

3421. By Miguel Angel Ajo on 2012-02-19

Gray out edge in modules in High contrast mode

[Dick Hollenbeck (dickelbeck)]

Looks good enough to commit to me.

Sad we did not use the word "Toggle" and "Switch" in these variable names and descriptions, since they have slightly different meanings.

Also, there was an indentation offset in front of a break statement.

review: Approve

[Miguel Angel Ajo (mangelajo)]

Thanks a lot for the review/merge.

I'm not used yet to the bazaar workflow, but, if I fix such things in my
branch, then the new changes
could be merged into "trunk" ? In that case I'll fix my little
contribution, it's something easy to do.
Toggle would be more appropriate in this context, right?

I'm used to write a lot in English, but it's not my mother tongue, which
should be quite easily noticeable :-)

Greetings,
Miguel

PS: good work with the refactoring you've been doing lately. :-)

2012/2/20 <email address hidden>

> The proposal to merge lp:~miguelangel-r/kicad/highcontrast-hotkey into
> lp:kicad has been updated.
>
> Status: Needs review => Merged
>
> For more details, see:
>
> https://code.launchpad.net/~miguelangel-r/kicad/highcontrast-hotkey/+merge/93742<https://code.launchpad.net/%7Emiguelangel-r/kicad/highcontrast-hotkey/+merge/93742>
> --
>
> https://code.launchpad.net/~miguelangel-r/kicad/highcontrast-hotkey/+merge/93742<https://code.launchpad.net/%7Emiguelangel-r/kicad/highcontrast-hotkey/+merge/93742>
> You are the owner of lp:~miguelangel-r/kicad/highcontrast-hotkey.
>

--

Miguel Angel Ajo Pelayo
http://www.nbee.es
[phone]
skype: ajoajoajo

[Dick Hollenbeck (dickelbeck)]

> Greetings,
> Miguel

> Thanks a lot for the review/merge.
>
> I'm not used yet to the bazaar workflow, but, if I fix such things in my
> branch, then the new changes
> could be merged into "trunk" ? In that case I'll fix my little
> contribution, it's something easy to do.

We always reserve the right to make our contributions better, right? :)

After your changes have been committed, it is probably best to branch from testing again
for the next round of changes.

> Toggle would be more appropriate in this context, right?

Indeed, but it is not important relative to other things, and it is not the lone hotkey
suffering from this.
I would not bother with it, but thats up to you.

> I'm used to write a lot in English, but it's not my mother tongue, which
> should be quite easily noticeable :-)
>
>
> Greetings,
> Miguel
>
> PS: good work with the refactoring you've been doing lately. :-)

Yes thanks, many lines of code for only three weekend days of work.
Even now, no-one is screaming. Maybe the changes actually work.

JEdit under my fingers is a fairly big hammer.

With the addition of my personal roadmap/TODO list in TODO.txt, folks can see that there
is some reason to the journey, even if it looks like I am merely picking up litter along
the roadside, randomly.

Dick

=== modified file 'pcbnew/hotkeys.cpp'
--- pcbnew/hotkeys.cpp	2012-02-09 20:33:38 +0000
+++ pcbnew/hotkeys.cpp	2012-02-19 21:34:18 +0000
@@ -78,7 +78,8 @@
 static EDA_HOTKEY HkDelete( wxT( "Delete Track or Footprint" ), HK_DELETE, WXK_DELETE );
 static EDA_HOTKEY HkResetLocalCoord( wxT( "Reset Local Coordinates" ),
                                      HK_RESET_LOCAL_COORD, ' ' );
-
+static EDA_HOTKEY HkSwitchHighContrastMode( wxT("Switch Highcontrast mode"), 
+					    HK_SWITCH_HIGHCONTRAST_MODE,'H');
 /* Fit on Screen */
 #if !defined( __WXMAC__ )
 static EDA_HOTKEY HkZoomAuto( wxT( "Zoom Auto" ), HK_ZOOM_AUTO, WXK_HOME );
@@ -224,6 +225,7 @@
     &HkRecordMacros4,          &HkCallMacros4,    &HkRecordMacros5,          &HkCallMacros5,
     &HkRecordMacros6,          &HkCallMacros6,    &HkRecordMacros7,          &HkCallMacros7,
     &HkRecordMacros8,          &HkCallMacros8,    &HkRecordMacros9,          &HkCallMacros9,
+    &HkSwitchHighContrastMode,
     NULL
 };
 

=== modified file 'pcbnew/hotkeys.h'
--- pcbnew/hotkeys.h	2012-02-09 20:33:38 +0000
+++ pcbnew/hotkeys.h	2012-02-19 21:34:18 +0000
@@ -76,7 +76,8 @@
     HK_RECORD_MACROS_8,
     HK_CALL_MACROS_8,
     HK_RECORD_MACROS_9,
-    HK_CALL_MACROS_9
+    HK_CALL_MACROS_9,
+    HK_SWITCH_HIGHCONTRAST_MODE,
 };
 
 // Full list of hotkey descriptors for board editor and footprint editor

=== modified file 'pcbnew/hotkeys_board_editor.cpp'
--- pcbnew/hotkeys_board_editor.cpp	2012-02-15 13:10:52 +0000
+++ pcbnew/hotkeys_board_editor.cpp	2012-02-19 21:34:18 +0000
@@ -625,6 +625,10 @@
     case HK_FLIP_FOOTPRINT:     // move to other side
         OnHotkeyRotateItem( HK_FLIP_FOOTPRINT );
         break;
+    case HK_SWITCH_HIGHCONTRAST_MODE: // switch to high contrast mode and refresh the canvas
+        DisplayOpt.ContrastModeDisplay = !DisplayOpt.ContrastModeDisplay;
+        m_canvas->Refresh();
+	break;
     }
 
     if( evt_type != 0 )