diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index b7d3aed1..47b1e796 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -419,22 +419,22 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) //Schriftart und Schriftgrößen für Widgets festlegen #ifdef _WIN32 tmpFont1.setPixelSize(11); - textBrowser_Log->setStyleSheet("QTextBrowser { font-family: \"Nimbus Sans L\"; font-size: 11px; font-color: white; background-color: #285200;}"); + textBrowser_Log->setStyleSheet("QTextBrowser { font-family: \"Nimbus Sans L\"; font-size: 11px; color: white; background-color: #285200; border-color: #669900;}"); #else tmpFont1.setPixelSize(10); - textBrowser_Log->setStyleSheet("QTextBrowser { font-family: \"Nimbus Sans L\"; font-size: 10px; font-color: white; background-color: #285200; }"); - textBrowser_Chat->setStyleSheet("QTextBrowser { font-family: \"Nimbus Sans L\"; font-size: 10px; font-color: white; background-color: #285200; }"); - lineEdit_ChatInput->setStyleSheet("QLineEdit { font-family: \"Nimbus Sans L\"; font-size: 10px; font-color: white; background-color: #285200; }"); + textBrowser_Log->setStyleSheet("QTextBrowser { font-family: \"Nimbus Sans L\"; font-size: 10px; color: white; background-color: #285200; border-color: #669900; }"); + textBrowser_Chat->setStyleSheet("QTextBrowser { font-family: \"Nimbus Sans L\"; font-size: 10px; color: white; background-color: #285200; border-color: #669900; }"); + lineEdit_ChatInput->setStyleSheet("QLineEdit { font-family: \"Nimbus Sans L\"; font-size: 10px; color: white; background-color: #285200; border-color: #669900; }"); #endif #ifdef __APPLE__ tmpFont1.setPixelSize(11); - tabWidget_Right->setStyleSheet("QTabWidget { font-family: \"Nimbus Sans L\"; font-size: 11px; font-color: white; background-color: #285200; }"); - tabWidget_Left->setStyleSheet("QTabWidget { font-family: \"Nimbus Sans L\"; font-size: 11px; font-color: white; background-color: #285200; }"); + tabWidget_Right->setStyleSheet("QTabWidget { font-family: \"Nimbus Sans L\"; font-size: 11px; font-color: white; border-color: #669900; }"); + tabWidget_Left->setStyleSheet("QTabWidget { font-family: \"Nimbus Sans L\"; font-size: 11px; font-color: white; border-color: #669900;}"); #else tmpFont1.setPixelSize(10); - tabWidget_Right->setStyleSheet("QTabWidget { font-family: \"Nimbus Sans L\"; font-size: 10px; font-color: white; background-color: #285200; }"); - tabWidget_Left->setStyleSheet("QTabWidget { font-family: \"Nimbus Sans L\"; font-size: 10px; font-color: white; background-color: #285200; }"); + tabWidget_Right->setStyleSheet("QTabWidget::pane { font-family: \"Nimbus Sans L\"; font-size: 10px; border-color: #669900; }"); + tabWidget_Left->setStyleSheet("QTabWidget::pane { font-family: \"Nimbus Sans L\"; font-size: 10px; border-color: #669900; }"); #endif diff --git a/src/gui/qt/sound/sdlplayer.cpp b/src/gui/qt/sound/sdlplayer.cpp index 557e881e..18e83f10 100644 --- a/src/gui/qt/sound/sdlplayer.cpp +++ b/src/gui/qt/sound/sdlplayer.cpp @@ -11,17 +11,6 @@ // #include "sdlplayer.h" -// Include SDL here and not in headers to prevent -// conflicts with QT includes. -#if (defined _WIN32) || (defined __APPLE__) - #include - #include -#else - #include - #include -#endif - -#include using namespace std; diff --git a/src/gui/qt/sound/sdlplayer.h b/src/gui/qt/sound/sdlplayer.h index 5a4d6093..55d4eaef 100644 --- a/src/gui/qt/sound/sdlplayer.h +++ b/src/gui/qt/sound/sdlplayer.h @@ -14,11 +14,23 @@ #ifndef SDLPLAYER_H #define SDLPLAYER_H -#include #include "configfile.h" #include "qthelper.h" -struct Mix_Chunk; +// Include SDL here and not in headers to prevent +// conflicts with QT includes. +#if (defined _WIN32) || (defined __APPLE__) + #include + #include +#else + #include + #include +#endif + +#include +#include + +// struct Mix_Chunk; /** @author FThauer FHammer