3_shortcuts_tidy_added_hints.diff

balazovic-mailbox-sk -, 2006-04-08 11:32 AM

Download (16.5 KB)

View differences:

src/gui/qgisapp.cpp (working copy)
364 364
  // File Menu Related Items
365 365
  //
366 366
  mActionFileNew= new QAction(QIcon(myIconPath+"/mActionFileNew.png"), tr("&New Project"), this);
367
  mActionFileNew->setShortcut(tr("Ctrl+N"));
367
  mActionFileNew->setShortcut(tr("Ctrl+N","New Project"));
368 368
  mActionFileNew->setStatusTip(tr("New Project"));
369 369
  connect(mActionFileNew, SIGNAL(triggered()), this, SLOT(fileNew()));
370 370
  //
371 371
  mActionFileOpen= new QAction(QIcon(myIconPath+"/mActionFileOpen.png"), tr("&Open Project..."), this);
372
  mActionFileOpen->setShortcut(tr("Ctrl+O"));
372
  mActionFileOpen->setShortcut(tr("Ctrl+O","Open a Project"));
373 373
  mActionFileOpen->setStatusTip(tr("Open a Project"));
374 374
  connect(mActionFileOpen, SIGNAL(triggered()), this, SLOT(fileOpen()));
375 375
  //
376 376
  mActionFileSave= new QAction(QIcon(myIconPath+"/mActionFileSave.png"), tr("&Save Project"), this);
377
  mActionFileSave->setShortcut(tr("Ctrl+O"));
378
  mActionFileSave->setStatusTip(tr("Open a Project"));
377
  mActionFileSave->setShortcut(tr("Ctrl+S","Save Project"));
378
  mActionFileSave->setStatusTip(tr("Save Project"));
379 379
  connect(mActionFileSave, SIGNAL(triggered()), this, SLOT(fileSave()));
380 380
  //
381 381
  mActionFileSaveAs= new QAction(QIcon(myIconPath+"/mActionFileSaveAs.png"), tr("Save Project &As..."), this);
382
  mActionFileSaveAs->setShortcut(tr("Ctrl+A"));
382
  mActionFileSaveAs->setShortcut(tr("Ctrl+A","Save Project under a new name"));
383 383
  mActionFileSaveAs->setStatusTip(tr("Save Project under a new name"));
384 384
  connect(mActionFileSaveAs, SIGNAL(triggered()), this, SLOT(fileSaveAs()));
385 385
  //
386 386
  mActionFilePrint= new QAction(QIcon(myIconPath+"/mActionFilePrint.png"), tr("&Print..."), this);
387
  mActionFilePrint->setShortcut(tr("Ctrl+P"));
387
  mActionFilePrint->setShortcut(tr("Ctrl+P","Print"));
388 388
  mActionFilePrint->setStatusTip(tr("Print"));
389 389
  connect(mActionFilePrint, SIGNAL(triggered()), this, SLOT(filePrint()));
390 390
  //
391 391
  mActionSaveMapAsImage= new QAction(QIcon(myIconPath+"/mActionSaveMapAsImage.png"), tr("Save as Image..."), this);
392
  mActionSaveMapAsImage->setShortcut(tr("I"));
392
  mActionSaveMapAsImage->setShortcut(tr("Ctrl+I","Save map as image"));
393 393
  mActionSaveMapAsImage->setStatusTip(tr("Save map as image"));
394 394
  connect(mActionSaveMapAsImage, SIGNAL(triggered()), this, SLOT(saveMapAsImage()));
395 395
  //
396 396
  mActionExportMapServer= new QAction(QIcon(myIconPath+"/mActionExportMapServer.png"), tr("Export to MapServer Map..."), this);
397
  mActionExportMapServer->setShortcut(tr("M"));
397
  mActionExportMapServer->setShortcut(tr("M","Export as MapServer .map file"));
398 398
  mActionExportMapServer->setStatusTip(tr("Export as MapServer .map file"));
399 399
  connect(mActionExportMapServer, SIGNAL(triggered()), this, SLOT(exportMapServer()));
