Consider themes for all composer items and change icon themes in composer together with application. Fixes bug #1438

mhugent · mhugent · commit 598a66f2bed0 · 2008-12-03T11:20:02.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9731 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -78,35 +78,16 @@ QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow()
   // mActionAddImage
   // mActionSelectMoveItem
 
-  QAction* moveItemContentAction = new QAction( QIcon( QPixmap( myIconPath + "mActionMoveItemContent.png" ) ),
-      tr( "Move Content" ), 0 );
-  moveItemContentAction->setToolTip( tr( "Move item content" ) );
-  moveItemContentAction->setCheckable( true );
-  connect( moveItemContentAction, SIGNAL( triggered() ), this, SLOT( moveItemContent() ) );
-  toolBar->addAction( moveItemContentAction );
-  //toolBar->addAction(QIcon(QPixmap(myIconPath+"mActionMoveItemContent.png")), tr("Move Item content"), this, SLOT(moveItemContent()));
-
-  QAction* groupItemsAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionGroupItems.png" ) ),
-                              tr( "&Group" ), this, SLOT( groupItems() ) );
-  groupItemsAction->setToolTip( tr( "Group items" ) );
-  QAction* ungroupItemsAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionUngroupItems.png" ) ),
-                                tr( "&Ungroup" ), this, SLOT( ungroupItems() ) );
-  ungroupItemsAction->setToolTip( tr( "Ungroup items" ) );
-  QAction* raiseItemsAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionRaiseItems.png" ) ),
-                              tr( "Raise" ), this, SLOT( raiseSelectedItems() ) );
-  raiseItemsAction->setToolTip( tr( "Raise selected items" ) );
-  QAction* lowerItemsAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionLowerItems.png" ) ),
-                              tr( "Lower" ), this, SLOT( lowerSelectedItems() ) );
-  lowerItemsAction->setToolTip( tr( "Lower selected items" ) );
-  QAction* moveItemsToTopAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionMoveItemsToTop.png" ) ),
-                                  tr( "Bring to Front" ), this, SLOT( moveSelectedItemsToTop() ) );
-  moveItemsToTopAction->setToolTip( tr( "Move selected items to top" ) );
-  QAction* moveItemsToBottomAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionMoveItemsToBottom.png" ) ),
-                                     tr( "Send to Back" ), this, SLOT( moveSelectedItemsToBottom() ) );
-  moveItemsToBottomAction->setToolTip( tr( "Move selected items to bottom" ) );
+  mActionMoveItemContent->setToolTip( tr( "Move item content" ) );
+  mActionGroupItems->setToolTip( tr( "Group items" ) );
+  mActionUngroupItems->setToolTip( tr( "Ungroup items" ) );
+  mActionRaiseItems->setToolTip( tr( "Raise selected items" ) );
+  mActionLowerItems->setToolTip( tr( "Lower selected items" ) );
+  mActionMoveItemsToTop->setToolTip( tr( "Move selected items to top" ) );
+  mActionMoveItemsToBottom->setToolTip( tr( "Move selected items to bottom" ) );
 
   QActionGroup* toggleActionGroup = new QActionGroup( this );
-  toggleActionGroup->addAction( moveItemContentAction );
+  toggleActionGroup->addAction( mActionMoveItemContent);
   toggleActionGroup->addAction( mActionAddNewMap );
   toggleActionGroup->addAction( mActionAddNewLabel );
   toggleActionGroup->addAction( mActionAddNewLegend );
@@ -124,6 +105,7 @@ QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow()
   mActionSelectMoveItem->setCheckable( true );
   mActionAddNewScalebar->setCheckable( true );
   mActionAddImage->setCheckable( true );
+  mActionMoveItemContent->setCheckable( true );
 
 #ifdef Q_WS_MAC
   QMenu *appMenu = menuBar()->addMenu( tr( "QGIS" ) );
@@ -257,6 +239,13 @@ void QgsComposer::setupTheme()
   mActionAddNewLegend->setIcon( QgisApp::getThemeIcon( "/mActionAddLegend.png" ) );
   mActionAddNewScalebar->setIcon( QgisApp::getThemeIcon( "/mActionScaleBar.png" ) );
   mActionSelectMoveItem->setIcon( QgisApp::getThemeIcon( "/mActionSelectPan.png" ) );
