Skip to content
Permalink
Browse files

Replaced activated signal with triggered signal in composer to get ri…

…d of qt3 support issues

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10985 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent
mhugent committed Jun 26, 2009
1 parent cb90ab4 commit 437154846752332ce9e27b9951b8e331be0ccee7
Showing with 57 additions and 57 deletions.
  1. +29 −29 src/app/composer/qgscomposer.cpp
  2. +28 −28 src/app/composer/qgscomposer.h
@@ -400,36 +400,36 @@ void QgsComposer::zoomFull( void )
}
}

void QgsComposer::on_mActionZoomAll_activated( void )
void QgsComposer::on_mActionZoomAll_triggered()
{
zoomFull();
mView->update();
emit zoomLevelChanged();
}

void QgsComposer::on_mActionZoomIn_activated( void )
void QgsComposer::on_mActionZoomIn_triggered()
{
mView->scale( 2, 2 );
mView->update();
emit zoomLevelChanged();
}

void QgsComposer::on_mActionZoomOut_activated( void )
void QgsComposer::on_mActionZoomOut_triggered()
{
mView->scale( .5, .5 );
mView->update();
emit zoomLevelChanged();
}

void QgsComposer::on_mActionRefreshView_activated( void )
void QgsComposer::on_mActionRefreshView_triggered()
{
if ( mComposition )
{
mComposition->update();
}
}

void QgsComposer::on_mActionPrint_activated( void )
void QgsComposer::on_mActionPrint_triggered()
{
if ( !mComposition )
{
@@ -508,7 +508,7 @@ void QgsComposer::on_mActionPrint_activated( void )
}
}