400 400
  //
401 401
  mActionFileExit= new QAction(QIcon(myIconPath+"/mActionFileExit.png"), tr("Exit"), this);
402
  mActionFileExit->setShortcut(tr("Ctrl+Q"));
402
  mActionFileExit->setShortcut(tr("Ctrl+Q","Exit QGIS"));
403 403
  mActionFileExit->setStatusTip(tr("Exit QGIS"));
404 404
  connect(mActionFileExit, SIGNAL(triggered()), this, SLOT(fileExit()));
405 405
  //
406 406
  // Layer Menu Related Items
407 407
  //
408 408
  mActionAddNonDbLayer= new QAction(QIcon(myIconPath+"/mActionAddNonDbLayer.png"), tr("Add a Vector Layer..."), this);
409
  mActionAddNonDbLayer->setShortcut(tr("V"));
409
  mActionAddNonDbLayer->setShortcut(tr("V","Add a Vector Layer"));
410 410
  mActionAddNonDbLayer->setStatusTip(tr("Add a Vector Layer"));
411 411
  connect(mActionAddNonDbLayer, SIGNAL(triggered()), this, SLOT(addLayer()));
412 412
  //
413 413
  mActionAddRasterLayer= new QAction(QIcon(myIconPath+"/mActionAddRasterLayer.png"), tr("Add a Raster Layer..."), this);
414
  mActionAddRasterLayer->setShortcut(tr("R"));
414
  mActionAddRasterLayer->setShortcut(tr("R","Add a Raster Layer"));
415 415
  mActionAddRasterLayer->setStatusTip(tr("Add a Raster Layer"));
416 416
  assert(connect(mActionAddRasterLayer, SIGNAL(triggered()), this, SLOT(addRasterLayer())));
417 417
  //
418 418
  mActionAddLayer= new QAction(QIcon(myIconPath+"/mActionAddLayer.png"), tr("Add a PostGIS Layer..."), this);
419
  mActionAddLayer->setShortcut(tr("D"));
419
  mActionAddLayer->setShortcut(tr("D","Add a PostGIS Layer"));
420 420
  mActionAddLayer->setStatusTip(tr("Add a PostGIS Layer"));
421 421
//#ifdef HAVE_POSTGRESQL
422 422
//  std::cout << "HAVE_POSTGRESQL is defined" << std::endl; 
......
428 428
  assert(connect(mActionAddLayer, SIGNAL(triggered()), this, SLOT(addDatabaseLayer())));
429 429
  //
430 430
  mActionNewVectorLayer= new QAction(QIcon(myIconPath+"/mActionNewVectorLayer.png"), tr("New Vector Layer..."), this);
431
  mActionNewVectorLayer->setShortcut(tr("N"));
431
  mActionNewVectorLayer->setShortcut(tr("N","Create a New Vector Layer"));
432 432
  mActionNewVectorLayer->setStatusTip(tr("Create a New Vector Layer"));
433 433
  connect(mActionNewVectorLayer, SIGNAL(triggered()), this, SLOT(newVectorLayer()));
434 434
  //
435 435
  mActionRemoveLayer= new QAction(QIcon(myIconPath+"/mActionRemoveLayer.png"), tr("Remove Layer"), this);
436
  mActionRemoveLayer->setShortcut(tr("Ctrl+D"));
436
  mActionRemoveLayer->setShortcut(tr("Ctrl+D","Remove a Layer"));
437 437
  mActionRemoveLayer->setStatusTip(tr("Remove a Layer"));
438 438
  connect(mActionRemoveLayer, SIGNAL(triggered()), this, SLOT(removeLayer()));
439 439
  //
440 440
  mActionAddAllToOverview= new QAction(QIcon(myIconPath+"/mActionAddAllToOverview.png"), tr("Add All To Overview"), this);
441
  mActionAddAllToOverview->setShortcut(tr("+"));
441
  mActionAddAllToOverview->setShortcut(tr("+","Show all layers in the overview map"));
442 442
  mActionAddAllToOverview->setStatusTip(tr("Show all layers in the overview map"));
443 443
  connect(mActionAddAllToOverview, SIGNAL(triggered()), this, SLOT(addAllToOverview()));
444 444
  //
445 445
  mActionRemoveAllFromOverview= new QAction(QIcon(myIconPath+"/mActionRemoveAllFromOverview.png"), tr("Remove All From Overview"), this);
446
  mActionRemoveAllFromOverview->setShortcut(tr("-"));
446
  mActionRemoveAllFromOverview->setShortcut(tr("-","Remove all layers from overview map"));
447 447
  mActionRemoveAllFromOverview->setStatusTip(tr("Remove all layers from overview map"));
448 448
  connect(mActionRemoveAllFromOverview, SIGNAL(triggered()), this, SLOT(removeAllFromOverview()));
449 449
  //
450 450
  mActionShowAllLayers= new QAction(QIcon(myIconPath+"/mActionShowAllLayers.png"), tr("Show All Layers"), this);
451
  mActionShowAllLayers->setShortcut(tr("S"));
451
  mActionShowAllLayers->setShortcut(tr("S","Show all layers"));
452 452
  mActionShowAllLayers->setStatusTip(tr("Show all layers"));
453 453
  connect(mActionShowAllLayers, SIGNAL(triggered()), this, SLOT(showAllLayers()));
454 454
  //
455 455
  mActionHideAllLayers= new QAction(QIcon(myIconPath+"/mActionHideAllLayers.png"), tr("Hide All Layers"), this);
456
  mActionHideAllLayers->setShortcut(tr("H"));
456
  mActionHideAllLayers->setShortcut(tr("H","Hide all layers"));
457 457
  mActionHideAllLayers->setStatusTip(tr("Hide all layers"));
458 458
  connect(mActionHideAllLayers, SIGNAL(triggered()), this, SLOT(hideAllLayers()));
459 459
  //
460 460
  // Settings Menu Related Items
461 461
  //
462 462
  mActionProjectProperties= new QAction(QIcon(myIconPath+"/mActionProjectProperties.png"), tr("Project Properties..."), this);
463
  mActionProjectProperties->setShortcut(tr("Alt+P"));
463
  mActionProjectProperties->setShortcut(tr("P","Set project properties"));
464 464
  mActionProjectProperties->setStatusTip(tr("Set project properties"));
465 465
  connect(mActionProjectProperties, SIGNAL(triggered()), this, SLOT(projectProperties()));
466 466
  //
467 467
  mActionOptions= new QAction(QIcon(myIconPath+"/mActionOptions.png"), tr("Options..."), this);
468
  mActionOptions->setShortcut(tr("Alt+O"));
468
  // mActionOptions->setShortcut(tr("Alt+O","Change various QGIS options"));
469 469
  mActionOptions->setStatusTip(tr("Change various QGIS options"));
470 470
  connect(mActionOptions, SIGNAL(triggered()), this, SLOT(options()));
471 471
  //
472 472
  mActionCustomProjection= new QAction(QIcon(myIconPath+"/mActionCustomProjection.png"), tr("Custom Projection..."), this);
473
  mActionCustomProjection->setShortcut(tr("Alt+I"));
473
  // mActionCustomProjection->setShortcut(tr("Alt+I","Manage custom projections"));
474 474
  mActionCustomProjection->setStatusTip(tr("Manage custom projections"));
475 475
  connect(mActionCustomProjection, SIGNAL(triggered()), this, SLOT(customProjection()));
476 476
  //
477 477
  // Help Menu Related items
478 478
  //
479 479
  mActionHelpContents= new QAction(QIcon(myIconPath+"/mActionHelpContents.png"), tr("Help Contents"), this);
480
  mActionHelpContents->setShortcut(tr("F1"));
480
  mActionHelpContents->setShortcut(tr("F1","Help Documentation"));
481 481
  mActionHelpContents->setStatusTip(tr("Help Documentation"));
