Skip to content

Commit a30eb37

Browse files
committed
more font propagation
1 parent ac44ace commit a30eb37

File tree

7 files changed

+16
-20
lines changed

7 files changed

+16
-20
lines changed

src/app/composer/qgscomposer.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,13 @@
6969
#include <QPaintEngine>
7070

7171

72-
QgsComposer::QgsComposer( QgisApp *qgis, const QString& title ): QMainWindow(), mTitle( title ), mUndoView( 0 )
72+
QgsComposer::QgsComposer( QgisApp *qgis, const QString& title ): QMainWindow( qgis ), mTitle( title ), mUndoView( 0 )
7373
{
7474
setupUi( this );
7575
setWindowTitle( mTitle );
7676
setupTheme();
7777
QObject::connect( mButtonBox, SIGNAL( rejected() ), this, SLOT( close() ) );
7878

79-
QSettings settings;
80-
int size = settings.value( "/IconSize", 24 ).toInt();
81-
setIconSize( QSize( size, size ) );
82-
8379
QToolButton* orderingToolButton = new QToolButton( this );
8480
orderingToolButton->setPopupMode( QToolButton::InstantPopup );
8581
orderingToolButton->setAutoRaise( true );

src/app/legend/qgslegend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ void QgsLegend::handleRightClickEvent( QTreeWidgetItem* item, const QPoint& posi
601601
return;
602602
}
603603

604-
QMenu theMenu;
604+
QMenu theMenu( tr( "Legend context" ), this );
605605

606606
QgsLegendItem* li = dynamic_cast<QgsLegendItem *>( item );
607607
if ( li )

src/app/qgisapp.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2034,7 +2034,7 @@ void QgisApp::restoreWindowState()
20342034
///////////// END OF GUI SETUP ROUTINES ///////////////
20352035
void QgisApp::sponsors()
20362036
{
2037-
QgsSponsors * sponsors = new QgsSponsors();
2037+
QgsSponsors * sponsors = new QgsSponsors( this );
20382038
sponsors->show();
20392039
sponsors->raise();
20402040
sponsors->activateWindow();
@@ -2046,7 +2046,7 @@ void QgisApp::about()
20462046
if ( !abt )
20472047
{
20482048
QApplication::setOverrideCursor( Qt::WaitCursor );
2049-
abt = new QgsAbout();
2049+
abt = new QgsAbout( this );
20502050
QString versionString = "<html><body><div align='center'><table width='100%'>";
20512051

20522052
versionString += "<tr>";
@@ -6986,7 +6986,7 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
69866986
}
69876987
else
69886988
{
6989-
rlp = new QgsRasterLayerProperties( ml, mMapCanvas );
6989+
rlp = new QgsRasterLayerProperties( ml, mMapCanvas, this );
69906990
connect( rlp, SIGNAL( refreshLegend( QString, bool ) ), mMapLegend, SLOT( refreshLayerSymbology( QString, bool ) ) );
69916991
}
69926992

@@ -7004,7 +7004,7 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
70047004
}
70057005
else
70067006
{
7007-
vlp = new QgsVectorLayerProperties( vlayer );
7007+
vlp = new QgsVectorLayerProperties( vlayer, this );
70087008
connect( vlp, SIGNAL( refreshLegend( QString, bool ) ), mMapLegend, SLOT( refreshLayerSymbology( QString, bool ) ) );
70097009
}
70107010

src/app/qgsabout.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
std::map<QString, QPixmap> mugs;
3131
*/
3232
#ifdef Q_OS_MACX
33-
QgsAbout::QgsAbout()
34-
: QDialog( NULL, Qt::WindowSystemMenuHint ) // Modeless dialog with close button only
33+
QgsAbout::QgsAbout( QWidget *parent )
34+
: QDialog( parent, Qt::WindowSystemMenuHint ) // Modeless dialog with close button only
3535
#else
36-
QgsAbout::QgsAbout()
37-
: QDialog( NULL ) // Normal dialog in non Mac-OS
36+
QgsAbout::QgsAbout( QWidget *parent )
37+
: QDialog( parent ) // Normal dialog in non Mac-OS
3838
#endif
3939
{
4040
setupUi( this );

src/app/qgsabout.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class QgsAbout : public QDialog, private Ui::QgsAbout
2323
{
2424
Q_OBJECT
2525
public:
26-
QgsAbout();
26+
QgsAbout( QWidget *parent );
2727
~QgsAbout();
2828
void setVersion( QString v );
2929
static QString fileSystemSafe( QString string );

src/app/qgssponsors.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
#include <QTextStream>
2222

2323
#ifdef Q_OS_MACX
24-
QgsSponsors::QgsSponsors()
25-
: QDialog( NULL, Qt::WindowSystemMenuHint ) // Modeless dialog with close button only
24+
QgsSponsors::QgsSponsors( QWidget *parent )
25+
: QDialog( parent, Qt::WindowSystemMenuHint ) // Modeless dialog with close button only
2626
#else
27-
QgsSponsors::QgsSponsors()
28-
: QDialog( NULL ) // Normal dialog in non Mac-OS
27+
QgsSponsors::QgsSponsors( QWidget *parent )
28+
: QDialog( parent ) // Normal dialog in non Mac-OS
2929
#endif
3030
{
3131
setupUi( this );

src/app/qgssponsors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class QgsSponsors : public QDialog, private Ui::QgsSponsorsBase
2323
{
2424
Q_OBJECT
2525
public:
26-
QgsSponsors();
26+
QgsSponsors( QWidget *parent );
2727
~QgsSponsors();
2828

2929
private:

0 commit comments

Comments
 (0)