void QgsComposer::on_mActionExportAsImage_activated( void )
void QgsComposer::on_mActionExportAsImage_triggered()
{
if ( containsWMSLayer() )
{
@@ -633,7 +633,7 @@ void QgsComposer::on_mActionExportAsImage_activated( void )
}


void QgsComposer::on_mActionExportAsSVG_activated( void )
void QgsComposer::on_mActionExportAsSVG_triggered()
{
if ( containsWMSLayer() )
{
@@ -718,55 +718,55 @@ void QgsComposer::on_mActionExportAsSVG_activated( void )
#endif
}

void QgsComposer::on_mActionSelectMoveItem_activated( void )
void QgsComposer::on_mActionSelectMoveItem_triggered()
{
if ( mView )
{
mView->setCurrentTool( QgsComposerView::Select );
}
}

void QgsComposer::on_mActionAddNewMap_activated( void )
void QgsComposer::on_mActionAddNewMap_triggered()
{
if ( mView )
{
mView->setCurrentTool( QgsComposerView::AddMap );
}
}

void QgsComposer::on_mActionAddNewLegend_activated( void )
void QgsComposer::on_mActionAddNewLegend_triggered()
{
if ( mView )
{
mView->setCurrentTool( QgsComposerView::AddLegend );
}
}

void QgsComposer::on_mActionAddNewLabel_activated( void )
void QgsComposer::on_mActionAddNewLabel_triggered()
{
if ( mView )
{
mView->setCurrentTool( QgsComposerView::AddLabel );
}
}

void QgsComposer::on_mActionAddNewScalebar_activated( void )
void QgsComposer::on_mActionAddNewScalebar_triggered()
{
if ( mView )
{
mView->setCurrentTool( QgsComposerView::AddScalebar );
}
}

void QgsComposer::on_mActionAddImage_activated( void )
void QgsComposer::on_mActionAddImage_triggered()
{
if ( mView )
{
mView->setCurrentTool( QgsComposerView::AddPicture );
}
}

void QgsComposer::on_mActionSaveAsTemplate_activated( void )
void QgsComposer::on_mActionSaveAsTemplate_triggered()
{
//show file dialog
QSettings settings;
@@ -801,7 +801,7 @@ void QgsComposer::on_mActionSaveAsTemplate_activated( void )
}
}

void QgsComposer::on_mActionLoadFromTemplate_activated( void )
void QgsComposer::on_mActionLoadFromTemplate_triggered()
{
QSettings settings;
QString openFileDir = settings.value( "UI/lastComposerTemplateDir", "" ).toString();
@@ -835,103 +835,103 @@ void QgsComposer::on_mActionLoadFromTemplate_activated( void )
cleanupAfterTemplateRead();
}

void QgsComposer::on_mActionMoveItemContent_activated( void )
void QgsComposer::on_mActionMoveItemContent_triggered()
{
if ( mView )
{
mView->setCurrentTool( QgsComposerView::MoveItemContent );
}
}

void QgsComposer::on_mActionGroupItems_activated( void )
void QgsComposer::on_mActionGroupItems_triggered()
{
if ( mView )
{
mView->groupItems();
}
}

void QgsComposer::on_mActionUngroupItems_activated( void )
void QgsComposer::on_mActionUngroupItems_triggered()
{
if ( mView )
{
mView->ungroupItems();
}
}

void QgsComposer::on_mActionRaiseItems_activated( void )
void QgsComposer::on_mActionRaiseItems_triggered()
{
if ( mComposition )
{
mComposition->raiseSelectedItems();
}
}

void QgsComposer::on_mActionLowerItems_activated( void )
void QgsComposer::on_mActionLowerItems_triggered()
{
if ( mComposition )
{
mComposition->lowerSelectedItems();
}
}

void QgsComposer::on_mActionMoveItemsToTop_activated( void )
void QgsComposer::on_mActionMoveItemsToTop_triggered()
{
if ( mComposition )
{
mComposition->moveSelectedItemsToTop();
}
}

void QgsComposer::on_mActionMoveItemsToBottom_activated( void )
void QgsComposer::on_mActionMoveItemsToBottom_triggered()
{
if ( mComposition )
{
mComposition->moveSelectedItemsToBottom();
}
}

void QgsComposer::on_mActionAlignLeft_activated( void )
void QgsComposer::on_mActionAlignLeft_triggered()
{
if ( mComposition )
{
mComposition->alignSelectedItemsLeft();
}
}

void QgsComposer::on_mActionAlignHCenter_activated( void )
void QgsComposer::on_mActionAlignHCenter_triggered()
{
if ( mComposition )
{
mComposition->alignSelectedItemsHCenter();
}
}

void QgsComposer::on_mActionAlignRight_activated( void )
void QgsComposer::on_mActionAlignRight_triggered()
{
if ( mComposition )
{
mComposition->alignSelectedItemsRight();
}
}

void QgsComposer::on_mActionAlignTop_activated( void )
void QgsComposer::on_mActionAlignTop_triggered()
{
if ( mComposition )
{
mComposition->alignSelectedItemsTop();
}
}

void QgsComposer::on_mActionAlignVCenter_activated( void )
void QgsComposer::on_mActionAlignVCenter_triggered()
{
if ( mComposition )
{
mComposition->alignSelectedItemsVCenter();
}
}

void QgsComposer::on_mActionAlignBottom_activated( void )
void QgsComposer::on_mActionAlignBottom_triggered()
{
if ( mComposition )
{
@@ -1231,7 +1231,7 @@ void QgsComposer::deleteItem( QgsComposerItem* item )
void QgsComposer::setSelectionTool()
{
mActionSelectMoveItem->setChecked( true );
on_mActionSelectMoveItem_activated();
on_mActionSelectMoveItem_triggered();
}

bool QgsComposer::containsWMSLayer() const
@@ -99,87 +99,87 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase

public slots:
//! Zoom to full extent of the paper
void on_mActionZoomAll_activated( void );
void on_mActionZoomAll_triggered();

//! Zoom in
void on_mActionZoomIn_activated( void );
void on_mActionZoomIn_triggered();

//! Zoom out
void on_mActionZoomOut_activated( void );
void on_mActionZoomOut_triggered();

//! Refresh view
void on_mActionRefreshView_activated( void );
void on_mActionRefreshView_triggered();

//! Print the composition
void on_mActionPrint_activated( void );
void on_mActionPrint_triggered();

//! Print as image
void on_mActionExportAsImage_activated( void );
void on_mActionExportAsImage_triggered();

//! Print as SVG
void on_mActionExportAsSVG_activated( void );
void on_mActionExportAsSVG_triggered();

//! Select item
void on_mActionSelectMoveItem_activated( void );
void on_mActionSelectMoveItem_triggered();

//! Add new map
void on_mActionAddNewMap_activated( void );
void on_mActionAddNewMap_triggered();

//! Add new legend
void on_mActionAddNewLegend_activated( void );
void on_mActionAddNewLegend_triggered();

//! Add new label
void on_mActionAddNewLabel_activated( void );
void on_mActionAddNewLabel_triggered();

//! Add new scalebar
void on_mActionAddNewScalebar_activated( void );
void on_mActionAddNewScalebar_triggered();

//! Add new picture
void on_mActionAddImage_activated( void );
void on_mActionAddImage_triggered();

//! Save composer as template
void on_mActionSaveAsTemplate_activated( void );
void on_mActionSaveAsTemplate_triggered();

void on_mActionLoadFromTemplate_activated( void );
void on_mActionLoadFromTemplate_triggered();

//! Set tool to move item content
void on_mActionMoveItemContent_activated( void );
void on_mActionMoveItemContent_triggered();

//! Group selected items
void on_mActionGroupItems_activated( void );
void on_mActionGroupItems_triggered();

//! Ungroup selected item group
void on_mActionUngroupItems_activated( void );
void on_mActionUngroupItems_triggered();

//! Move selected items one position up
void on_mActionRaiseItems_activated( void );
void on_mActionRaiseItems_triggered();

//!Move selected items one position down
void on_mActionLowerItems_activated( void );
void on_mActionLowerItems_triggered();

//!Move selected items to top
void on_mActionMoveItemsToTop_activated( void );
void on_mActionMoveItemsToTop_triggered();

//!Move selected items to bottom
void on_mActionMoveItemsToBottom_activated( void );
void on_mActionMoveItemsToBottom_triggered();

//!Align selected composer items left
void on_mActionAlignLeft_activated( void );
void on_mActionAlignLeft_triggered();

//!Align selected composere items horizontally centered
void on_mActionAlignHCenter_activated( void );
void on_mActionAlignHCenter_triggered();

//!Align selected composer items right
void on_mActionAlignRight_activated( void );
void on_mActionAlignRight_triggered();

//!Align selected composer items to top
void on_mActionAlignTop_activated( void );
void on_mActionAlignTop_triggered();

//!Align selected composer items vertically centered
void on_mActionAlignVCenter_activated( void );
void on_mActionAlignVCenter_triggered();

//!Align selected composer items to bottom
void on_mActionAlignBottom_activated( void );
void on_mActionAlignBottom_triggered();

//! Save window state
void saveWindowState();

0 comments on commit 4371548

Please sign in to comment.
You can’t perform that action at this time.