Changeset 174 for trunk/src/styles

Timestamp:

Nov 6, 2007, 11:27:57 PM (18 years ago)

Author:

dmik

Message:

Styles: Implemented the first version of the Warp4 style (contributed by Cornelis Bockemuehl).

Location:

trunk/src/styles

Files:

• qstylefactory.cpp (modified) (5 diffs)
• qt_styles.pri (modified) (5 diffs)

trunk/src/styles/qstylefactory.cpp

@@ -52 +52 @@
 #include "qwindowsxpstyle.h"
 #endif
+#ifndef QT_NO_STYLE_WARP4
+#include "qwarp4style.h"
+#endif
 #ifndef QT_NO_STYLE_AQUA
 #include "qaquastyle.h"
@@ -109 +112 @@
     including "windows", "motif", "cde", "motifplus", "platinum",
     "sgi" and "compact". Depending on the platform, "windowsxp",
-    "aqua" or "macintosh" may be available.
+    "warp4", "aqua" or "macintosh" may be available.
 */
 
@@ -132 +135 @@
     else
 #endif
+#ifndef QT_NO_STYLE_WARP4
+    if ( style == "warp4" )
+        ret = new QWarp4Style;
+    else
+#endif
 #ifndef QT_NO_STYLE_MOTIF
     if ( style == "motif" )
@@ -165 +173 @@
     if ( style == "aqua" )
         ret = new QAquaStyle;
+    else
 #endif
 #ifndef QT_NO_STYLE_POCKETPC
     if ( style == "pocketpc" )
-        ret = new QPocketPCStyle;
+        ret = new QPocketPCStyle;
+    else
 #endif
 #if !defined( QT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
     if( style.left(9) == "macintosh" )
-        ret = new QMacStyle;
+        ret = new QMacStyle;
+    else
 #endif
     { } // Keep these here - they make the #ifdefery above work
@@ -216 +227 @@
     if ( !list.contains( "WindowsXP" ) && QWindowsXPStyle::resolveSymbols() )
         list << "WindowsXP";
+#endif
+#ifndef QT_NO_STYLE_WARP4
+    if ( !list.contains( "Warp4" ) )
+        list << "Warp4";
 #endif
 #ifndef QT_NO_STYLE_MOTIF

trunk/src/styles/qt_styles.pri

@@ -12 +12 @@
 
         contains( styles, all ) {
-                styles += mac cde motifplus sgi platinum compact interlace windows motif
+                styles += mac cde motifplus sgi platinum compact interlace windows warp4 motif
         }
 
@@ -19 +19 @@
                 HEADERS +=$$STYLES_H/qmacstyle_mac.h
                 SOURCES +=$$STYLES_CPP/qmacstyle_mac.cpp
-                HEADERS *= $$STYLES_CPP/qaquastyle_p.h 
-                SOURCES *= $$STYLES_CPP/qaquastyle_p.cpp 
+                HEADERS *= $$STYLES_CPP/qaquastyle_p.h
+                SOURCES *= $$STYLES_CPP/qaquastyle_p.cpp
 
                 !contains( styles, windows ) {
@@ -31 +31 @@
         #embedded|!macx-*:styles -= aqua
         contains( styles, aqua ) {
-                HEADERS += $$STYLES_H/qaquastyle.h 
-                SOURCES += $$STYLES_CPP/qaquastyle.cpp 
-                HEADERS *= $$STYLES_CPP/qaquastyle_p.h 
-                SOURCES *= $$STYLES_CPP/qaquastyle_p.cpp 
+                HEADERS += $$STYLES_H/qaquastyle.h
+                SOURCES += $$STYLES_CPP/qaquastyle.cpp
+                HEADERS *= $$STYLES_CPP/qaquastyle_p.h
+                SOURCES *= $$STYLES_CPP/qaquastyle_p.cpp
 
                 !contains( styles, windows ) {
@@ -124 +124 @@
                 }
         }
-        else:DEFINES += QT_NO_STYLE_POCKETPC
-        
+        else:DEFINES += QT_NO_STYLE_POCKETPC
+
         contains( styles, windows ) {
                 HEADERS +=$$STYLES_H/qwindowsstyle.h
@@ -131 +131 @@
         }
         else:DEFINES += QT_NO_STYLE_WINDOWS
+
+        contains( styles, warp4 ) {
+                HEADERS +=$$STYLES_H/qwarp4style.h
+                SOURCES +=$$STYLES_CPP/qwarp4style.cpp
+        }
+        else:DEFINES += QT_NO_STYLE_WARP4
 
         contains( styles, motif ) {