more font propagation

qgis · Jan 25, 2012 · a30eb3738753ac7e97fec320763c447aa918eddf · a30eb37
1 parent ac44ace
commit a30eb3738753ac7e97fec320763c447aa918eddf
Unified Split

Showing with 16 additions and 20 deletions.

+1 −5 src/app/composer/qgscomposer.cpp

+1 −1 src/app/legend/qgslegend.cpp

+4 −4 src/app/qgisapp.cpp

+4 −4 src/app/qgsabout.cpp

+1 −1 src/app/qgsabout.h

+4 −4 src/app/qgssponsors.cpp

+1 −1 src/app/qgssponsors.h
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: