Skip to content

Commit

Permalink
Moved code to set windows style to constructor of QgsSingleSymbolDial…
Browse files Browse the repository at this point in the history
…og. Removed an assert statement in QgsOgrProvider

git-svn-id: http://svn.osgeo.org/qgis/trunk@5884 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Sep 29, 2006
1 parent cc257be commit 258d1b5
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 12 deletions.
20 changes: 12 additions & 8 deletions src/gui/qgssinglesymboldialog.cpp
Expand Up @@ -33,11 +33,23 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog(): QDialog(), mVectorLayer(0)
#ifdef QGISDEBUG
qWarning("constructor QgsSingleSymbolDialog called WITHOUT a layer");
#endif
#ifdef Q_WS_WIN
// Coloured labels do not work under the Windows XP style - use plain Windows buttons instead
btnFillColor->setStyle(&mWindowsStyle);
btnOutlineColor->setStyle(&mWindowsStyle);
#endif
}

QgsSingleSymbolDialog::QgsSingleSymbolDialog(QgsVectorLayer * layer): QDialog(), mVectorLayer(layer)
{
setupUi(this);

#ifdef Q_WS_WIN
// Coloured labels do not work under the Windows XP style - use plain Windows buttons instead
btnFillColor->setStyle(&mWindowsStyle);
btnOutlineColor->setStyle(&mWindowsStyle);
#endif

#ifdef QGISDEBUG
qWarning("constructor QgsSingleSymbolDialog called WITH a layer");
#endif
Expand Down Expand Up @@ -340,19 +352,11 @@ void QgsSingleSymbolDialog::set ( const QgsSymbol *sy )
// old Qt3 idiom
// lblFillColor->setPaletteBackgroundColor(sy->brush().color());
// new Qt4 idiom
#ifdef Q_WS_WIN
// Coloured labels do not work under the Windows XP style - use plain Windows buttons instead
btnFillColor->setStyle(&mWindowsStyle);
#endif
btnFillColor->setPalette( sy->brush().color() );

// old Qt3 idiom
// lblOutlineColor->setPaletteBackgroundColor(sy->pen().color());
// new Qt4 idiom
#ifdef Q_WS_WIN
// Coloured labels do not work under the Windows XP style - use plain Windows buttons instead
btnOutlineColor->setStyle(&mWindowsStyle);
#endif
btnOutlineColor->setPalette( sy->pen().color() );

//stylebutton->setName(QgsSymbologyUtils::penStyle2Char(sy->pen().style()));
Expand Down
1 change: 0 additions & 1 deletion src/providers/ogr/qgsogrprovider.cpp
Expand Up @@ -635,7 +635,6 @@ void QgsOgrProvider::select(QgsRect *rect, bool useIntersect)
}else{
#ifdef QGISDEBUG
QgsLogger::warning("Setting spatial filter failed!");
assert(result==OGRERR_NONE);
#endif
}
OGRGeometryFactory::destroyGeometry(filter);
Expand Down
6 changes: 3 additions & 3 deletions src/providers/wms/qgshttptransaction.cpp
Expand Up @@ -96,7 +96,7 @@ bool QgsHttpTransaction::getSynchronously(QByteArray &respondedContent, int redi

mWatchdogTimer = new QTimer( this );

QgsDebugMsg("QgsHttpTransaction::getSynchronously: qurl.host() is '" + qurl.host()+ "'.");
//QgsDebugMsg("QgsHttpTransaction::getSynchronously: qurl.host() is '" + qurl.host()+ "'.");

httpresponse.truncate(0);

Expand Down Expand Up @@ -152,8 +152,8 @@ bool QgsHttpTransaction::getSynchronously(QByteArray &respondedContent, int redi
#ifdef QGISDEBUG
QgsDebugMsg("QgsHttpTransaction::getSynchronously: Response received.");

// QString httpresponsestring(httpresponse);
// QgsDebugMsg("QgsHttpTransaction::getSynchronously: Response received; being '" + httpresponsestring + "'.");
//QString httpresponsestring(httpresponse);
//QgsDebugMsg("QgsHttpTransaction::getSynchronously: Response received; being '" + httpresponsestring + "'.");
#endif

delete http;
Expand Down
1 change: 1 addition & 0 deletions src/providers/wms/qgswmsprovider.cpp
Expand Up @@ -693,6 +693,7 @@ bool QgsWmsProvider::retrieveServerCapabilities(bool forceRefresh)

QByteArray QgsWmsProvider::retrieveUrl(QString url)
{
QgsDebugMsg("WMS request Url: " + url);
QgsHttpTransaction http(
url,
mHttpProxyHost,
Expand Down

0 comments on commit 258d1b5

Please sign in to comment.