482 482
  connect(mActionHelpContents, SIGNAL(triggered()), this, SLOT(helpContents()));
483 483
  //
484 484
  mActionQgisHomePage= new QAction(QIcon(myIconPath+"/mActionQgisHomePage.png"), tr("Qgis Home Page"), this);
485
  mActionQgisHomePage->setShortcut(tr("Ctrl+H"));
485
  mActionQgisHomePage->setShortcut(tr("Ctrl+H","QGIS Home Page"));
486 486
  mActionQgisHomePage->setStatusTip(tr("QGIS Home Page"));
487 487
  connect(mActionQgisHomePage, SIGNAL(triggered()), this, SLOT(helpQgisHomePage()));
488 488
  //
489 489
  mActionQgisSourceForgePage= new QAction(QIcon(myIconPath+"/mActionQgisSourceForgePage.png"), tr("Qgis Sourceforge"), this);
490
  mActionQgisSourceForgePage->setShortcut(tr("Alt+H"));
490
  // mActionQgisSourceForgePage->setShortcut(tr("Alt+H","Visit QGIS SourceForge page"));
491 491
  mActionQgisSourceForgePage->setStatusTip(tr("Visit QGIS SourceForge page"));
492 492
  connect(mActionQgisSourceForgePage, SIGNAL(triggered()), this, SLOT(helpQgisSourceForge()));
493 493
  //
......
502 502
  // View Menu Items
503 503
  //
504 504
  mActionDraw= new QAction(QIcon(myIconPath+"/mActionDraw.png"), tr("Refresh"), this);
505
  mActionDraw->setShortcut(tr("Ctrl+R"));
505
  mActionDraw->setShortcut(tr("Ctrl+R","Refresh Map"));
506 506
  mActionDraw->setStatusTip(tr("Refresh Map"));
507 507
  connect(mActionDraw, SIGNAL(triggered()), this, SLOT(refreshMapCanvas()));
508 508
  //
509 509
  mActionZoomIn= new QAction(QIcon(myIconPath+"/mActionZoomIn.png"), tr("Zoom In"), this);
510
  mActionZoomIn->setShortcut(tr("z"));
510
  mActionZoomIn->setShortcut(tr("Ctrl++","Zoom In"));
511 511
  mActionZoomIn->setStatusTip(tr("Zoom In"));
512 512
  connect(mActionZoomIn, SIGNAL(triggered()), this, SLOT(zoomIn()));
513 513
  //
514 514
  mActionZoomOut= new QAction(QIcon(myIconPath+"/mActionZoomOut.png"), tr("Zoom Out"), this);
515
  mActionZoomOut->setShortcut(tr("Z"));
515
  mActionZoomOut->setShortcut(tr("Ctrl+-","Zoom Out"));
516 516
  mActionZoomOut->setStatusTip(tr("Zoom Out"));
517 517
  connect(mActionZoomOut, SIGNAL(triggered()), this, SLOT(zoomOut()));
518 518
  //
519 519
  mActionZoomFullExtent= new QAction(QIcon(myIconPath+"/mActionZoomFullExtent.png"), tr("Zoom Full"), this);
520
  mActionZoomFullExtent->setShortcut(tr("f"));
520
  mActionZoomFullExtent->setShortcut(tr("F","Zoom to Full Extents"));
521 521
  mActionZoomFullExtent->setStatusTip(tr("Zoom to Full Extents"));
522 522
  connect(mActionZoomFullExtent, SIGNAL(triggered()), this, SLOT(zoomFull()));
523 523
  //
524 524
  mActionZoomToSelected= new QAction(QIcon(myIconPath+"/mActionZoomToSelected.png"), tr("Zoom To Selection"), this);
525
  mActionZoomToSelected->setShortcut(tr("F"));
525
  mActionZoomToSelected->setShortcut(tr("Ctrl+F","Zoom to selection"));
526 526
  mActionZoomToSelected->setStatusTip(tr("Zoom to selection"));
527 527
  connect(mActionZoomToSelected, SIGNAL(triggered()), this, SLOT(zoomToSelected()));
