~fmorgner/kicad/kicad

« back to all changes in this revision

Viewing changes to pcbnew/onrightclick.cpp

  • Committer: Dick Hollenbeck
  • Date: 2011-09-08 05:58:45 UTC
  • mto: This revision was merged to the branch mainline in revision 3112.
  • Revision ID: dick@softplc.com-20110908055845-c0n042fznolvee2e
PNG bitmap support, initial implementation

Show diffs side-by-side

added added

removed removed

Lines of Context:
48
48
    {
49
49
        if( item && item->m_Flags )
50
50
        {
51
 
            AddMenuItem( aPopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel" ), cancel_xpm );
 
51
            AddMenuItem( aPopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel" ), KiBitmap( cancel_xpm ) );
52
52
        }
53
53
        else
54
54
        {
55
55
            AddMenuItem( aPopMenu, ID_POPUP_CLOSE_CURRENT_TOOL,
56
 
                         _( "End Tool" ), cancel_tool_xpm );
 
56
                         _( "End Tool" ), KiBitmap( cancel_tool_xpm ) );
57
57
        }
58
58
 
59
59
        aPopMenu->AppendSeparator();
63
63
        if( item && item->m_Flags )
64
64
        {
65
65
            AddMenuItem( aPopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND,
66
 
                         _( "Cancel" ), cancel_xpm );
 
66
                         _( "Cancel" ), KiBitmap( cancel_xpm ) );
67
67
            aPopMenu->AppendSeparator();
68
68
        }
69
69
    }
123
123
                    msg = AddHotkeyName( _("Lock Module" ), g_Board_Editor_Hokeys_Descr,
124
124
                                         HK_LOCK_UNLOCK_FOOTPRINT );
125
125
                    AddMenuItem( aPopMenu, ID_POPUP_PCB_AUTOPLACE_FIXE_MODULE, msg,
126
 
                                 locked_xpm );
 
126
                                 KiBitmap( locked_xpm ) );
127
127
                }
128
128
                else
129
129
                {
130
130
                    msg = AddHotkeyName( _( "Unlock Module" ), g_Board_Editor_Hokeys_Descr,
131
131
                                         HK_LOCK_UNLOCK_FOOTPRINT );
132
132
                    AddMenuItem( aPopMenu, ID_POPUP_PCB_AUTOPLACE_FREE_MODULE, msg,
133
 
                                 unlocked_xpm );
 
133
                                 KiBitmap( unlocked_xpm ) );
134
134
                }
135
135
 
136
136
                if( !flags )
157
157
            if( (flags & IS_NEW) )
158
158
            {
159
159
                AddMenuItem( aPopMenu, ID_POPUP_PCB_STOP_CURRENT_DRAWING,
160
 
                             _( "End Drawing" ), apply_xpm );
 
160
                             _( "End Drawing" ), KiBitmap( apply_xpm ) );
161
161
            }
162
162
 
163
163
            if( !flags )
165
165
                msg = AddHotkeyName( _( "Move Drawing" ), g_Board_Editor_Hokeys_Descr,
166
166
                                     HK_MOVE_ITEM );
167
167
                AddMenuItem( aPopMenu, ID_POPUP_PCB_MOVE_DRAWING_REQUEST,
168
 
                             msg, move_xpm );
169
 
                AddMenuItem( aPopMenu, ID_POPUP_PCB_EDIT_DRAWING, _( "Edit Drawing" ), edit_xpm );
 
168
                             msg, KiBitmap( move_xpm ) );
 
169
                AddMenuItem( aPopMenu, ID_POPUP_PCB_EDIT_DRAWING, _( "Edit Drawing" ), KiBitmap( edit_xpm ) );
170
170
                AddMenuItem( aPopMenu, ID_POPUP_PCB_DELETE_DRAWING,
171
 
                             _( "Delete Drawing" ), delete_xpm );
 
171
                             _( "Delete Drawing" ), KiBitmap( delete_xpm ) );
172
172
 
173
173
                if( item->GetLayer() > LAST_COPPER_LAYER )
174
174
                    AddMenuItem( aPopMenu, ID_POPUP_PCB_DELETE_DRAWING_LAYER,
175
 
                                 _( "Delete All Drawing on Layer" ), delete_body_xpm );
 
175
                                 _( "Delete All Drawing on Layer" ), KiBitmap( delete_body_xpm ) );
176
176
            }
177
177
 
178
178
            break;
179
179
 
180
180
        case TYPE_ZONE:      // Item used to fill a zone
181
181
            AddMenuItem( aPopMenu, ID_POPUP_PCB_DELETE_ZONE,
182
 
                         _( "Delete Zone Filling" ), delete_xpm );
 
182
                         _( "Delete Zone Filling" ), KiBitmap( delete_xpm ) );
183
183
            break;
184
184
 
185
185
        case TYPE_ZONE_CONTAINER:    // Item used to handle a zone area (outlines, holes ...)
186
186
            if( flags & IS_NEW )
187
187
            {
188
188
                AddMenuItem( aPopMenu, ID_POPUP_PCB_STOP_CURRENT_EDGE_ZONE,
189
 
                             _( "Close Zone Outline" ), apply_xpm );
 
189
                             _( "Close Zone Outline" ), KiBitmap( apply_xpm ) );
