← Back to branch summary

~fmorgner/kicad/kicad

« back to all changes in this revision

Viewing changes to pcbnew/modedit_onclick.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:
pcbnew/modedit_onclick.cpp
197
197
    if( GetToolId() != ID_NO_TOOL_SELECTED )
198
198
    {
199
199
        if( item && item->m_Flags )
200
 
            AddMenuItem( PopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel" ), cancel_xpm );
 
200
            AddMenuItem( PopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel" ), KiBitmap( cancel_xpm ) );
201
201
        else
202
 
            AddMenuItem( PopMenu, ID_POPUP_CLOSE_CURRENT_TOOL, _( "End Tool" ), cancel_tool_xpm );
 
202
            AddMenuItem( PopMenu, ID_POPUP_CLOSE_CURRENT_TOOL, _( "End Tool" ), KiBitmap( cancel_tool_xpm ) );
203
203
 
204
204
        PopMenu->AppendSeparator();
205
205
    }
210
210
            if( blockActive )  // Put block commands in list
211
211
            {
212
212
                AddMenuItem( PopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND,
213
 
                             _( "Cancel Block" ), cancel_xpm );
 
213
                             _( "Cancel Block" ), KiBitmap( cancel_xpm ) );
214
214
                AddMenuItem( PopMenu, ID_POPUP_ZOOM_BLOCK,
215
215
                             _( "Zoom Block (drag middle mouse)" ),
216
 
                             zoom_area_xpm );
 
216
                             KiBitmap( zoom_area_xpm ) );
217
217
                PopMenu->AppendSeparator();
218
218
                AddMenuItem( PopMenu, ID_POPUP_PLACE_BLOCK,
219
 
                             _( "Place Block" ), apply_xpm );
 
219
                             _( "Place Block" ), KiBitmap( apply_xpm ) );
220
220
                AddMenuItem( PopMenu, ID_POPUP_COPY_BLOCK,
221
221
                             _( "Copy Block (shift + drag mouse)" ),
222
 
                             copyblock_xpm );
 
222
                             KiBitmap( copyblock_xpm ) );
223
223
                AddMenuItem( PopMenu, ID_POPUP_MIRROR_X_BLOCK,
224
224
                             _( "Mirror Block (alt + drag mouse)" ),
225
 
                             mirror_h_xpm );
 
225
                             KiBitmap( mirror_h_xpm ) );
226
226
                AddMenuItem( PopMenu, ID_POPUP_ROTATE_BLOCK,
227
227
                             _( "Rotate Block (ctrl + drag mouse)" ),
228
 
                             rotate_ccw_xpm );
 
228
                             KiBitmap( rotate_ccw_xpm ) );
229
229
                AddMenuItem( PopMenu, ID_POPUP_DELETE_BLOCK,
230
230
                             _( "Delete Block (shift+ctrl + drag mouse)" ),
231
 
                             delete_xpm );
 
231
                             KiBitmap( delete_xpm ) );
232
232
            }
233
233
            else
234
234
            {
235
235
                AddMenuItem( PopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND,
236
 
                             _( "Cancel" ), cancel_xpm );
 
236
                             _( "Cancel" ), KiBitmap( cancel_xpm ) );
237
237
            }
238
238
 
239
239
            PopMenu->AppendSeparator();
251
251
    {
252
252
        wxMenu* transform_choice = new wxMenu;
253
253
        AddMenuItem( transform_choice, ID_MODEDIT_MODULE_ROTATE, _( "Rotate" ),
254
 
                     rotate_module_pos_xpm );
255
 
        AddMenuItem( transform_choice, ID_MODEDIT_MODULE_MIRROR, _( "Mirror" ), mirror_h_xpm );
 
254
                     KiBitmap( rotate_module_pos_xpm ) );
 
255
        AddMenuItem( transform_choice, ID_MODEDIT_MODULE_MIRROR, _( "Mirror" ), KiBitmap( mirror_h_xpm ) );
256
256
        msg = AddHotkeyName( _( "Edit Module" ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM );
257
 
        AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_MODULE, msg, edit_module_xpm );
 
257
        AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_MODULE, msg, KiBitmap( edit_module_xpm ) );
258
258
        AddMenuItem( PopMenu, transform_choice, ID_MODEDIT_TRANSFORM_MODULE,
259
 
                     _( "Transform Module" ), edit_xpm );
 
