[vlmc-devel] commit: guimain: Use the palette only on mac and windows. ( Hugo Beauzée-Luyssen )

git at videolan.org git at videolan.org
Tue Aug 17 14:23:01 CEST 2010


vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Tue Aug 17 14:22:41 2010 +0200| [5a757fc4d4833b97a04c89d13999da1466141087] | committer: Hugo Beauzée-Luyssen 

guimain: Use the palette only on mac and windows.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=5a757fc4d4833b97a04c89d13999da1466141087
---

 src/Main/guimain.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Main/guimain.cpp b/src/Main/guimain.cpp
index 71a631d..111df2a 100644
--- a/src/Main/guimain.cpp
+++ b/src/Main/guimain.cpp
@@ -65,7 +65,7 @@ VLMCmain( int argc, char **argv )
     LanguageHelper::getInstance()->languageChanged(
             s.value( "general/VLMCLang", "default" ) );
 
-#ifdef Q_OS_WIN
+#ifdef Q_WS_WIN
 
     QFile  css(":/styles/windows");
     if ( css.open( QIODevice::ReadOnly | QIODevice::Text ) )
@@ -76,6 +76,7 @@ VLMCmain( int argc, char **argv )
     }
 #endif
 
+#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
     // Creating the color palette
     QPalette p;
     p.setColor( QPalette::WindowText,       QColor( 255, 255, 255, 255 ) );
@@ -99,14 +100,13 @@ VLMCmain( int argc, char **argv )
     p.setColor( QPalette::WindowText,       QColor( 255, 255, 255, 255 ) );
     p.setColor( QPalette::Link,             QColor( 177, 202, 0,   255 ) );
     p.setColor( QPalette::LinkVisited,      QColor( 177, 202, 0,   255 ) );
+    app.setPalette( p );
+#endif
 
 #ifndef QT_DEBUG
     IntroDialog d;
     d.exec();
 #endif
-
-    app.setPalette( p );
-
     MainWindow w;
     if ( argc > 1 )
         GUIProjectManager::getInstance()->loadProject( argv[argc - 1] );



More information about the Vlmc-devel mailing list