528 528
  //
......
531 531
  connect(mActionPan, SIGNAL(triggered()), this, SLOT(pan()));
532 532
  //
533 533
  mActionZoomLast= new QAction(QIcon(myIconPath+"/mActionZoomLast.png"), tr("Zoom Last"), this);
534
  //mActionZoomLast->setShortcut(tr("Ctrl+O"));
534
  //mActionZoomLast->setShortcut(tr("Ctrl+O","Zoom to Last Extent"));
535 535
  mActionZoomLast->setStatusTip(tr("Zoom to Last Extent"));
536 536
  connect(mActionZoomLast, SIGNAL(triggered()), this, SLOT(zoomPrevious()));
537 537
  //
538 538
  mActionZoomToLayer= new QAction(QIcon(myIconPath+"/mActionZoomToLayer.png"), tr("Zoom To Layer"), this);
539
  //mActionZoomToLayer->setShortcut(tr("Ctrl+O"));
539
  //mActionZoomToLayer->setShortcut(tr("Ctrl+O","Zoom to Layer"));
540 540
  mActionZoomToLayer->setStatusTip(tr("Zoom to Layer"));
541 541
  connect(mActionZoomToLayer, SIGNAL(triggered()), this, SLOT(zoomToLayerExtent()));
542 542
  //
543 543
  mActionIdentify= new QAction(QIcon(myIconPath+"/mActionIdentify.png"), tr("Identify Features"), this);
544
  mActionIdentify->setShortcut(tr("I"));
544
  mActionIdentify->setShortcut(tr("I","Click on features to identify them"));
545 545
  mActionIdentify->setStatusTip(tr("Click on features to identify them"));
546 546
  connect(mActionIdentify, SIGNAL(triggered()), this, SLOT(identify()));
547 547
  //
......
550 550
  connect(mActionSelect, SIGNAL(triggered()), this, SLOT(select()));
551 551
  //
552 552
  mActionOpenTable= new QAction(QIcon(myIconPath+"/mActionOpenTable.png"), tr("Open Table"), this);
553
  //mActionOpenTable->setShortcut(tr("Ctrl+O"));
553
  //mActionOpenTable->setShortcut(tr("Ctrl+O","Open Table"));
554 554
  mActionOpenTable->setStatusTip(tr("Open Table"));
555 555
  connect(mActionOpenTable, SIGNAL(triggered()), this, SLOT(attributeTable()));
556 556
  //
557 557
  mActionMeasure= new QAction(QIcon(myIconPath+"/mActionMeasure.png"), tr("Measure Line "), this);
558
  mActionMeasure->setShortcut(tr("Ctrl+M"));
558
  mActionMeasure->setShortcut(tr("Ctrl+M","Measure a Line"));
559 559
  mActionMeasure->setStatusTip(tr("Measure a Line"));
560 560
  connect(mActionMeasure, SIGNAL(triggered()), this, SLOT(measure()));
561 561
  //
562 562
  mActionMeasureArea= new QAction(QIcon(myIconPath+"/mActionMeasureArea.png"), tr("Measure Area"), this);
563
  mActionMeasureArea->setShortcut(tr("Alt+M"));
563
  mActionMeasureArea->setShortcut(tr("Ctrl+J","Measure an Area"));
564 564
  mActionMeasureArea->setStatusTip(tr("Measure an Area"));
565 565
  connect(mActionMeasureArea, SIGNAL(triggered()), this, SLOT(measureArea()));
566 566
  //
567 567
  mActionShowBookmarks= new QAction(QIcon(myIconPath+"/mActionShowBookmarks.png"), tr("Show Bookmarks"), this);
568
  mActionShowBookmarks->setShortcut(tr("Ctrl+B"));
568
  mActionShowBookmarks->setShortcut(tr("B","Show Bookmarks"));
569 569
  mActionShowBookmarks->setStatusTip(tr("Show Bookmarks"));
570 570
  connect(mActionShowBookmarks, SIGNAL(triggered()), this, SLOT(showBookmarks()));