259
                     _( "Transform Module" ), KiBitmap( edit_xpm ) );
260
260
        break;
261
261
    }
262
262
 
264
264
        if( !flags )
265
265
        {
266
266
            msg = AddHotkeyName( _("Move Pad" ), g_Module_Editor_Hokeys_Descr, HK_MOVE_ITEM );
267
 
            AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_PAD_REQUEST, msg, move_pad_xpm );
 
267
            AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_PAD_REQUEST, msg, KiBitmap( move_pad_xpm ) );
268
268
        }
269
269
 
270
270
        msg = AddHotkeyName( _("Edit Pad" ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM );
271
 
        AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_PAD, msg, options_pad_xpm );
 
271
        AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_PAD, msg, KiBitmap( options_pad_xpm ) );
272
272
        AddMenuItem( PopMenu, ID_POPUP_PCB_IMPORT_PAD_SETTINGS,
273
 
                     _( "New Pad Settings" ), options_new_pad_xpm );
 
273
                     _( "New Pad Settings" ), KiBitmap( options_new_pad_xpm ) );
274
274
        AddMenuItem( PopMenu, ID_POPUP_PCB_EXPORT_PAD_SETTINGS,
275
 
                     _( "Export Pad Settings" ), export_options_pad_xpm );
 
275
                     _( "Export Pad Settings" ), KiBitmap( export_options_pad_xpm ) );
276
276
        msg = AddHotkeyName( _("Delete Pad" ), g_Module_Editor_Hokeys_Descr, HK_DELETE );
277
 
        AddMenuItem( PopMenu, ID_POPUP_PCB_DELETE_PAD, msg, delete_pad_xpm );
 
277
        AddMenuItem( PopMenu, ID_POPUP_PCB_DELETE_PAD, msg, KiBitmap( delete_pad_xpm ) );
278
278
 
279
279
        if( !flags )
280
280
        {
281
281
            PopMenu->AppendSeparator();
282
282
            AddMenuItem( PopMenu, ID_POPUP_PCB_GLOBAL_IMPORT_PAD_SETTINGS,
283
 
                         _( "Global Pad Settings" ), global_options_pad_xpm );
 
283
                         _( "Global Pad Settings" ), KiBitmap( global_options_pad_xpm ) );
284
284
        }
285
285
 
286
286
        break;
290
290
        {
291
291
            msg = AddHotkeyName( _("Move Text Mod." ), g_Module_Editor_Hokeys_Descr,
292
292
                                 HK_MOVE_ITEM );
293
 
            AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_TEXTMODULE_REQUEST, msg, move_field_xpm );
 
293
            AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_TEXTMODULE_REQUEST, msg, KiBitmap( move_field_xpm ) );
294
294
        }
295
295
 
296
296
        msg = AddHotkeyName( _("Rotate Text Mod." ), g_Module_Editor_Hokeys_Descr,
297
297
                             HK_ROTATE_ITEM );
298
 
        AddMenuItem( PopMenu, ID_POPUP_PCB_ROTATE_TEXTMODULE, msg, rotate_field_xpm );
 
298
        AddMenuItem( PopMenu, ID_POPUP_PCB_ROTATE_TEXTMODULE, msg, KiBitmap( rotate_field_xpm ) );
299
299
 
300
300
        if( !flags )
301
301
        {
302
302
            msg = AddHotkeyName( _("Edit Text Mod." ), g_Module_Editor_Hokeys_Descr,
303
303
                                 HK_EDIT_ITEM );
304
 
            AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_TEXTMODULE, msg, edit_text_xpm );
 
304
            AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_TEXTMODULE, msg, KiBitmap( edit_text_xpm ) );
305
305
 
306
306
            if( ( (TEXTE_MODULE*) item )->m_Type == TEXT_is_DIVERS )
307
307
            {
308
308
                msg = AddHotkeyName( _("Delete Text Mod." ), g_Module_Editor_Hokeys_Descr,
309
309
                                     HK_DELETE );
310
 
                AddMenuItem( PopMenu, ID_POPUP_PCB_DELETE_TEXTMODULE, msg, delete_text_xpm );
 
310
                AddMenuItem( PopMenu, ID_POPUP_PCB_DELETE_TEXTMODULE, msg, KiBitmap( delete_text_xpm ) );
311
311
            }