190
190
                AddMenuItem( aPopMenu, ID_POPUP_PCB_DELETE_ZONE_LAST_CREATED_CORNER,
191
 
                             _( "Delete Last Corner" ), delete_xpm );
 
191
                             _( "Delete Last Corner" ), KiBitmap( delete_xpm ) );
192
192
            }
193
193
            else
194
194
            {
216
216
            {
217
217
                msg = AddHotkeyName( _( "Edit Dimension" ), g_Board_Editor_Hokeys_Descr,
218
218
                                     HK_EDIT_ITEM );
219
 
                AddMenuItem( aPopMenu, ID_POPUP_PCB_EDIT_DIMENSION, msg, edit_xpm );
 
219
                AddMenuItem( aPopMenu, ID_POPUP_PCB_EDIT_DIMENSION, msg, KiBitmap( edit_xpm ) );
220
220
                AddMenuItem( aPopMenu, ID_POPUP_PCB_DELETE_DIMENSION,
221
 
                             _( "Delete Dimension" ), delete_xpm );
 
221
                             _( "Delete Dimension" ), KiBitmap( delete_xpm ) );
222
222
            }
223
223
 
224
224
            break;
228
228
            {
229
229
                msg = AddHotkeyName( _( "Move Target" ), g_Board_Editor_Hokeys_Descr,
230
230
                                     HK_MOVE_ITEM );
231
 
                AddMenuItem( aPopMenu, ID_POPUP_PCB_MOVE_MIRE_REQUEST, msg, move_xpm );
 
231
                AddMenuItem( aPopMenu, ID_POPUP_PCB_MOVE_MIRE_REQUEST, msg, KiBitmap( move_xpm ) );
232
232
                msg = AddHotkeyName( _( "Edit Target" ), g_Board_Editor_Hokeys_Descr,
233
233
                                     HK_EDIT_ITEM );
234
 
                AddMenuItem( aPopMenu, ID_POPUP_PCB_EDIT_MIRE, msg, edit_xpm );
 
234
                AddMenuItem( aPopMenu, ID_POPUP_PCB_EDIT_MIRE, msg, KiBitmap( edit_xpm ) );
235
235
                AddMenuItem( aPopMenu, ID_POPUP_PCB_DELETE_MIRE,
236
 
                             _( "Delete Target" ), delete_xpm );
 
236
                             _( "Delete Target" ), KiBitmap( delete_xpm ) );
237
237
            }
238
238
 
239
239
            break;
268
268
        msg = AddHotkeyName( _( "Get and Move Footprint" ),
269
269
                             g_Board_Editor_Hokeys_Descr, HK_GET_AND_MOVE_FOOTPRINT );
270
270
        AddMenuItem( aPopMenu, ID_POPUP_PCB_GET_AND_MOVE_MODULE_REQUEST,
271
 
                     msg, move_module_xpm );
 
271
                     msg, KiBitmap( move_module_xpm ) );
272
272
    }
273
273
 
274
274
    /* Display context sensitive comands: */
279
279
        {
280
280
            aPopMenu->AppendSeparator();
281
281
            AddMenuItem( aPopMenu, ID_POPUP_PCB_FILL_ALL_ZONES,
282
 
                         _( "Fill or Refill All Zones" ), fill_zone_xpm );
 
282
                         _( "Fill or Refill All Zones" ), KiBitmap( fill_zone_xpm ) );
283
283
            AddMenuItem( aPopMenu, ID_POPUP_PCB_REMOVE_FILLED_AREAS_IN_ALL_ZONES,
284
 
                         _( "Remove Filled Areas in All Zones" ), fill_zone_xpm );
 
284
                         _( "Remove Filled Areas in All Zones" ), KiBitmap( fill_zone_xpm ) );
285
285
            aPopMenu->AppendSeparator();
286
286
        }
287
287
 
288
288
        AddMenuItem( aPopMenu, ID_POPUP_PCB_SELECT_LAYER,
289
 
                     _( "Select Working Layer" ), select_w_layer_xpm );
 
289
                     _( "Select Working Layer" ), KiBitmap( select_w_layer_xpm ) );
290
290
        aPopMenu->AppendSeparator();
291
291
        break;
292
292
 
293
293
    case ID_TRACK_BUTT:
294
294
        if ( ! locate_track )   // This menu is already added when a track is located
295
295
            AddMenuItem( aPopMenu, Append_Track_Width_List( GetBoard() ),
296
 
                         ID_POPUP_PCB_SELECT_WIDTH, _( "Select Track Width" ), width_track_xpm );
 
296
                         ID_POPUP_PCB_SELECT_WIDTH, _( "Select Track Width" ), KiBitmap( width_track_xpm ) );
297
297
 
298
298
        AddMenuItem( aPopMenu, ID_POPUP_PCB_SELECT_CU_LAYER,
299
 
                     _( "Select Working Layer" ), select_w_layer_xpm );
 
299
                     _( "Select Working Layer" ), KiBitmap( select_w_layer_xpm ) );
300
300
        AddMenuItem( aPopMenu, ID_POPUP_PCB_SELECT_LAYER_PAIR,
301
 
                     _( "Select Layer Pair for Vias" ), select_layer_pair_xpm );
 