571 571
  //
572 572
  mActionNewBookmark= new QAction(QIcon(myIconPath+"/mActionNewBookmark.png"), tr("New Bookmark..."), this);
573
  mActionNewBookmark->setShortcut(tr("Alt+B"));
573
  mActionNewBookmark->setShortcut(tr("Ctrl+B","New Bookmark"));
574 574
  mActionNewBookmark->setStatusTip(tr("New Bookmark"));
575 575
  connect(mActionNewBookmark, SIGNAL(triggered()), this, SLOT(newBookmark()));
576 576
  //
577 577
  mActionAddWmsLayer= new QAction(QIcon(myIconPath+"/mActionAddWmsLayer.png"), tr("Add WMS Layer..."), this);
578
  mActionAddWmsLayer->setShortcut(tr("Ctrl+M"));
578
  mActionAddWmsLayer->setShortcut(tr("W","Add Web Mapping Server Layer"));
579 579
  mActionAddWmsLayer->setStatusTip(tr("Add Web Mapping Server Layer"));
580 580
  connect(mActionAddWmsLayer, SIGNAL(triggered()), this, SLOT(addWmsLayer()));
581 581
  //
582 582
  mActionInOverview= new QAction(QIcon(myIconPath+"/mActionInOverview.png"), tr("In Overview"), this);
583
  mActionInOverview->setShortcut(tr("Alt+O"));
583
  mActionInOverview->setShortcut(tr("O","Add current layer to overview map"));
584 584
  mActionInOverview->setStatusTip(tr("Add current layer to overview map"));
585 585
  connect(mActionInOverview, SIGNAL(triggered()), this, SLOT(inOverview()));
586 586
  //
587 587
  // Plugin Menu Related Items
588 588
  //
589 589
  mActionShowPluginManager= new QAction(QIcon(myIconPath+"/mActionShowPluginManager.png"), tr("Plugin Manager..."), this);
590
  mActionShowPluginManager->setShortcut(tr("Ctrl+P"));
590
  // mActionShowPluginManager->setShortcut(tr("Ctrl+P","Open the plugin manager"));
591 591
  mActionShowPluginManager->setStatusTip(tr("Open the plugin manager"));
592 592
  connect(mActionShowPluginManager, SIGNAL(triggered()), this, SLOT(showPluginManager()));
593 593
  //
......
598 598
  // Digitising Toolbar Items
599 599
  //
600 600
  mActionCapturePoint= new QAction(QIcon(myIconPath+"/mActionCapturePoint.png"), tr("Capture Point"), this);
601
  mActionCapturePoint->setShortcut(tr("."));
601
  mActionCapturePoint->setShortcut(tr(".","Capture Points"));
602 602
  mActionCapturePoint->setStatusTip(tr("Capture Points"));
603 603
  connect(mActionCapturePoint, SIGNAL(triggered()), this, SLOT(capturePoint()));
604 604
  //
605 605
  mActionCaptureLine= new QAction(QIcon(myIconPath+"/mActionCaptureLine.png"), tr("Capture Line"), this);
606
  mActionCaptureLine->setShortcut(tr("/"));
606
  mActionCaptureLine->setShortcut(tr("/","Capture Lines"));
607 607
  mActionCaptureLine->setStatusTip(tr("Capture Lines"));
608 608
  connect(mActionCaptureLine, SIGNAL(triggered()), this, SLOT(captureLine()));
609 609
  //
610 610
  mActionCapturePolygon= new QAction(QIcon(myIconPath+"/mActionCapturePolygon.png"), tr("Capture Polygon"), this);
611
  mActionCapturePolygon->setShortcut(tr("Ctrl+/"));
611
  mActionCapturePolygon->setShortcut(tr("Ctrl+/","Capture Polygons"));
612 612
  mActionCapturePolygon->setStatusTip(tr("Capture Polygons"));
613 613
  connect(mActionCapturePolygon, SIGNAL(triggered()), this, SLOT(capturePolygon()));
614 614
  //