312
312
        }
313
313
        break;
315
315
    case TYPE_EDGE_MODULE:
316
316
    {
317
317
        if( (flags & IS_NEW) )
318
 
            AddMenuItem( PopMenu, ID_POPUP_PCB_STOP_CURRENT_DRAWING, _( "End edge" ), apply_xpm );
 
318
            AddMenuItem( PopMenu, ID_POPUP_PCB_STOP_CURRENT_DRAWING, _( "End edge" ), KiBitmap( apply_xpm ) );
319
319
 
320
320
        if( !flags )
321
321
        {
322
322
            msg = AddHotkeyName( _("Move edge" ), g_Module_Editor_Hokeys_Descr, HK_MOVE_ITEM );
323
 
            AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_EDGE, msg, move_line_xpm );
 
323
            AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_EDGE, msg, KiBitmap( move_line_xpm ) );
324
324
        }
325
325
 
326
326
        if( ( flags & (IS_NEW | IS_MOVED) ) == IS_MOVED )
327
 
            AddMenuItem( PopMenu, ID_POPUP_PCB_PLACE_EDGE, _( "Place edge" ), apply_xpm );
 
327
            AddMenuItem( PopMenu, ID_POPUP_PCB_PLACE_EDGE, _( "Place edge" ), KiBitmap( apply_xpm ) );
328
328
 
329
329
        wxMenu* edit_mnu = new wxMenu;
330
 
        AddMenuItem( PopMenu, edit_mnu, ID_POPUP_PCB_EDIT_EDGE, _( "Edit" ), edit_xpm );
 
330
        AddMenuItem( PopMenu, edit_mnu, ID_POPUP_PCB_EDIT_EDGE, _( "Edit" ), KiBitmap( edit_xpm ) );
331
331
        AddMenuItem( edit_mnu, ID_POPUP_PCB_EDIT_WIDTH_CURRENT_EDGE,
332
 
                     _( "Edit Width (Current)" ), width_segment_xpm );
 
332
                     _( "Edit Width (Current)" ), KiBitmap( width_segment_xpm ) );
333
333
        AddMenuItem( edit_mnu, ID_POPUP_PCB_EDIT_WIDTH_ALL_EDGE,
334
 
                     _( "Edit Width (All)" ), width_segment_xpm );
 
334
                     _( "Edit Width (All)" ), KiBitmap( width_segment_xpm ) );
335
335
        AddMenuItem( edit_mnu, ID_POPUP_PCB_EDIT_LAYER_CURRENT_EDGE,
336
 
                     _( "Edit Layer (Current)" ), select_layer_pair_xpm );
 
336
                     _( "Edit Layer (Current)" ), KiBitmap( select_layer_pair_xpm ) );
337
337
        AddMenuItem( edit_mnu, ID_POPUP_PCB_EDIT_LAYER_ALL_EDGE,
338
 
                     _( "Edit Layer (All)" ), select_layer_pair_xpm );
 
338
                     _( "Edit Layer (All)" ), KiBitmap( select_layer_pair_xpm ) );
339
339
        msg = AddHotkeyName( _("Delete edge" ), g_Module_Editor_Hokeys_Descr, HK_DELETE );
340
 
        AddMenuItem( PopMenu, ID_POPUP_PCB_DELETE_EDGE, msg, delete_xpm );
 
340
        AddMenuItem( PopMenu, ID_POPUP_PCB_DELETE_EDGE, msg, KiBitmap( delete_xpm ) );
341
341
        append_set_width = TRUE;
342
342
    }
343
343
    break;
375
375
               || ( GetToolId() == ID_PCB_CIRCLE_BUTT )
376
376
               || ( GetToolId() == ID_PCB_ARC_BUTT ) ) ) )
377
377
    {
378
 
        AddMenuItem( PopMenu, ID_POPUP_PCB_ENTER_EDGE_WIDTH, _("Set Width" ), width_segment_xpm );
 
378
        AddMenuItem( PopMenu, ID_POPUP_PCB_ENTER_EDGE_WIDTH, _("Set Width" ), KiBitmap( width_segment_xpm ) );
379
379
        PopMenu->AppendSeparator();
380
380
    }
381
381