+  mActionMoveItemContent->setIcon( QgisApp::getThemeIcon("/mActionMoveItemContent.png"));
+  mActionGroupItems->setIcon( QgisApp::getThemeIcon("/mActionGroupItems.png"));
+  mActionUngroupItems->setIcon( QgisApp::getThemeIcon("/mActionUngroupItems.png"));
+  mActionRaiseItems->setIcon( QgisApp::getThemeIcon("/mActionRaiseItems.png"));
+  mActionLowerItems->setIcon( QgisApp::getThemeIcon("/mActionLowerItems.png"));
+  mActionMoveItemsToTop->setIcon( QgisApp::getThemeIcon("/mActionMoveItemsToTop.png"));
+  mActionMoveItemsToBottom->setIcon( QgisApp::getThemeIcon("/mActionMoveItemsToBottom.png"));
 }
 
 void QgsComposer::connectSlots()
@@ -740,55 +729,55 @@ void QgsComposer::on_mActionAddImage_activated( void )
   }
 }
 
-void QgsComposer::moveItemContent()
+void QgsComposer::on_mActionMoveItemContent_activated(void)
 {
   if ( mView )
   {
     mView->setCurrentTool( QgsComposerView::MoveItemContent );
   }
 }
 
-void QgsComposer::groupItems( void )
+void QgsComposer::on_mActionGroupItems_activated( void )
 {
   if ( mView )
   {
     mView->groupItems();
   }
 }
 
-void QgsComposer::ungroupItems( void )
+void QgsComposer::on_mActionUngroupItems_activated( void )
 {
   if ( mView )
   {
     mView->ungroupItems();
   }
 }
 
-void QgsComposer::raiseSelectedItems()
+void QgsComposer::on_mActionRaiseItems_activated( void )
 {
   if ( mComposition )
   {
     mComposition->raiseSelectedItems();
   }
 }
 
-void QgsComposer::lowerSelectedItems()
+void QgsComposer::on_mActionLowerItems_activated(void)
 {
   if ( mComposition )
   {
     mComposition->lowerSelectedItems();
   }
 }
 
-void QgsComposer::moveSelectedItemsToTop()
+void QgsComposer::on_mActionMoveItemsToTop_activated(void)
 {
   if ( mComposition )
   {
     mComposition->moveSelectedItemsToTop();
   }
 }
 