301
                     _( "Select Layer Pair for Vias" ), KiBitmap( select_layer_pair_xpm ) );
302
302
        aPopMenu->AppendSeparator();
303
303
        break;
304
304
 
308
308
    case ID_PCB_ADD_LINE_BUTT:
309
309
    case ID_PCB_DIMENSION_BUTT:
310
310
        AddMenuItem( aPopMenu, ID_POPUP_PCB_SELECT_NO_CU_LAYER,
311
 
                      _( "Select Working Layer" ), select_w_layer_xpm );
 
311
                      _( "Select Working Layer" ), KiBitmap( select_w_layer_xpm ) );
312
312
        aPopMenu->AppendSeparator();
313
313
        break;
314
314
 
315
315
    case ID_PCB_MODULE_BUTT:
316
316
        AddMenuItem( aPopMenu, ID_POPUP_PCB_DISPLAY_FOOTPRINT_DOC,
317
 
                     _( "Footprint Documentation" ), book_xpm );
 
317
                     _( "Footprint Documentation" ), KiBitmap( book_xpm ) );
318
318
        aPopMenu->AppendSeparator();
319
319
        break;
320
320
 
323
323
        {
324
324
            wxMenu* commands = new wxMenu;
325
325
            AddMenuItem( aPopMenu, commands, ID_POPUP_PCB_AUTOPLACE_COMMANDS,
326
 
                         _( "Glob Move and Place" ), move_xpm );
 
326
                         _( "Glob Move and Place" ), KiBitmap( move_xpm ) );
327
327
            AddMenuItem( commands, ID_POPUP_PCB_AUTOPLACE_FREE_ALL_MODULES,
328
 
                         _( "Unlock All Modules" ), unlocked_xpm );
 
328
                         _( "Unlock All Modules" ), KiBitmap( unlocked_xpm ) );
329
329
            AddMenuItem( commands, ID_POPUP_PCB_AUTOPLACE_FIXE_ALL_MODULES,
330
 
                         _( "Lock All Modules" ), locked_xpm );
 
330
                         _( "Lock All Modules" ), KiBitmap( locked_xpm ) );
331
331
            commands->AppendSeparator();
332
332
            AddMenuItem( commands, ID_POPUP_PCB_AUTOMOVE_ALL_MODULES,
333
 
                         _( "Move All Modules" ), move_xpm );
 
333
                         _( "Move All Modules" ), KiBitmap( move_xpm ) );
334
334
            commands->Append( ID_POPUP_PCB_AUTOMOVE_NEW_MODULES, _( "Move New Modules" ) );
335
335
            commands->AppendSeparator();
336
336
            commands->Append( ID_POPUP_PCB_AUTOPLACE_ALL_MODULES, _( "Autoplace All Modules" ) );
338
338
            commands->Append( ID_POPUP_PCB_AUTOPLACE_NEXT_MODULE, _( "Autoplace Next Module" ) );
339
339
            commands->AppendSeparator();
340
340
            AddMenuItem( commands, ID_POPUP_PCB_REORIENT_ALL_MODULES,
341
 
                         _( "Orient All Modules" ), rotate_module_pos_xpm );
 
341
                         _( "Orient All Modules" ), KiBitmap( rotate_module_pos_xpm ) );
342
342
            aPopMenu->AppendSeparator();
343
343
        }
344
344
 
347
347
            wxMenu* commands = new wxMenu;
348
348
            aPopMenu->Append( ID_POPUP_PCB_AUTOROUTE_COMMANDS, _( "Autoroute" ), commands );
349
349
            AddMenuItem( commands, ID_POPUP_PCB_SELECT_LAYER_PAIR,
350
 
                         _( "Select Layer Pair" ), select_layer_pair_xpm );
 
350
                         _( "Select Layer Pair" ), KiBitmap( select_layer_pair_xpm ) );
351
351
            commands->AppendSeparator();
352
352
            commands->Append( ID_POPUP_PCB_AUTOROUTE_ALL_MODULES, _( "Autoroute All Modules" ) );
353
353
            commands->AppendSeparator();
358
358
        if( locate_track )
359
359
            AddMenuItem( aPopMenu, Append_Track_Width_List( GetBoard() ),
360
360
                         ID_POPUP_PCB_SELECT_WIDTH, _( "Select Track Width" ),
361
 
                         width_track_xpm );
 
361
                         KiBitmap( width_track_xpm ) );
362
362
 
363
363
        AddMenuItem( aPopMenu, ID_POPUP_PCB_SELECT_LAYER,
364
 
                     _( "Select Working Layer" ), select_w_layer_xpm );
 
364
                     _( "Select Working Layer" ), KiBitmap( select_w_layer_xpm ) );
365
365
        aPopMenu->AppendSeparator();
366
366
        break;
367
367
    }
375
375
 */
