Skip to content

Commit ac44ace

Browse files
jef-njef-n
committed
set parents of various objects to propagate the font settings
1 parent 87ae8a3 commit ac44ace

File tree

6 files changed

+31
-31
lines changed

6 files changed

+31
-31
lines changed

‎src/app/qgisapp.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,9 +1052,9 @@ void QgisApp::createMenus()
10521052
*/
10531053

10541054
// Panel and Toolbar Submenus
1055-
mPanelMenu = new QMenu( tr( "Panels" ) );
1055+
mPanelMenu = new QMenu( tr( "Panels" ), this );
10561056
mPanelMenu->setObjectName( "mPanelMenu" );
1057-
mToolbarMenu = new QMenu( tr( "Toolbars" ) );
1057+
mToolbarMenu = new QMenu( tr( "Toolbars" ), this );
10581058
mToolbarMenu->setObjectName( "mToolbarMenu" );
10591059

10601060
// Get platform for menu layout customization (Gnome, Kde, Mac, Win)
@@ -1109,13 +1109,13 @@ void QgisApp::createMenus()
11091109

11101110
// Database Menu
11111111
// don't add it yet, wait for a plugin
1112-
mDatabaseMenu = new QMenu( tr( "&Database" ) );
1112+
mDatabaseMenu = new QMenu( tr( "&Database" ), this );
11131113
// Vector Menu
11141114
// don't add it yet, wait for a plugin
1115-
mVectorMenu = new QMenu( tr( "Vect&or" ) );
1115+
mVectorMenu = new QMenu( tr( "Vect&or" ), this );
11161116
// Web Menu
11171117
// don't add it yet, wait for a plugin
1118-
mWebMenu = new QMenu( tr( "&Web" ) );
1118+
mWebMenu = new QMenu( tr( "&Web" ), this );
11191119

11201120
// Help menu
11211121
// add What's this button to it
@@ -2665,7 +2665,7 @@ void QgisApp::newSpatialiteLayer()
26652665