-void QgsComposer::moveSelectedItemsToBottom()
+void QgsComposer::on_mActionMoveItemsToBottom(void)
 {
   if ( mComposition )
   {
diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -50,6 +50,9 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     QgsComposer( QgisApp *qgis );
     ~QgsComposer();
 
+    //! Set the pixmap / icons on the toolbar buttons
+    void setupTheme();
+
     //! Open and show, set defaults if first time
     void open();
 
@@ -130,25 +133,25 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     void on_mActionAddImage_activated( void );
 
     //! Set tool to move item content
-    void moveItemContent();
+    void on_mActionMoveItemContent_activated(void);
 
     //! Group selected items
-    void groupItems( void );
+    void on_mActionGroupItems_activated( void );
 
     //! Ungroup selected item group
-    void ungroupItems( void );
+    void on_mActionUngroupItems_activated( void );
 
     //! Move selected items one position up
-    void raiseSelectedItems();
+    void on_mActionRaiseItems_activated(void);
 
     //!Move selected items one position down
-    void lowerSelectedItems();
+    void on_mActionLowerItems_activated(void);
 
     //!Move selected items to top
-    void moveSelectedItemsToTop();
+    void on_mActionMoveItemsToTop_activated(void);
 
     //!Move selected items to bottom
-    void moveSelectedItemsToBottom();
+    void on_mActionMoveItemsToBottom(void);
 
     //! Save window state
     void saveWindowState();
@@ -196,8 +199,7 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     void activate();
 
   private:
-    //! Set the pixmap / icons on the toolbar buttons
-    void setupTheme();
+
     /**Establishes the signal slot connection for the class*/
     void connectSlots();
 
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -304,6 +304,7 @@ QgisApp *QgisApp::smInstance = 0;
 QgisApp::QgisApp( QSplashScreen *splash, QWidget * parent, Qt::WFlags fl )
     : QMainWindow( parent, fl ),
     mSplash( splash ),
+    mComposer(0),
     mPythonConsole( NULL ),
     mPythonUtils( NULL )
 {
@@ -1480,6 +1481,11 @@ void QgisApp::setTheme( QString theThemeName )
   mActionCustomProjection->setIcon( getThemeIcon( "/mActionCustomProjection.png" ) );
   mActionAddWmsLayer->setIcon( getThemeIcon( "/mActionAddWmsLayer.png" ) );
   mActionAddToOverview->setIcon( getThemeIcon( "/mActionInOverview.png" ) );
+
+  if(mComposer)
+  {
+    mComposer->setupTheme();
+  }
 }
 
 void QgisApp::setupConnections()
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -245,6 +245,7 @@ void QgsOptions::themeChanged( const QString &newThemeName )
   QString newt = newThemeName;
   QgisApp::instance()->setTheme( newt );
 }
+
 QString QgsOptions::theme()
 {
   // returns the current theme (as selected in the cmbTheme combo box)
diff --git a/src/ui/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
+    <width>710</width>
     <height>609</height>
    </rect>
   </property>
@@ -244,6 +244,13 @@
    <addaction name="mActionAddNewLegend" />
    <addaction name="mActionAddNewScalebar" />
    <addaction name="mActionSelectMoveItem" />
+   <addaction name="mActionMoveItemContent" />
+   <addaction name="mActionGroupItems" />
+   <addaction name="mActionUngroupItems" />
+   <addaction name="mActionRaiseItems" />
+   <addaction name="mActionLowerItems" />
+   <addaction name="mActionMoveItemsToTop" />
+   <addaction name="mActionMoveItemsToBottom" />
   </widget>
   <action name="mActionPrint" >
    <property name="icon" >
@@ -367,6 +374,41 @@
     <string>Add Image</string>
    </property>
   </action>
+  <action name="mActionMoveItemContent" >
+   <property name="text" >
+    <string>moveItemContent</string>
+   </property>
+  </action>
+  <action name="mActionGroupItems" >
+   <property name="text" >
+    <string>Group Items</string>
+   </property>
+  </action>
+  <action name="mActionUngroupItems" >
+   <property name="text" >
+    <string>Ungroup</string>
+   </property>
+  </action>
+  <action name="mActionRaiseItems" >
+   <property name="text" >
+    <string>Raise</string>
+   </property>
+  </action>
+  <action name="mActionLowerItems" >
+   <property name="text" >
+    <string>Lower</string>
+   </property>
+  </action>
+  <action name="mActionMoveItemsToTop" >
+   <property name="text" >
+    <string>Bring to front</string>
+   </property>
+  </action>
+  <action name="mActionMoveItemsToBottom" >
+   <property name="text" >
+    <string>Send to back</string>
+   </property>
+  </action>
  </widget>
  <tabstops>
   <tabstop>mOptionsTabWidget</tabstop>

Original file line number	Diff line number	Diff line change
`@@ -78,35 +78,16 @@ QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow()`
`78`	`78`	`// mActionAddImage`
`79`	`79`	`// mActionSelectMoveItem`
`80`	`80`
`81`		`- QAction* moveItemContentAction = new QAction( QIcon( QPixmap( myIconPath + "mActionMoveItemContent.png" ) ),`
`82`		`- tr( "Move Content" ), 0 );`
`83`		`- moveItemContentAction->setToolTip( tr( "Move item content" ) );`
`84`		`- moveItemContentAction->setCheckable( true );`
`85`		`- connect( moveItemContentAction, SIGNAL( triggered() ), this, SLOT( moveItemContent() ) );`
`86`		`- toolBar->addAction( moveItemContentAction );`
`87`		`- //toolBar->addAction(QIcon(QPixmap(myIconPath+"mActionMoveItemContent.png")), tr("Move Item content"), this, SLOT(moveItemContent()));`
`88`		`-`
`89`		`- QAction* groupItemsAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionGroupItems.png" ) ),`
`90`		`- tr( "&Group" ), this, SLOT( groupItems() ) );`
`91`		`- groupItemsAction->setToolTip( tr( "Group items" ) );`
`92`		`- QAction* ungroupItemsAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionUngroupItems.png" ) ),`
`93`		`- tr( "&Ungroup" ), this, SLOT( ungroupItems() ) );`
`94`		`- ungroupItemsAction->setToolTip( tr( "Ungroup items" ) );`
`95`		`- QAction* raiseItemsAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionRaiseItems.png" ) ),`
`96`		`- tr( "Raise" ), this, SLOT( raiseSelectedItems() ) );`
`97`		`- raiseItemsAction->setToolTip( tr( "Raise selected items" ) );`
`98`		`- QAction* lowerItemsAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionLowerItems.png" ) ),`
`99`		`- tr( "Lower" ), this, SLOT( lowerSelectedItems() ) );`
`100`		`- lowerItemsAction->setToolTip( tr( "Lower selected items" ) );`
`101`		`- QAction* moveItemsToTopAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionMoveItemsToTop.png" ) ),`
`102`		`- tr( "Bring to Front" ), this, SLOT( moveSelectedItemsToTop() ) );`
`103`		`- moveItemsToTopAction->setToolTip( tr( "Move selected items to top" ) );`
`104`		`- QAction* moveItemsToBottomAction = toolBar->addAction( QIcon( QPixmap( myIconPath + "mActionMoveItemsToBottom.png" ) ),`
`105`		`- tr( "Send to Back" ), this, SLOT( moveSelectedItemsToBottom() ) );`
`106`		`- moveItemsToBottomAction->setToolTip( tr( "Move selected items to bottom" ) );`
	`81`	`+ mActionMoveItemContent->setToolTip( tr( "Move item content" ) );`
	`82`	`+ mActionGroupItems->setToolTip( tr( "Group items" ) );`
	`83`	`+ mActionUngroupItems->setToolTip( tr( "Ungroup items" ) );`
	`84`	`+ mActionRaiseItems->setToolTip( tr( "Raise selected items" ) );`
	`85`	`+ mActionLowerItems->setToolTip( tr( "Lower selected items" ) );`
	`86`	`+ mActionMoveItemsToTop->setToolTip( tr( "Move selected items to top" ) );`
	`87`	`+ mActionMoveItemsToBottom->setToolTip( tr( "Move selected items to bottom" ) );`
`107`	`88`
`108`	`89`	`QActionGroup* toggleActionGroup = new QActionGroup( this );`
`109`		`- toggleActionGroup->addAction( moveItemContentAction );`
	`90`	`+ toggleActionGroup->addAction( mActionMoveItemContent);`
`110`	`91`	`toggleActionGroup->addAction( mActionAddNewMap );`
`111`	`92`	`toggleActionGroup->addAction( mActionAddNewLabel );`
`112`	`93`	`toggleActionGroup->addAction( mActionAddNewLegend );`
`@@ -124,6 +105,7 @@ QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow()`
`124`	`105`	`mActionSelectMoveItem->setCheckable( true );`
`125`	`106`	`mActionAddNewScalebar->setCheckable( true );`
`126`	`107`	`mActionAddImage->setCheckable( true );`
	`108`	`+ mActionMoveItemContent->setCheckable( true );`
`127`	`109`
`128`	`110`	`#ifdef Q_WS_MAC`
`129`	`111`	`QMenu *appMenu = menuBar()->addMenu( tr( "QGIS" ) );`
`@@ -257,6 +239,13 @@ void QgsComposer::setupTheme()`
`257`	`239`	`mActionAddNewLegend->setIcon( QgisApp::getThemeIcon( "/mActionAddLegend.png" ) );`
`258`	`240`	`mActionAddNewScalebar->setIcon( QgisApp::getThemeIcon( "/mActionScaleBar.png" ) );`
`259`	`241`	`mActionSelectMoveItem->setIcon( QgisApp::getThemeIcon( "/mActionSelectPan.png" ) );`
	`242`	`+ mActionMoveItemContent->setIcon( QgisApp::getThemeIcon("/mActionMoveItemContent.png"));`
	`243`	`+ mActionGroupItems->setIcon( QgisApp::getThemeIcon("/mActionGroupItems.png"));`
	`244`	`+ mActionUngroupItems->setIcon( QgisApp::getThemeIcon("/mActionUngroupItems.png"));`
	`245`	`+ mActionRaiseItems->setIcon( QgisApp::getThemeIcon("/mActionRaiseItems.png"));`
	`246`	`+ mActionLowerItems->setIcon( QgisApp::getThemeIcon("/mActionLowerItems.png"));`
	`247`	`+ mActionMoveItemsToTop->setIcon( QgisApp::getThemeIcon("/mActionMoveItemsToTop.png"));`
	`248`	`+ mActionMoveItemsToBottom->setIcon( QgisApp::getThemeIcon("/mActionMoveItemsToBottom.png"));`
`260`	`249`	`}`
`261`	`250`
`262`	`251`	`void QgsComposer::connectSlots()`
`@@ -740,55 +729,55 @@ void QgsComposer::on_mActionAddImage_activated( void )`
`740`	`729`	`}`
`741`	`730`	`}`
`742`	`731`
`743`		`-void QgsComposer::moveItemContent()`
	`732`	`+void QgsComposer::on_mActionMoveItemContent_activated(void)`
`744`	`733`	`{`
`745`	`734`	`if ( mView )`
`746`	`735`	`{`
`747`	`736`	`mView->setCurrentTool( QgsComposerView::MoveItemContent );`
`748`	`737`	`}`
`749`	`738`	`}`
`750`	`739`
`751`		`-void QgsComposer::groupItems( void )`
	`740`	`+void QgsComposer::on_mActionGroupItems_activated( void )`
`752`	`741`	`{`
`753`	`742`	`if ( mView )`
`754`	`743`	`{`
`755`	`744`	`mView->groupItems();`
`756`	`745`	`}`
`757`	`746`	`}`
`758`	`747`
`759`		`-void QgsComposer::ungroupItems( void )`
	`748`	`+void QgsComposer::on_mActionUngroupItems_activated( void )`
`760`	`749`	`{`
`761`	`750`	`if ( mView )`
`762`	`751`	`{`
`763`	`752`	`mView->ungroupItems();`
`764`	`753`	`}`
`765`	`754`	`}`
`766`	`755`
`767`		`-void QgsComposer::raiseSelectedItems()`
	`756`	`+void QgsComposer::on_mActionRaiseItems_activated( void )`
`768`	`757`	`{`
`769`	`758`	`if ( mComposition )`
`770`	`759`	`{`
`771`	`760`	`mComposition->raiseSelectedItems();`
`772`	`761`	`}`
`773`	`762`	`}`
`774`	`763`
`775`		`-void QgsComposer::lowerSelectedItems()`
	`764`	`+void QgsComposer::on_mActionLowerItems_activated(void)`
`776`	`765`	`{`
`777`	`766`	`if ( mComposition )`
`778`	`767`	`{`
`779`	`768`	`mComposition->lowerSelectedItems();`
`780`	`769`	`}`
`781`	`770`	`}`
`782`	`771`
`783`		`-void QgsComposer::moveSelectedItemsToTop()`
	`772`	`+void QgsComposer::on_mActionMoveItemsToTop_activated(void)`
`784`	`773`	`{`
`785`	`774`	`if ( mComposition )`
`786`	`775`	`{`
`787`	`776`	`mComposition->moveSelectedItemsToTop();`
`788`	`777`	`}`
`789`	`778`	`}`
`790`	`779`
`791`		`-void QgsComposer::moveSelectedItemsToBottom()`
	`780`	`+void QgsComposer::on_mActionMoveItemsToBottom(void)`
`792`	`781`	`{`
`793`	`782`	`if ( mComposition )`
`794`	`783`	`{`
Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,7 @@ void QgsOptions::themeChanged( const QString &newThemeName )`
`245`	`245`	`QString newt = newThemeName;`
`246`	`246`	`QgisApp::instance()->setTheme( newt );`
`247`	`247`	`}`
	`248`	`+`
`248`	`249`	`QString QgsOptions::theme()`
`249`	`250`	`{`
`250`	`251`	`// returns the current theme (as selected in the cmbTheme combo box)`