376
376
void PCB_EDIT_FRAME::createPopUpBlockMenu( wxMenu* menu )
377
377
{
378
 
    AddMenuItem( menu, ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel Block" ), cancel_xpm );
379
 
    AddMenuItem( menu, ID_POPUP_ZOOM_BLOCK, _( "Zoom Block" ), zoom_area_xpm );
 
378
    AddMenuItem( menu, ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel Block" ), KiBitmap( cancel_xpm ) );
 
379
    AddMenuItem( menu, ID_POPUP_ZOOM_BLOCK, _( "Zoom Block" ), KiBitmap( zoom_area_xpm ) );
380
380
    menu->AppendSeparator();
381
 
    AddMenuItem( menu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), apply_xpm );
382
 
    AddMenuItem( menu, ID_POPUP_COPY_BLOCK, _( "Copy Block" ), copyblock_xpm );
383
 
    AddMenuItem( menu, ID_POPUP_FLIP_BLOCK, _( "Flip Block" ), invert_module_xpm );
384
 
    AddMenuItem( menu, ID_POPUP_ROTATE_BLOCK, _( "Rotate Block" ), rotate_ccw_xpm );
385
 
    AddMenuItem( menu, ID_POPUP_DELETE_BLOCK, _( "Delete Block" ), delete_xpm );
 
381
    AddMenuItem( menu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), KiBitmap( apply_xpm ) );
 
382
    AddMenuItem( menu, ID_POPUP_COPY_BLOCK, _( "Copy Block" ), KiBitmap( copyblock_xpm ) );
 
383
    AddMenuItem( menu, ID_POPUP_FLIP_BLOCK, _( "Flip Block" ), KiBitmap( invert_module_xpm ) );
 
384
    AddMenuItem( menu, ID_POPUP_ROTATE_BLOCK, _( "Rotate Block" ), KiBitmap( rotate_ccw_xpm ) );
 
385
    AddMenuItem( menu, ID_POPUP_DELETE_BLOCK, _( "Delete Block" ), KiBitmap( delete_xpm ) );
386
386
}
387
387
 
388
388
 
404
404
    {
405
405
        if( Track->Type() == TYPE_VIA )
406
406
        {
407
 
            AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_TRACK_NODE, _( "Drag Via" ), move_xpm );
 
407
            AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_TRACK_NODE, _( "Drag Via" ), KiBitmap( move_xpm ) );
408
408
        }
409
409
        else
410
410
        {
412
412
            {
413
413
                msg = AddHotkeyName( _( "Move Node" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
414
414
                AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_TRACK_NODE,
415
 
                             msg, move_xpm );
 
415
                             msg, KiBitmap( move_xpm ) );
416
416
            }
417
417
            else
418
418
            {
419
419
                msg = AddHotkeyName( _( "Drag Segments, Keep Slope" ), g_Board_Editor_Hokeys_Descr,
420
420
                                     HK_DRAG_TRACK_KEEP_SLOPE );
421
421
                AddMenuItem( PopMenu, ID_POPUP_PCB_DRAG_TRACK_SEGMENT_KEEP_SLOPE,
422
 
                             msg, drag_segment_withslope_xpm );
 
422
                             msg, KiBitmap( drag_segment_withslope_xpm ) );
423
423
                msg = AddHotkeyName( _( "Drag Segment" ), g_Board_Editor_Hokeys_Descr,
424
424
                                     HK_DRAG_ITEM );
425
425
                AddMenuItem( PopMenu, ID_POPUP_PCB_DRAG_TRACK_SEGMENT,
426
 
                             msg, drag_track_segment_xpm );
 
426
                             msg, KiBitmap( drag_track_segment_xpm ) );
427
427
                AddMenuItem( PopMenu, ID_POPUP_PCB_BREAK_TRACK,
428
 
                             _( "Break Track" ), break_line_xpm );
 
428
                             _( "Break Track" ), KiBitmap( break_line_xpm ) );
429
429
            }
430
430
        }
431
431
    }
432
432
    else if( flags & IS_DRAGGED )   // Drag via or node in progress
433
433
    {
434
434
        AddMenuItem( PopMenu, ID_POPUP_PCB_PLACE_MOVED_TRACK_NODE,
435
 
                     _( "Place Node" ), apply_xpm );
 
435
                     _( "Place Node" ), KiBitmap( apply_xpm ) );
436
436
        return;
437
437
    }
438
438
    else // Edition in progress
440
440
        if( flags & IS_NEW )
441
441
        {
442
442
            msg = AddHotkeyName( _( "End Track" ), g_Board_Editor_Hokeys_Descr, HK_END_TRACK );
443
 
            AddMenuItem( PopMenu, ID_POPUP_PCB_END_TRACK, msg, apply_xpm );
 
443
            AddMenuItem( PopMenu, ID_POPUP_PCB_END_TRACK, msg, KiBitmap( apply_xpm ) );
444
444
        }
445
445
 
446
446
        msg = AddHotkeyName( _( "Place Via" ), g_Board_Editor_Hokeys_Descr, HK_ADD_VIA );
466
466
        {
467
467
            msg = AddHotkeyName( _( "Change Via Size and Drill" ), g_Board_Editor_Hokeys_Descr,
468
468
                                 HK_EDIT_ITEM );
469
 
            AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_TRACKSEG, msg, width_segment_xpm );
 
469
            AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_TRACKSEG, msg, KiBitmap( width_segment_xpm ) );
470
470
        }
471
471
        else
