@@ -400,36 +400,36 @@ void QgsComposer::zoomFull( void )
400
400
}
401
401
}
402
402
403
- void QgsComposer::on_mActionZoomAll_activated ( void )
403
+ void QgsComposer::on_mActionZoomAll_triggered ( )
404
404
{
405
405
zoomFull ();
406
406
mView ->update ();
407
407
emit zoomLevelChanged ();
408
408
}
409
409
410
- void QgsComposer::on_mActionZoomIn_activated ( void )
410
+ void QgsComposer::on_mActionZoomIn_triggered ( )
411
411
{
412
412
mView ->scale ( 2 , 2 );
413
413
mView ->update ();
414
414
emit zoomLevelChanged ();
415
415
}
416
416
417
- void QgsComposer::on_mActionZoomOut_activated ( void )
417
+ void QgsComposer::on_mActionZoomOut_triggered ( )
418
418
{
419
419
mView ->scale ( .5 , .5 );
420
420
mView ->update ();
421
421
emit zoomLevelChanged ();
422
422
}
423
423
424
- void QgsComposer::on_mActionRefreshView_activated ( void )
424
+ void QgsComposer::on_mActionRefreshView_triggered ( )
425
425
{
426
426
if ( mComposition )
427
427
{
428
428
mComposition ->update ();
429
429
}
430
430
}
431
431
432
- void QgsComposer::on_mActionPrint_activated ( void )
432
+ void QgsComposer::on_mActionPrint_triggered ( )
433
433
{
434
434
if ( !mComposition )
435
435
{
@@ -508,7 +508,7 @@ void QgsComposer::on_mActionPrint_activated( void )
508
508
}
509
509
}
510
510
511
- void QgsComposer::on_mActionExportAsImage_activated ( void )
511
+ void QgsComposer::on_mActionExportAsImage_triggered ( )
512
512
{
513
513
if ( containsWMSLayer () )
514
514
{
@@ -633,7 +633,7 @@ void QgsComposer::on_mActionExportAsImage_activated( void )
633
633
}
634
634
635
635
636
- void QgsComposer::on_mActionExportAsSVG_activated ( void )
636
+ void QgsComposer::on_mActionExportAsSVG_triggered ( )
637
637
{
638
638
if ( containsWMSLayer () )
639
639
{
@@ -718,55 +718,55 @@ void QgsComposer::on_mActionExportAsSVG_activated( void )
718
718
#endif
719
719
}
720
720
721
- void QgsComposer::on_mActionSelectMoveItem_activated ( void )
721
+ void QgsComposer::on_mActionSelectMoveItem_triggered ( )
722
722
{
723
723
if ( mView )
724
724
{
725
725
mView ->setCurrentTool ( QgsComposerView::Select );
726
726
}
727
727
}
728
728
729
- void QgsComposer::on_mActionAddNewMap_activated ( void )
729
+ void QgsComposer::on_mActionAddNewMap_triggered ( )
730
730
{
731
731
if ( mView )
732
732
{
733
733
mView ->setCurrentTool ( QgsComposerView::AddMap );
734
734
}
735
735
}
736
736
737
- void QgsComposer::on_mActionAddNewLegend_activated ( void )
737
+ void QgsComposer::on_mActionAddNewLegend_triggered ( )
738
738
{
739
739
if ( mView )
740
740
{
741
741
mView ->setCurrentTool ( QgsComposerView::AddLegend );
742
742
}
743
743
}
744
744
745
- void QgsComposer::on_mActionAddNewLabel_activated ( void )
745
+ void QgsComposer::on_mActionAddNewLabel_triggered ( )
746
746
{
747
747
if ( mView )
748
748
{
749
749
mView ->setCurrentTool ( QgsComposerView::AddLabel );
750
750
}
751
751
}
752
752
753
- void QgsComposer::on_mActionAddNewScalebar_activated ( void )
753
+ void QgsComposer::on_mActionAddNewScalebar_triggered ( )
754
754
{
755
755
if ( mView )
756
756
{
757
757
mView ->setCurrentTool ( QgsComposerView::AddScalebar );
758
758
}
759
759
}
760
760
761
- void QgsComposer::on_mActionAddImage_activated ( void )
761
+ void QgsComposer::on_mActionAddImage_triggered ( )
762
762
{
763
763
if ( mView )
764
764
{
765
765
mView ->setCurrentTool ( QgsComposerView::AddPicture );
766
766
}
767
767
}
768
768
769
- void QgsComposer::on_mActionSaveAsTemplate_activated ( void )
769
+ void QgsComposer::on_mActionSaveAsTemplate_triggered ( )
770
770
{
771
771
// show file dialog
772
772
QSettings settings;
@@ -801,7 +801,7 @@ void QgsComposer::on_mActionSaveAsTemplate_activated( void )
801
801
}
802
802
}
803
803
804
- void QgsComposer::on_mActionLoadFromTemplate_activated ( void )
804
+ void QgsComposer::on_mActionLoadFromTemplate_triggered ( )
805
805
{
806
806
QSettings settings;
807
807
QString openFileDir = settings.value ( " UI/lastComposerTemplateDir" , " " ).toString ();
@@ -835,103 +835,103 @@ void QgsComposer::on_mActionLoadFromTemplate_activated( void )
835
835
cleanupAfterTemplateRead ();
836
836
}
837
837
838
- void QgsComposer::on_mActionMoveItemContent_activated ( void )
838
+ void QgsComposer::on_mActionMoveItemContent_triggered ( )
839
839
{
840
840
if ( mView )
841
841
{
842
842
mView ->setCurrentTool ( QgsComposerView::MoveItemContent );
843
843
}
844
844
}
845
845
846
- void QgsComposer::on_mActionGroupItems_activated ( void )
846
+ void QgsComposer::on_mActionGroupItems_triggered ( )
847
847
{
848
848
if ( mView )
849
849
{
850
850
mView ->groupItems ();
851
851
}
852
852
}
853
853
854
- void QgsComposer::on_mActionUngroupItems_activated ( void )
854
+ void QgsComposer::on_mActionUngroupItems_triggered ( )
855
855
{
856
856
if ( mView )
857
857
{
858
858
mView ->ungroupItems ();
859
859
}
860
860
}
861
861
862
- void QgsComposer::on_mActionRaiseItems_activated ( void )
862
+ void QgsComposer::on_mActionRaiseItems_triggered ( )
863
863
{
864
864
if ( mComposition )
865
865
{
866
866
mComposition ->raiseSelectedItems ();
867
867
}
868
868
}
869
869
870
- void QgsComposer::on_mActionLowerItems_activated ( void )
870
+ void QgsComposer::on_mActionLowerItems_triggered ( )
871
871
{
872
872
if ( mComposition )
873
873
{
874
874
mComposition ->lowerSelectedItems ();
875
875
}
876
876
}
877
877
878
- void QgsComposer::on_mActionMoveItemsToTop_activated ( void )
878
+ void QgsComposer::on_mActionMoveItemsToTop_triggered ( )
879
879
{
880
880
if ( mComposition )
881
881
{
882
882
mComposition ->moveSelectedItemsToTop ();
883
883
}
884
884
}
885
885
886
- void QgsComposer::on_mActionMoveItemsToBottom_activated ( void )
886
+ void QgsComposer::on_mActionMoveItemsToBottom_triggered ( )
887
887
{
888
888
if ( mComposition )
889
889
{
890
890
mComposition ->moveSelectedItemsToBottom ();
891
891
}
892
892
}
893
893
894
- void QgsComposer::on_mActionAlignLeft_activated ( void )
894
+ void QgsComposer::on_mActionAlignLeft_triggered ( )
895
895
{
896
896
if ( mComposition )
897
897
{
898
898
mComposition ->alignSelectedItemsLeft ();
899
899
}
900
900
}
901
901
902
- void QgsComposer::on_mActionAlignHCenter_activated ( void )
902
+ void QgsComposer::on_mActionAlignHCenter_triggered ( )
903
903
{
904
904
if ( mComposition )
905
905
{
906
906
mComposition ->alignSelectedItemsHCenter ();
907
907
}
908
908
}
909
909
910
- void QgsComposer::on_mActionAlignRight_activated ( void )
910
+ void QgsComposer::on_mActionAlignRight_triggered ( )
911
911
{
912
912
if ( mComposition )
913
913
{
914
914
mComposition ->alignSelectedItemsRight ();
915
915
}
916
916
}
917
917
918
- void QgsComposer::on_mActionAlignTop_activated ( void )
918
+ void QgsComposer::on_mActionAlignTop_triggered ( )
919
919
{
920
920
if ( mComposition )
921
921
{
922
922
mComposition ->alignSelectedItemsTop ();
923
923
}
924
924
}
925
925
926
- void QgsComposer::on_mActionAlignVCenter_activated ( void )
926
+ void QgsComposer::on_mActionAlignVCenter_triggered ( )
927
927
{
928
928
if ( mComposition )
929
929
{
930
930
mComposition ->alignSelectedItemsVCenter ();
931
931
}
932
932
}
933
933
934
- void QgsComposer::on_mActionAlignBottom_activated ( void )
934
+ void QgsComposer::on_mActionAlignBottom_triggered ( )
935
935
{
936
936
if ( mComposition )
937
937
{
@@ -1231,7 +1231,7 @@ void QgsComposer::deleteItem( QgsComposerItem* item )
1231
1231
void QgsComposer::setSelectionTool ()
1232
1232
{
1233
1233
mActionSelectMoveItem ->setChecked ( true );
1234
- on_mActionSelectMoveItem_activated ();
1234
+ on_mActionSelectMoveItem_triggered ();
1235
1235
}
1236
1236
1237
1237
bool QgsComposer::containsWMSLayer () const
0 commit comments