Commit e373850d authored by Nick Østergaard's avatar Nick Østergaard Committed by Wayne Stambaugh
Browse files

Add remove fill and fill all zones hot keys.

parent 0e996cac

pcbnew/hotkeys.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -126,6 +126,10 @@ static EDA_HOTKEY HkCanvasOpenGL( wxT( "Switch to OpenGL Canvas" ), 
static EDA_HOTKEY HkCanvasCairo( wxT( "Switch to Cairo Canvas" ),

static EDA_HOTKEY HkCanvasCairo( wxT( "Switch to Cairo Canvas" ),

                                 HK_CANVAS_CAIRO, WXK_F12 );

                                 HK_CANVAS_CAIRO, WXK_F12 );





static EDA_HOTKEY HkZoneFillOrRefill( wxT( "Fill or Refill All Zones" ),

                                 HK_ZONE_FILL_OR_REFILL, 'B' );

static EDA_HOTKEY HkZoneRemoveFilled( wxT( "Remove Filled Areas in All Zones" ),

                                 HK_ZONE_REMOVE_FILLED, 'N' );

/* Fit on Screen */

/* Fit on Screen */

#if !defined( __WXMAC__ )

#if !defined( __WXMAC__ )

static EDA_HOTKEY HkZoomAuto( wxT( "Zoom Auto" ), HK_ZOOM_AUTO, WXK_HOME );

static EDA_HOTKEY HkZoomAuto( wxT( "Zoom Auto" ), HK_ZOOM_AUTO, WXK_HOME );
@@ -289,6 +293,7 @@ EDA_HOTKEY* board_edit_Hotkey_List[] = 
    &HkRecordMacros8,          &HkCallMacros8,    &HkRecordMacros9,          &HkCallMacros9,

    &HkRecordMacros8,          &HkCallMacros8,    &HkRecordMacros9,          &HkCallMacros9,

    &HkSwitchHighContrastMode,

    &HkSwitchHighContrastMode,

    &HkCanvasDefault,          &HkCanvasCairo,               &HkCanvasOpenGL,

    &HkCanvasDefault,          &HkCanvasCairo,               &HkCanvasOpenGL,

    &HkZoneFillOrRefill,       &HkZoneRemoveFilled,

    NULL

    NULL

};

};

pcbnew/hotkeys.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -114,7 +114,9 @@ enum hotkey_id_commnand { 
    HK_CANVAS_OPENGL,

    HK_CANVAS_OPENGL,

    HK_CANVAS_CAIRO,

    HK_CANVAS_CAIRO,

    HK_LEFT_CLICK,

    HK_LEFT_CLICK,

    HK_LEFT_DCLICK

    HK_LEFT_DCLICK,

    HK_ZONE_FILL_OR_REFILL,

    HK_ZONE_REMOVE_FILLED

};

};





// Full list of hotkey descriptors for board editor and footprint editor

// Full list of hotkey descriptors for board editor and footprint editor

pcbnew/hotkeys_board_editor.cpp

+8 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <pcbnew.h>

#include <pcbnew.h>

#include <pcbnew_id.h>

#include <pcbnew_id.h>

#include <hotkeys.h>

#include <hotkeys.h>

#include <class_zone.h>





/* How to add a new hotkey:

/* How to add a new hotkey:

 * see hotkeys.cpp

 * see hotkeys.cpp
@@ -566,6 +567,13 @@ bool PCB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotkeyCode, const wxPoint& aPosit 
    case HK_CANVAS_DEFAULT:

    case HK_CANVAS_DEFAULT:

        evt_type = ID_MENU_CANVAS_DEFAULT;

        evt_type = ID_MENU_CANVAS_DEFAULT;

        break;

        break;

    case HK_ZONE_FILL_OR_REFILL:

        evt_type = ID_POPUP_PCB_FILL_ALL_ZONES;

        break;

    case HK_ZONE_REMOVE_FILLED:

        evt_type = ID_POPUP_PCB_REMOVE_FILLED_AREAS_IN_ALL_ZONES;

        break;



    }

    }





    if( evt_type != 0 )

    if( evt_type != 0 )

pcbnew/onrightclick.cpp

+6 −2
Original line number Original line Diff line number Diff line
@@ -319,10 +319,14 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) 
        if(  GetBoard()->m_ZoneDescriptorList.size() > 0 )

        if(  GetBoard()->m_ZoneDescriptorList.size() > 0 )

        {

        {

            aPopMenu->AppendSeparator();

            aPopMenu->AppendSeparator();

            msg = AddHotkeyName( _( "Fill or Refill All Zones" ),

                                 g_Board_Editor_Hokeys_Descr, HK_ZONE_FILL_OR_REFILL );

            AddMenuItem( aPopMenu, ID_POPUP_PCB_FILL_ALL_ZONES,

            AddMenuItem( aPopMenu, ID_POPUP_PCB_FILL_ALL_ZONES,

                         _( "Fill or Refill All Zones" ), KiBitmap( fill_zone_xpm ) );

                         msg, KiBitmap( fill_zone_xpm ) );

            msg = AddHotkeyName( _( "Remove Filled Areas in All Zones" ),

                                 g_Board_Editor_Hokeys_Descr, HK_ZONE_REMOVE_FILLED );

            AddMenuItem( aPopMenu, ID_POPUP_PCB_REMOVE_FILLED_AREAS_IN_ALL_ZONES,

            AddMenuItem( aPopMenu, ID_POPUP_PCB_REMOVE_FILLED_AREAS_IN_ALL_ZONES,

                         _( "Remove Filled Areas in All Zones" ), KiBitmap( zone_unfill_xpm ) );

                         msg, KiBitmap( zone_unfill_xpm ) );

            aPopMenu->AppendSeparator();

            aPopMenu->AppendSeparator();

        }

        }