472
472
        {
473
473
            msg = AddHotkeyName( _( "Change Segment Width" ), g_Board_Editor_Hokeys_Descr,
474
474
                                 HK_EDIT_ITEM );
475
 
            AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_TRACKSEG, msg, width_segment_xpm );
 
475
            AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_TRACKSEG, msg, KiBitmap( width_segment_xpm ) );
476
476
            AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_TRACK,
477
 
                         _( "Change Track Width" ), width_track_xpm );
 
477
                         _( "Change Track Width" ), KiBitmap( width_track_xpm ) );
478
478
        }
479
479
    }
480
480
 
481
481
    // Allows switching to an other track/via size when routing
482
482
    AddMenuItem( PopMenu, Append_Track_Width_List( GetBoard() ), ID_POPUP_PCB_SELECT_WIDTH,
483
 
                 _( "Select Track Width" ), width_track_xpm );
 
483
                 _( "Select Track Width" ), KiBitmap( width_track_xpm ) );
484
484
 
485
485
    // Delete control:
486
486
    PopMenu->AppendSeparator();
487
487
    wxMenu* track_mnu = new wxMenu;
488
 
    AddMenuItem( PopMenu, track_mnu, ID_POPUP_PCB_DELETE_TRACK_MNU, _( "Delete" ), delete_xpm );
 
488
    AddMenuItem( PopMenu, track_mnu, ID_POPUP_PCB_DELETE_TRACK_MNU, _( "Delete" ), KiBitmap( delete_xpm ) );
489
489
 
490
490
    msg = AddHotkeyName( Track->Type()==TYPE_VIA ?
491
491
                        _( "Delete Via" ) : _( "Delete Segment" ),
492
492
                         g_Board_Editor_Hokeys_Descr, HK_BACK_SPACE );
493
493
 
494
 
    AddMenuItem( track_mnu, ID_POPUP_PCB_DELETE_TRACKSEG, msg, delete_line_xpm );
 
494
    AddMenuItem( track_mnu, ID_POPUP_PCB_DELETE_TRACKSEG, msg, KiBitmap( delete_line_xpm ) );
495
495
 
496
496
    if( !flags )
497
497
    {
498
498
        msg = AddHotkeyName( _( "Delete Track" ), g_Board_Editor_Hokeys_Descr, HK_DELETE );
499
 
        AddMenuItem( track_mnu, ID_POPUP_PCB_DELETE_TRACK, msg, delete_track_xpm );
500
 
        AddMenuItem( track_mnu, ID_POPUP_PCB_DELETE_TRACKNET, _( "Delete Net" ), delete_net_xpm );
 
499
        AddMenuItem( track_mnu, ID_POPUP_PCB_DELETE_TRACK, msg, KiBitmap( delete_track_xpm ) );
 
500
        AddMenuItem( track_mnu, ID_POPUP_PCB_DELETE_TRACKNET, _( "Delete Net" ), KiBitmap( delete_net_xpm ) );
501
501
    }
502
502
 
503
503
    // Add global edition command
505
505
    {
506
506
        PopMenu->AppendSeparator();
507
507
        AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_ALL_VIAS_AND_TRACK_SIZE,
508
 
                     _( "Global Tracks and Vias Edition" ), width_track_via_xpm );
 
508
                     _( "Global Tracks and Vias Edition" ), KiBitmap( width_track_via_xpm ) );
509
509
    }
510
510
 
511
511
    // Add lock/unlock flags menu:
512
512
    track_mnu = new wxMenu;
513
513
 
514
 
    AddMenuItem( PopMenu, track_mnu, ID_POPUP_PCB_SETFLAGS_TRACK_MNU, _( "Set Flags" ), flag_xpm );
 
514
    AddMenuItem( PopMenu, track_mnu, ID_POPUP_PCB_SETFLAGS_TRACK_MNU, _( "Set Flags" ), KiBitmap( flag_xpm ) );
515
515
    track_mnu->Append( ID_POPUP_PCB_LOCK_ON_TRACKSEG, _( "Locked: Yes" ), wxEmptyString, true );
516
516
    track_mnu->Append( ID_POPUP_PCB_LOCK_OFF_TRACKSEG, _( "Locked: No" ), wxEmptyString, true );
517
517
 
540
540
    if( edge_zone->m_Flags == IS_DRAGGED )
541
541
    {
542
542
        AddMenuItem( aPopMenu, ID_POPUP_PCB_PLACE_DRAGGED_ZONE_OUTLINE_SEGMENT,
543
 
                     _( "Place Edge Outline" ), apply_xpm );
 
543
                     _( "Place Edge Outline" ), KiBitmap( apply_xpm ) );
544
544
    }
545
545
    else if( edge_zone->m_Flags )
546
546
    {
547
547
        if( (edge_zone->m_Flags & IN_EDIT ) )
548
548
            AddMenuItem( aPopMenu, ID_POPUP_PCB_PLACE_ZONE_CORNER,
549
 
                         _( "Place Corner" ), apply_xpm );
 
549
                         _( "Place Corner" ), KiBitmap( apply_xpm ) );
550
550
        else
551
551
            AddMenuItem( aPopMenu, ID_POPUP_PCB_PLACE_ZONE_OUTLINES,
552
 
                         _( "Place Zone" ), apply_xpm );
 