26662666
void QgisApp::showRasterCalculator()
26672667
{
2668-
QgsRasterCalcDialog d;
2668+
QgsRasterCalcDialog d( this );
26692669
if ( d.exec() == QDialog::Accepted )
26702670
{
26712671
//invoke analysis library
@@ -4329,7 +4329,7 @@ bool QgisApp::toggleEditing( QgsMapLayer *layer, bool allowCancel )
43294329

43304330
if ( !vlayer->isEditable() && !vlayer->isReadOnly() )
43314331
{
4332-
if ( !(vlayer->dataProvider()->capabilities() & QgsVectorDataProvider::EditingCapabilities ) )
4332+
if ( !( vlayer->dataProvider()->capabilities() & QgsVectorDataProvider::EditingCapabilities ) )
43334333
{
43344334
QMessageBox::information( 0, tr( "Start editing failed" ), tr( "Provider cannot be opened for editing" ) );
43354335
return false;
@@ -4342,7 +4342,7 @@ bool QgisApp::toggleEditing( QgsMapLayer *layer, bool allowCancel )
43424342
bool markSelectedOnly = settings.value( "/qgis/digitizing/marker_only_for_selected", false ).toBool();
43434343

43444344
// redraw only if markers will be drawn
4345-
if( ( !markSelectedOnly || vlayer->selectedFeatureCount() > 0 ) &&
4345+
if (( !markSelectedOnly || vlayer->selectedFeatureCount() > 0 ) &&
43464346
( markerType == "Cross" || markerType == "SemiTransparentCircle" ) )
43474347
{
43484348
vlayer->triggerRepaint();
@@ -4857,7 +4857,7 @@ void QgisApp::configureShortcuts()
48574857

48584858
void QgisApp::customize()
48594859
{
4860-
QgsCustomization::instance()->openDialog();
4860+
QgsCustomization::instance()->openDialog( this );
48614861
}
48624862

48634863

‎src/app/qgscustomization.cpp

100644100755
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
#include <QMetaObject>
3838

3939
#ifdef Q_OS_MACX
40-
QgsCustomizationDialog::QgsCustomizationDialog()
41-
: QMainWindow( NULL, Qt::WindowSystemMenuHint ) // Modeless dialog with close button only
40+
QgsCustomizationDialog::QgsCustomizationDialog( QWidget *parent )
41+
: QMainWindow( parent, Qt::WindowSystemMenuHint ) // Modeless dialog with close button only
4242
, mSettings( "QuantumGIS", "QGISCUSTOMIZATION" )
4343
#else
44-
QgsCustomizationDialog::QgsCustomizationDialog()
45-
: QMainWindow( NULL )
44+
QgsCustomizationDialog::QgsCustomizationDialog( QWidget *parent )
45+
: QMainWindow( parent )
4646
, mSettings( "QuantumGIS", "QGISCUSTOMIZATION" )
4747
#endif
4848
{
@@ -597,11 +597,11 @@ QgsCustomization *QgsCustomization::instance()
597597
return pinstance;
598598
}
599599

600-
QgsCustomization::QgsCustomization( ) :
601-
pDialog( 0 ),
602-
mEnabled( true ),
603-
mStatusPath( "/Customization/status" ),
604-
mSettings( "QuantumGIS", "QGISCUSTOMIZATION" )
600+
QgsCustomization::QgsCustomization()
601+
: pDialog( 0 )
602+
, mEnabled( true )
603+
, mStatusPath( "/Customization/status" )
604+
, mSettings( "QuantumGIS", "QGISCUSTOMIZATION" )
605605
{
606606
QgsDebugMsg( "Entered" );
607607
}
@@ -756,12 +756,12 @@ void QgsCustomization::updateMenu( QMenu* menu, QSettings& settings )
756756
settings.endGroup();
757757
}
758758

759-
void QgsCustomization::openDialog()
759+
void QgsCustomization::openDialog( QWidget *parent )
760760
{
761761
QgsDebugMsg( "Entered" );
762762
if ( !pDialog )
763763
{
764-
pDialog = new QgsCustomizationDialog();
764+
pDialog = new QgsCustomizationDialog( parent );
765765
}
766766

767767
// I am trying too enable switching widget status by clicking in main app, so I need non modal

‎src/app/qgscustomization.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class QgsCustomizationDialog : public QMainWindow, private Ui::QgsCustomizationD
3434
{
3535
Q_OBJECT
3636
public:
37-
QgsCustomizationDialog();
37+
QgsCustomizationDialog( QWidget *parent );
3838
~QgsCustomizationDialog();
3939

4040
// get item by path
@@ -113,7 +113,7 @@ class QgsCustomization : public QObject
113113
//! Returns the instance pointer, creating the object on the first call
114114
static QgsCustomization* instance();
115115

116-
void openDialog();
116+
void openDialog( QWidget *parent );
117117
static void customizeWidget( QWidget * widget, QEvent * event );
118118
static void customizeWidget( QString path, QWidget * widget );
119119
static void removeFromLayout( QLayout *theLayout, QWidget * widget );

‎src/plugins/interpolation/qgsinterpolationdialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,11 +358,11 @@ void QgsInterpolationDialog::on_mInterpolationMethodComboBox_currentIndexChanged
358358
delete mInterpolatorDialog;
359359
if ( text == tr( "Inverse Distance Weighting (IDW)" ) )
360360
{
361-
mInterpolatorDialog = new QgsIDWInterpolatorDialog( 0, mIface );
361+
mInterpolatorDialog = new QgsIDWInterpolatorDialog( this, mIface );
362362
}
363363
else if ( text == tr( "Triangular interpolation (TIN)" ) )
364364
{
365-
mInterpolatorDialog = new QgsTINInterpolatorDialog( 0, mIface );
365+
mInterpolatorDialog = new QgsTINInterpolatorDialog( this, mIface );
366366
}
367367
}
368368

‎src/plugins/interpolation/qgsinterpolationplugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void QgsInterpolationPlugin::unload()
6161

6262
void QgsInterpolationPlugin::showInterpolationDialog()
6363
{
64-
QgsInterpolationDialog dialog( 0, mIface );
64+
QgsInterpolationDialog dialog( mIface->mainWindow(), mIface );
6565
dialog.exec();
6666
}
6767

‎src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void QgsRasterTerrainAnalysisPlugin::initGui()
8787
return;
8888
}
8989

90-
mTerrainAnalysisMenu = new QMenu( tr( "Terrain analysis" ) );
90+
mTerrainAnalysisMenu = new QMenu( tr( "Terrain analysis" ), rasterMenu );
9191
mTerrainAnalysisMenu->addAction( tr( "Slope" ), this, SLOT( slope() ) );
9292
mTerrainAnalysisMenu->addAction( tr( "Aspect" ), this, SLOT( aspect() ) );
9393
mTerrainAnalysisMenu->addAction( tr( "Hillshade" ), this, SLOT( hillshade() ) );
@@ -107,7 +107,7 @@ void QgsRasterTerrainAnalysisPlugin::unload()
107107

108108
void QgsRasterTerrainAnalysisPlugin::hillshade()
109109
{
110-
QgsRasterTerrainAnalysisDialog d( QgsRasterTerrainAnalysisDialog::HillshadeInput );
110+
QgsRasterTerrainAnalysisDialog d( QgsRasterTerrainAnalysisDialog::HillshadeInput, mIface->mainWindow() );
111111
d.setWindowTitle( tr( "Hillshade" ) );
112112
if ( d.exec() == QDialog::Accepted )
113113
{
@@ -126,7 +126,7 @@ void QgsRasterTerrainAnalysisPlugin::hillshade()
126126

127127
void QgsRasterTerrainAnalysisPlugin::relief()
128128
{
129-
QgsRasterTerrainAnalysisDialog d( QgsRasterTerrainAnalysisDialog::ReliefInput );
129+
QgsRasterTerrainAnalysisDialog d( QgsRasterTerrainAnalysisDialog::ReliefInput, mIface->mainWindow() );
130130
d.setWindowTitle( tr( "Relief" ) );
131131
if ( d.exec() == QDialog::Accepted )
132132
{
@@ -146,7 +146,7 @@ void QgsRasterTerrainAnalysisPlugin::relief()
146146

147147
void QgsRasterTerrainAnalysisPlugin::slope()
148148
{
149-
QgsRasterTerrainAnalysisDialog d( QgsRasterTerrainAnalysisDialog::NoParameter );
149+
QgsRasterTerrainAnalysisDialog d( QgsRasterTerrainAnalysisDialog::NoParameter, mIface->mainWindow() );
150150
d.setWindowTitle( tr( "Slope" ) );
151151
if ( d.exec() == QDialog::Accepted )
152152
{
@@ -165,7 +165,7 @@ void QgsRasterTerrainAnalysisPlugin::slope()
165165

166166
void QgsRasterTerrainAnalysisPlugin::aspect()
167167
{
168-
QgsRasterTerrainAnalysisDialog d( QgsRasterTerrainAnalysisDialog::NoParameter );
168+
QgsRasterTerrainAnalysisDialog d( QgsRasterTerrainAnalysisDialog::NoParameter, mIface->mainWindow() );
169169
d.setWindowTitle( tr( "Aspect" ) );
170170
if ( d.exec() == QDialog::Accepted )
171171
{
@@ -184,7 +184,7 @@ void QgsRasterTerrainAnalysisPlugin::aspect()
184184

185185
void QgsRasterTerrainAnalysisPlugin::ruggedness()
186186
{
187-
QgsRasterTerrainAnalysisDialog d( QgsRasterTerrainAnalysisDialog::NoParameter );
187+
QgsRasterTerrainAnalysisDialog d( QgsRasterTerrainAnalysisDialog::NoParameter, mIface->mainWindow() );
188188
d.setWindowTitle( tr( "Ruggedness" ) );
189189
if ( d.exec() == QDialog::Accepted )
190190
{

0 commit comments

Comments
 (0)