more font propagation

jef-n · jef-n · commit a30eb3738753 · 2012-01-25T19:37:27.000+01:00
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -69,17 +69,13 @@
 #include <QPaintEngine>
 
 
-QgsComposer::QgsComposer( QgisApp *qgis, const QString& title ): QMainWindow(), mTitle( title ), mUndoView( 0 )
+QgsComposer::QgsComposer( QgisApp *qgis, const QString& title ): QMainWindow( qgis ), mTitle( title ), mUndoView( 0 )
 {
   setupUi( this );
   setWindowTitle( mTitle );
   setupTheme();
   QObject::connect( mButtonBox, SIGNAL( rejected() ), this, SLOT( close() ) );
 
-  QSettings settings;
-  int size = settings.value( "/IconSize", 24 ).toInt();
-  setIconSize( QSize( size, size ) );
-
   QToolButton* orderingToolButton = new QToolButton( this );
   orderingToolButton->setPopupMode( QToolButton::InstantPopup );
   orderingToolButton->setAutoRaise( true );
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -601,7 +601,7 @@ void QgsLegend::handleRightClickEvent( QTreeWidgetItem* item, const QPoint& posi
     return;
   }
 
-  QMenu theMenu;
+  QMenu theMenu( tr( "Legend context" ), this );
 
   QgsLegendItem* li = dynamic_cast<QgsLegendItem *>( item );
   if ( li )
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2034,7 +2034,7 @@ void QgisApp::restoreWindowState()
 ///////////// END OF GUI SETUP ROUTINES ///////////////
 void QgisApp::sponsors()
 {
-  QgsSponsors * sponsors = new QgsSponsors();
+  QgsSponsors * sponsors = new QgsSponsors( this );
   sponsors->show();
   sponsors->raise();
   sponsors->activateWindow();
@@ -2046,7 +2046,7 @@ void QgisApp::about()
   if ( !abt )
   {
     QApplication::setOverrideCursor( Qt::WaitCursor );
-    abt = new QgsAbout();
+    abt = new QgsAbout( this );
     QString versionString = "<html><body><div align='center'><table width='100%'>";
 
     versionString += "<tr>";
@@ -6986,7 +6986,7 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
     }
     else
     {
-      rlp = new QgsRasterLayerProperties( ml, mMapCanvas );
+      rlp = new QgsRasterLayerProperties( ml, mMapCanvas, this );
       connect( rlp, SIGNAL( refreshLegend( QString, bool ) ), mMapLegend, SLOT( refreshLayerSymbology( QString, bool ) ) );
     }
 
@@ -7004,7 +7004,7 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
     }
     else
     {
-      vlp = new QgsVectorLayerProperties( vlayer );
+      vlp = new QgsVectorLayerProperties( vlayer, this );
       connect( vlp, SIGNAL( refreshLegend( QString, bool ) ), mMapLegend, SLOT( refreshLayerSymbology( QString, bool ) ) );
     }
 
diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp
@@ -30,11 +30,11 @@
 std::map<QString, QPixmap> mugs;
 */
 #ifdef Q_OS_MACX
-QgsAbout::QgsAbout()
-    : QDialog( NULL, Qt::WindowSystemMenuHint )  // Modeless dialog with close button only
+QgsAbout::QgsAbout( QWidget *parent )
+    : QDialog( parent, Qt::WindowSystemMenuHint )  // Modeless dialog with close button only
 #else
-QgsAbout::QgsAbout()
-    : QDialog( NULL )  // Normal dialog in non Mac-OS
+QgsAbout::QgsAbout( QWidget *parent )
+    : QDialog( parent )  // Normal dialog in non Mac-OS
 #endif
 {
   setupUi( this );
diff --git a/src/app/qgsabout.h b/src/app/qgsabout.h
@@ -23,7 +23,7 @@ class QgsAbout : public QDialog, private Ui::QgsAbout
 {
     Q_OBJECT
   public:
-    QgsAbout();
+    QgsAbout( QWidget *parent );
     ~QgsAbout();
     void setVersion( QString v );
     static QString fileSystemSafe( QString string );
diff --git a/src/app/qgssponsors.cpp b/src/app/qgssponsors.cpp
@@ -21,11 +21,11 @@
 #include <QTextStream>
 
 #ifdef Q_OS_MACX
-QgsSponsors::QgsSponsors()
-    : QDialog( NULL, Qt::WindowSystemMenuHint )  // Modeless dialog with close button only
+QgsSponsors::QgsSponsors( QWidget *parent )
+    : QDialog( parent, Qt::WindowSystemMenuHint )  // Modeless dialog with close button only
 #else
-QgsSponsors::QgsSponsors()
-    : QDialog( NULL )  // Normal dialog in non Mac-OS
+QgsSponsors::QgsSponsors( QWidget *parent )
+    : QDialog( parent )  // Normal dialog in non Mac-OS
 #endif
 {
   setupUi( this );
diff --git a/src/app/qgssponsors.h b/src/app/qgssponsors.h
@@ -23,7 +23,7 @@ class QgsSponsors : public QDialog, private Ui::QgsSponsorsBase
 {
     Q_OBJECT
   public:
-    QgsSponsors();
+    QgsSponsors( QWidget *parent );
     ~QgsSponsors();
 
   private:

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ void QgsLegend::handleRightClickEvent( QTreeWidgetItem* item, const QPoint& posi`
`601`	`601`	`return;`
`602`	`602`	`}`
`603`	`603`
`604`		`- QMenu theMenu;`
	`604`	`+ QMenu theMenu( tr( "Legend context" ), this );`
`605`	`605`
`606`	`606`	`QgsLegendItem* li = dynamic_cast<QgsLegendItem *>( item );`
`607`	`607`	`if ( li )`
Original file line number	Diff line number	Diff line change
`@@ -2034,7 +2034,7 @@ void QgisApp::restoreWindowState()`
`2034`	`2034`	`///////////// END OF GUI SETUP ROUTINES ///////////////`
`2035`	`2035`	`void QgisApp::sponsors()`
`2036`	`2036`	`{`
`2037`		`- QgsSponsors * sponsors = new QgsSponsors();`
	`2037`	`+ QgsSponsors * sponsors = new QgsSponsors( this );`
`2038`	`2038`	`sponsors->show();`
`2039`	`2039`	`sponsors->raise();`
`2040`	`2040`	`sponsors->activateWindow();`
`@@ -2046,7 +2046,7 @@ void QgisApp::about()`
`2046`	`2046`	`if ( !abt )`
`2047`	`2047`	`{`
`2048`	`2048`	`QApplication::setOverrideCursor( Qt::WaitCursor );`
`2049`		`- abt = new QgsAbout();`
	`2049`	`+ abt = new QgsAbout( this );`
`2050`	`2050`	`QString versionString = "<html><body><div align='center'><table width='100%'>";`
`2051`	`2051`
`2052`	`2052`	`versionString += "<tr>";`
`@@ -6986,7 +6986,7 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )`
`6986`	`6986`	`}`
`6987`	`6987`	`else`
`6988`	`6988`	`{`
`6989`		`- rlp = new QgsRasterLayerProperties( ml, mMapCanvas );`
	`6989`	`+ rlp = new QgsRasterLayerProperties( ml, mMapCanvas, this );`
`6990`	`6990`	`connect( rlp, SIGNAL( refreshLegend( QString, bool ) ), mMapLegend, SLOT( refreshLayerSymbology( QString, bool ) ) );`
`6991`	`6991`	`}`
`6992`	`6992`
`@@ -7004,7 +7004,7 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )`
`7004`	`7004`	`}`
`7005`	`7005`	`else`
`7006`	`7006`	`{`
`7007`		`- vlp = new QgsVectorLayerProperties( vlayer );`
	`7007`	`+ vlp = new QgsVectorLayerProperties( vlayer, this );`
`7008`	`7008`	`connect( vlp, SIGNAL( refreshLegend( QString, bool ) ), mMapLegend, SLOT( refreshLayerSymbology( QString, bool ) ) );`
`7009`	`7009`	`}`
`7010`	`7010`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class QgsAbout : public QDialog, private Ui::QgsAbout`
`23`	`23`	`{`
`24`	`24`	`Q_OBJECT`
`25`	`25`	`public:`
`26`		`- QgsAbout();`
	`26`	`+ QgsAbout( QWidget *parent );`
`27`	`27`	`~QgsAbout();`
`28`	`28`	`void setVersion( QString v );`
`29`	`29`	`static QString fileSystemSafe( QString string );`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class QgsSponsors : public QDialog, private Ui::QgsSponsorsBase`
`23`	`23`	`{`
`24`	`24`	`Q_OBJECT`
`25`	`25`	`public:`
`26`		`- QgsSponsors();`
	`26`	`+ QgsSponsors( QWidget *parent );`
`27`	`27`	`~QgsSponsors();`
`28`	`28`
`29`	`29`	`private:`