552
                         _( "Place Zone" ), KiBitmap( apply_xpm ) );
553
553
    }
554
554
    else
555
555
    {
556
556
        wxMenu* zones_menu = new wxMenu();
557
557
 
558
 
        AddMenuItem( aPopMenu, zones_menu, -1, _( "Zones" ), add_zone_xpm );
 
558
        AddMenuItem( aPopMenu, zones_menu, -1, _( "Zones" ), KiBitmap( add_zone_xpm ) );
559
559
 
560
560
        if( edge_zone->HitTestForCorner( GetScreen()->RefPos( true ) ) )
561
561
        {
562
562
            AddMenuItem( zones_menu, ID_POPUP_PCB_MOVE_ZONE_CORNER,
563
 
                         _( "Move Corner" ), move_xpm );
 
563
                         _( "Move Corner" ), KiBitmap( move_xpm ) );
564
564
            AddMenuItem( zones_menu, ID_POPUP_PCB_DELETE_ZONE_CORNER,
565
 
                         _( "Delete Corner" ), delete_xpm );
 
565
                         _( "Delete Corner" ), KiBitmap( delete_xpm ) );
566
566
        }
567
567
        else if( edge_zone->HitTestForEdge( GetScreen()->RefPos( true ) ) )
568
568
        {
569
569
            AddMenuItem( zones_menu, ID_POPUP_PCB_ADD_ZONE_CORNER,
570
 
                         _( "Create Corner" ), add_corner_xpm );
 
570
                         _( "Create Corner" ), KiBitmap( add_corner_xpm ) );
571
571
            msg = AddHotkeyName( _( "Drag Outline Segment" ), g_Board_Editor_Hokeys_Descr,
572
572
                                 HK_DRAG_ITEM );
573
573
            AddMenuItem( zones_menu, ID_POPUP_PCB_DRAG_ZONE_OUTLINE_SEGMENT,
574
 
                         msg, drag_outline_segment_xpm );
 
574
                         msg, KiBitmap( drag_outline_segment_xpm ) );
575
575
        }
576
576
 
577
577
        zones_menu->AppendSeparator();
578
578
        AddMenuItem( zones_menu, ID_POPUP_PCB_ZONE_ADD_SIMILAR_ZONE,
579
 
                     _( "Add Similar Zone" ), add_zone_xpm );
 
579
                     _( "Add Similar Zone" ), KiBitmap( add_zone_xpm ) );
580
580
 
581
581
        AddMenuItem( zones_menu, ID_POPUP_PCB_ZONE_ADD_CUTOUT_ZONE,
582
 
                     _( "Add Cutout Area" ), add_zone_cutout_xpm );
 
582
                     _( "Add Cutout Area" ), KiBitmap( add_zone_cutout_xpm ) );
583
583
        zones_menu->AppendSeparator();
584
584
 
585
 
        AddMenuItem( zones_menu, ID_POPUP_PCB_FILL_ZONE, _( "Fill Zone" ), fill_zone_xpm );
 
585
        AddMenuItem( zones_menu, ID_POPUP_PCB_FILL_ZONE, _( "Fill Zone" ), KiBitmap( fill_zone_xpm ) );
586
586
 
587
587
        if( edge_zone->m_FilledPolysList.size() > 0 )
588
588
        {
589
589
            AddMenuItem( zones_menu, ID_POPUP_PCB_REMOVE_FILLED_AREAS_IN_CURRENT_ZONE,
590
 
                         _( "Remove Filled Areas in Zone" ), fill_zone_xpm );
 
590
                         _( "Remove Filled Areas in Zone" ), KiBitmap( fill_zone_xpm ) );
591
591
        }
592
592
 
593
593
        msg = AddHotkeyName( _( "Move Zone" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
594
 
        AddMenuItem( zones_menu, ID_POPUP_PCB_MOVE_ZONE_OUTLINES, msg, move_xpm );
 
594
        AddMenuItem( zones_menu, ID_POPUP_PCB_MOVE_ZONE_OUTLINES, msg, KiBitmap( move_xpm ) );
595
595
 
596
596
        msg = AddHotkeyName( _( "Edit Zone Params" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM );
597
597
        AddMenuItem( zones_menu, ID_POPUP_PCB_EDIT_ZONE_PARAMS,
598
 
                     msg, edit_xpm );
 
598
                     msg, KiBitmap( edit_xpm ) );
599
599
 
600
600
        zones_menu->AppendSeparator();
601
601
 
602
602
        if( edge_zone->m_CornerSelection >= 0 &&
603
603
            edge_zone->m_Poly->IsCutoutContour( edge_zone->m_CornerSelection ) )
604
604
            AddMenuItem( zones_menu, ID_POPUP_PCB_DELETE_ZONE_CUTOUT,
605
 
                         _( "Delete Cutout" ), delete_xpm );
 
605
                         _( "Delete Cutout" ), KiBitmap( delete_xpm ) );
606
606
 
607
607
        AddMenuItem( zones_menu, ID_POPUP_PCB_DELETE_ZONE_CONTAINER,
608
 
                     _( "Delete Zone Outline" ), delete_xpm );
 
608
                     _( "Delete Zone Outline" ), KiBitmap( delete_xpm ) );
