108
108
QColor myColour = QColor (myRedInt,myGreenInt,myBlueInt);
109
109
// old Qt3 idiom
110
110
// pbnDigitisedLineColour->setPaletteBackgroundColor (myColour);
111
- // new Qt4 idiom
112
- QPalette palDigitisedLineColour = pbnDigitisedLineColour->palette ();
113
- palDigitisedLineColour.setColor ( QPalette::Window, myColour );
114
- pbnDigitisedLineColour->setPalette (palDigitisedLineColour);
111
+ // new Qt4 idiom - see http://lists.trolltech.com/qt4-preview-feedback/2005-04/thread00270-0.html for reasoning
112
+ #ifdef Q_WS_WIN
113
+ // Coloured buttons do not work under the Windows XP style - use plain Windows instead
114
+ pbnDigitisedLineColour->setStyle (&mWindowsStyle );
115
+ #endif
116
+ pbnDigitisedLineColour->setPalette (myColour);
115
117
116
118
117
119
// get the colour selections and set the button colour accordingly
121
123
myColour = QColor (myRedInt,myGreenInt,myBlueInt);
122
124
// old Qt3 idiom
123
125
// pbnSelectionColour->setPaletteBackgroundColor (myColour);
124
- // new Qt4 idiom
125
- QPalette palSelectionColour = pbnSelectionColour->palette ();
126
- palSelectionColour.setColor ( QPalette::Window, myColour );
127
- pbnSelectionColour->setPalette (palSelectionColour);
126
+ // new Qt4 idiom - see http://lists.trolltech.com/qt4-preview-feedback/2005-04/thread00270-0.html for reasoning
127
+ #ifdef Q_WS_WIN
128
+ // Coloured buttons do not work under the Windows XP style - use plain Windows instead
129
+ pbnSelectionColour->setStyle (&mWindowsStyle );
130
+ #endif
131
+ pbnSelectionColour->setPalette (myColour);
128
132
129
133
// get the colour for map canvas background and set button colour accordingly (default white)
130
134
myRedInt = QgsProject::instance ()->readNumEntry (" Gui" ," /CanvasColorRedPart" ,255 );
133
137
myColour = QColor (myRedInt,myGreenInt,myBlueInt);
134
138
// old Qt3 idiom
135
139
// pbnCanvasColor->setPaletteBackgroundColor (myColour);
136
- // new Qt4 idiom
137
- QPalette palCanvasColor = pbnCanvasColor->palette ();
138
- palCanvasColor.setColor ( QPalette::Window, myColour );
139
- pbnCanvasColor->setPalette (palCanvasColor);
140
+ // new Qt4 idiom - see http://lists.trolltech.com/qt4-preview-feedback/2005-04/thread00270-0.html for reasoning
141
+ #ifdef Q_WS_WIN
142
+ // Coloured buttons do not work under the Windows XP style - use plain Windows instead
143
+ pbnCanvasColor->setStyle (&mWindowsStyle );
144
+ #endif
145
+ pbnCanvasColor->setPalette (myColour);
140
146
}
141
147
142
148
QgsProjectProperties::~QgsProjectProperties ()
@@ -339,9 +345,9 @@ void QgsProjectProperties::on_pbnDigitisedLineColour_clicked()
339
345
{
340
346
// old Qt3 idiom
341
347
// pbnDigitisedLineColour->setPaletteBackgroundColor(color);
342
- // new Qt4 idiom
343
- palDigitisedLineColour. setColor ( QPalette::Window, color );
344
- pbnDigitisedLineColour-> setPalette (palDigitisedLineColour);
348
+ // new Qt4 idiom - see http://lists.trolltech.com/qt4-preview-feedback/2005-04/thread00270-0.html for reasoning
349
+ pbnDigitisedLineColour-> setPalette ( color);
350
+
345
351
}
346
352
}
347
353
@@ -356,9 +362,8 @@ void QgsProjectProperties::on_pbnSelectionColour_clicked()
356
362
{
357
363
// old Qt3 idiom
358
364
// pbnSelectionColour->setPaletteBackgroundColor(color);
359
- // new Qt4 idiom
360
- palSelectionColour.setColor ( QPalette::Window, color );
361
- pbnSelectionColour->setPalette (palSelectionColour);
365
+ // new Qt4 idiom - see http://lists.trolltech.com/qt4-preview-feedback/2005-04/thread00270-0.html for reasoning
366
+ pbnSelectionColour->setPalette (color);
362
367
}
363
368
}
364
369
@@ -373,9 +378,8 @@ void QgsProjectProperties::on_pbnCanvasColor_clicked()
373
378
{
374
379
// old Qt3 idiom
375
380
// pbnCanvasColor->setPaletteBackgroundColor(color);
376
- // new Qt4 idiom
377
- palCanvasColor.setColor ( QPalette::Window, color );
378
- pbnCanvasColor->setPalette (palCanvasColor);
381
+ // new Qt4 idiom - see http://lists.trolltech.com/qt4-preview-feedback/2005-04/thread00270-0.html for reasoning
382
+ pbnCanvasColor->setPalette (color);
379
383
}
380
384
}
381
385
void QgsProjectProperties::on_pbnHelp_clicked ()
0 commit comments