609
609
    }
610
610
}
611
611
 
621
621
    sub_menu_footprint = new wxMenu;
622
622
 
623
623
    msg = aModule->GetSelectMenuText();
624
 
    AddMenuItem( menu, sub_menu_footprint, -1, msg, module_xpm );
 
624
    AddMenuItem( menu, sub_menu_footprint, -1, msg, KiBitmap( module_xpm ) );
625
625
 
626
626
    if( !flags )
627
627
    {
628
628
        msg = AddHotkeyName( _( "Move" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
629
629
        AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_MOVE_MODULE_REQUEST,
630
 
                     msg, move_module_xpm );
 
630
                     msg, KiBitmap( move_module_xpm ) );
631
631
        msg = AddHotkeyName( _( "Drag" ), g_Board_Editor_Hokeys_Descr, HK_DRAG_ITEM  );
632
632
        AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_DRAG_MODULE_REQUEST,
633
 
                     msg, drag_module_xpm );
 
633
                     msg, KiBitmap( drag_module_xpm ) );
634
634
    }
635
635
 
636
636
    msg = AddHotkeyName( _( "Rotate +" ), g_Board_Editor_Hokeys_Descr, HK_ROTATE_ITEM );
637
637
    AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_ROTATE_MODULE_COUNTERCLOCKWISE,
638
 
                 msg, rotate_module_pos_xpm );
 
638
                 msg, KiBitmap( rotate_module_pos_xpm ) );
639
639
    AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_ROTATE_MODULE_CLOCKWISE,
640
 
                 _( "Rotate -" ), rotate_module_neg_xpm );
 
640
                 _( "Rotate -" ), KiBitmap( rotate_module_neg_xpm ) );
641
641
    msg = AddHotkeyName( _( "Flip" ), g_Board_Editor_Hokeys_Descr, HK_FLIP_FOOTPRINT );
642
642
    AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_CHANGE_SIDE_MODULE,
643
 
                 msg, invert_module_xpm );
 
643
                 msg, KiBitmap( invert_module_xpm ) );
644
644
 
645
645
    if( !flags )
646
646
    {
647
647
        msg = AddHotkeyName( _( "Edit" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM );
648
 
        AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_EDIT_MODULE, msg, edit_module_xpm );
 
648
        AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_EDIT_MODULE, msg, KiBitmap( edit_module_xpm ) );
649
649
        sub_menu_footprint->AppendSeparator();
650
650
        AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_DELETE_MODULE,
651
 
                     _( "Delete Module" ), delete_module_xpm );
 
651
                     _( "Delete Module" ), KiBitmap( delete_module_xpm ) );
652
652
    }
653
653
}
654
654
 
664
664
 
665
665
    sub_menu_Fp_text = new wxMenu;
666
666
 
667
 
    AddMenuItem( menu, sub_menu_Fp_text, -1, msg, footprint_text_xpm );
 
667
    AddMenuItem( menu, sub_menu_Fp_text, -1, msg, KiBitmap( footprint_text_xpm ) );
668
668
 
669
669
    if( !flags )
670
670
    {
671
671
        msg = AddHotkeyName( _( "Move" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
672
672
        AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_MOVE_TEXTMODULE_REQUEST,
673
 
                     msg, move_field_xpm );
 
673
                     msg, KiBitmap( move_field_xpm ) );
674
674
    }
675
675
 
676
676
    msg = AddHotkeyName( _( "Rotate" ), g_Board_Editor_Hokeys_Descr, HK_ROTATE_ITEM );
677
677
    AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_ROTATE_TEXTMODULE,
678
 
                 msg, rotate_field_xpm );
 
678
                 msg, KiBitmap( rotate_field_xpm ) );
679
679
    if( !flags )
680
680
    {
681
681
        msg = AddHotkeyName( _( "Edit" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM );
682
682
        AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_EDIT_TEXTMODULE,
683
 
                     msg, edit_text_xpm );
 
683
                     msg, KiBitmap( edit_text_xpm ) );
684
684
        AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_RESET_TEXT_SIZE,
685
 
                     _( "Reset Size" ), reset_text_xpm );
 
685
                     _( "Reset Size" ), KiBitmap( reset_text_xpm ) );
686
686
    }
687
687
 
688
688
    // Graphic texts can be deleted only if are not currently edited.
689
689
    if( !flags && FpText->m_Type == TEXT_is_DIVERS )
690
690
    {
691
691
        AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_DELETE_TEXTMODULE,
692
 
                     _( "Delete" ), delete_xpm );
 
692
                     _( "Delete" ), KiBitmap( delete_xpm ) );
693
693
    }
694
694
 
695
695
    if( !flags )
723
723
    wxString msg = Pad->GetSelectMenuText();
724
724
 
725
725
    sub_menu_Pad = new wxMenu;
726
 
    AddMenuItem( menu, sub_menu_Pad, -1, msg, pad_xpm );
727
 
 
728
 
    AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_MOVE_PAD_REQUEST, _( "Move" ), move_pad_xpm );
729
 
    AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_DRAG_PAD_REQUEST, _( "Drag" ), drag_pad_xpm );
730
 
 
731
 
    AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_EDIT_PAD, _( "Edit" ), options_pad_xpm );
 
726
    AddMenuItem( menu, sub_menu_Pad, -1, msg, KiBitmap( pad_xpm ) );
 
727
 
 
728
    AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_MOVE_PAD_REQUEST, _( "Move" ), KiBitmap( move_pad_xpm ) );
 
729
    AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_DRAG_PAD_REQUEST, _( "Drag" ), KiBitmap( drag_pad_xpm ) );
 
730
 
 
731
    AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_EDIT_PAD, _( "Edit" ), KiBitmap( options_pad_xpm ) );
732
732
    sub_menu_Pad->AppendSeparator();
733
733
 
734
734
    AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_IMPORT_PAD_SETTINGS,
735
735
                 _( "Copy Current Settings to this Pad" ),
736
736
                 wxEmptyString,
737
 
                 options_new_pad_xpm );
 
737
                 KiBitmap( options_new_pad_xpm ) );
738
738
    AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_EXPORT_PAD_SETTINGS,
739
739
                 _( "Copy this Pad Settings to Current Settings" ),
740
740
                 wxEmptyString,
741
 
                 export_options_pad_xpm );
 
741
                 KiBitmap( export_options_pad_xpm ) );
742
742
 
743
743
    AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_GLOBAL_IMPORT_PAD_SETTINGS,
744
744
                 _( "Global Pads Edition" ),
745
745
                 _( "Copy this pad settings to all pads in this footprint (or similar footprints)" ),
746
 
                 global_options_pad_xpm );
 
746
                 KiBitmap( global_options_pad_xpm ) );
747
747
    sub_menu_Pad->AppendSeparator();
748
748
 
749
 
    AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_DELETE_PAD, _( "Delete" ), delete_pad_xpm );
 
749
    AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_DELETE_PAD, _( "Delete" ), KiBitmap( delete_pad_xpm ) );
750
750
 
751
751
    if( m_HTOOL_current_state == ID_TOOLBARH_PCB_MODE_TRACKS )
752
752
    {
774
774
 
775
775
    sub_menu_Text = new wxMenu;
776
776
 
777
 
    AddMenuItem( menu, sub_menu_Text, -1, msg, add_text_xpm );
 
777
    AddMenuItem( menu, sub_menu_Text, -1, msg, KiBitmap( add_text_xpm ) );
778
778
 
779
779
    if( !flags )
780
780
    {
781
781
        msg = AddHotkeyName( _( "Move" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
782
782
        AddMenuItem( sub_menu_Text, ID_POPUP_PCB_MOVE_TEXTEPCB_REQUEST,
783
 
                     msg, move_text_xpm );
 
783
                     msg, KiBitmap( move_text_xpm ) );
784
784
    }
785
785
    msg = AddHotkeyName( _( "Rotate" ), g_Board_Editor_Hokeys_Descr, HK_ROTATE_ITEM );
786
 
    AddMenuItem( sub_menu_Text, ID_POPUP_PCB_ROTATE_TEXTEPCB, msg, rotate_ccw_xpm );
 
786
    AddMenuItem( sub_menu_Text, ID_POPUP_PCB_ROTATE_TEXTEPCB, msg, KiBitmap( rotate_ccw_xpm ) );
787
787
    msg = AddHotkeyName( _( "Edit" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM );
788
 
    AddMenuItem( sub_menu_Text, ID_POPUP_PCB_EDIT_TEXTEPCB, msg, edit_text_xpm );
 
788
    AddMenuItem( sub_menu_Text, ID_POPUP_PCB_EDIT_TEXTEPCB, msg, KiBitmap( edit_text_xpm ) );
789
789
    AddMenuItem( sub_menu_Text, ID_POPUP_PCB_RESET_TEXT_SIZE,
790
 
                 _( "Reset Size" ), reset_text_xpm );
 
790
                 _( "Reset Size" ), KiBitmap( reset_text_xpm ) );
791
791
 
792
792
    sub_menu_Text->AppendSeparator();
793
 
    AddMenuItem( sub_menu_Text, ID_POPUP_PCB_DELETE_TEXTEPCB, _( "Delete" ), delete_text_xpm );
 
793
    AddMenuItem( sub_menu_Text, ID_POPUP_PCB_DELETE_TEXTEPCB, _( "Delete" ), KiBitmap( delete_text_xpm ) );
794
794
}
795
795
 
796
796
 
797
797
void PCB_EDIT_FRAME::createPopUpMenuForMarkers( MARKER_PCB* aMarker, wxMenu* aPopMenu )
798
798
{
799
 
    AddMenuItem( aPopMenu, ID_POPUP_PCB_DELETE_MARKER, _( "Delete Marker" ), delete_xpm );
800
 
    AddMenuItem( aPopMenu, ID_POPUP_PCB_GETINFO_MARKER, _( "Marker Error Info" ), info_xpm );
 
799
    AddMenuItem( aPopMenu, ID_POPUP_PCB_DELETE_MARKER, _( "Delete Marker" ), KiBitmap( delete_xpm ) );
 
800
    AddMenuItem( aPopMenu, ID_POPUP_PCB_GETINFO_MARKER, _( "Marker Error Info" ), KiBitmap( info_xpm ) );
801
801
}
802
802
 
803
803