Changeset 174 for trunk

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

Files:

• configure.cmd (modified) (33 diffs)
• src/kernel/qapplication.cpp (modified) (3 diffs)
• src/kernel/qapplication_pm.cpp (modified) (12 diffs)
• src/kernel/qfont_pm.cpp (modified) (12 diffs)
• src/styles/qstylefactory.cpp (modified) (5 diffs)
• src/styles/qt_styles.pri (modified) (5 diffs)
• src/widgets/qcombobox.cpp (modified) (2 diffs)
• src/widgets/qdatetimeedit.cpp (modified) (3 diffs)
• src/widgets/qdial.cpp (modified) (2 diffs)
• src/widgets/qlistview.cpp (modified) (4 diffs)
• src/widgets/qmenubar.cpp (modified) (5 diffs)
• src/widgets/qscrollbar.cpp (modified) (1 diff)
• src/widgets/qslider.cpp (modified) (1 diff)
• src/widgets/qspinwidget.cpp (modified) (4 diffs)

trunk/configure.cmd

@@ -50 +50 @@
 Opt.!RELEASE    = 1
 Opt.!DLL        = 1
-Opt.!CustomDLLName = 'myqt'    
+Opt.!CustomDLLName = 'myqt'
 /* optional module configuration */
 Opt.!NETWORK    = 1
@@ -304 +304 @@
     call WriteVar G.!ConfigCache, 'Opt.!Extra.!FT2LIB.!choice'
     call WriteVar G.!ConfigCache, 'Opt.!Extra.!FT2LIB.!enabled'
-*/    
+*/
     call WriteVar G.!ConfigCache, 'Opt.!QTCustomDefines'
-    
+
     call lineout G.!ConfigCache
 
@@ -424 +424 @@
     /*
      *  determine whether to setup the environment for the debug version of Qt
-     *  or for the release one 
+     *  or for the release one
      */
     call lineout G.!QtCmd, '/* determine the default DEBUG value using .qtos2config */'
@@ -442 +442 @@
     call lineout G.!QtCmd, 'else parse arg args'
     call lineout G.!QtCmd, ''
-    /* 
+    /*
      *  setup GCC before everything else, to prevent it from possible reordering
      *  of some essential paths
@@ -479 +479 @@
      *  in order to appear last in PATH (to ensure that, on the contrary, paths
      *  to the linker and to the make tool choosen by the user are always at
-     *  the beginning) 
+     *  the beginning)
      */
     call ConfigureCompiler_GenAddPathEnv 'PATH',,
@@ -556 +556 @@
 
     /* Qt library type */
-    
+
     G.!Choices.0 = 2
     G.!Choices.1 = 'Dynamic link library (DLL)'
@@ -562 +562 @@
     choice = GetChoice('Select the Qt library type:', 'G.!Choices', -Opt.!DLL + 2)
     Opt.!DLL = -choice + 2
-    
+
     OfficialBuildConfig = ''
-    
+
     if (Opt.!DLL == 1) then do
-        call SaySay 'You are going to build Qt as a dynamic link library.  In order' 
+        call SaySay 'You are going to build Qt as a dynamic link library.  In order'
         call SaySay 'to prevent possible DLL naming conflicts (a.k.a. DLL hell) with'
         call SaySay 'the official binary distribution of Qt and with other custom'
@@ -583 +583 @@
                 leave
             end
-            upperName = translate(name) 
+            upperName = translate(name)
             if (upperName \= '' & length(upperName) <= 8 &,
                 verify(upperName,'ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-_') == 0 &,
@@ -597 +597 @@
 
     /* Qt library debug level */
-    
+
     G.!Choices.0 = 2
     G.!Choices.1 = 'Release (no debug information)'
@@ -605 +605 @@
 
     /* Optional Qt modules */
-    
+
     G.!Choices.0 = 6
     do forever
@@ -655 +655 @@
 
     call WriteConfigCache
-*/    
+*/
     /* Custom Qt defines */
-                  
+
     if (OfficialBuildConfig == '') then do
         call SaySay 'Enter a list of custom Qt defines separated by spaces'
@@ -665 +665 @@
         Opt.!QTCustomDefines = strip(Opt.!QTCustomDefines)
     end
-    
+
     call WriteConfigCache
 
     /* Generate setup files for Qt */
-    
+
     BasicModules = 'kernel tools widgets dialogs styles'
     BasicModulesHeader =,
@@ -749 +749 @@
 */
     ExtraConfig = strip(ExtraConfig)
-    
+
     ConfigHeader =,
         '/* Everything */'G.!EOL||,
@@ -769 +769 @@
         '#define QT_NO_STYLE_WINDOWSXP'G.!EOL||,
         '#endif'G.!EOL
-    
+
     ConfigSource =,
         '#include <qglobal.h>'G.!EOL||,
@@ -793 +793 @@
         'const char *qInstallPathTranslations() { return QT_INSTALL_TRANSLATIONS + 11; }'G.!EOL||,
         'const char *qInstallPathSysconf() { return 0; }'G.!EOL
-        
+
     call SaySay 'You have selected the following compiler configuration:'
     say
@@ -805 +805 @@
     call SaySay 'Modules        : 'BasicModules OptionalModules
     call SaySay 'Other features : 'OptionalConfig
-    if (Opt.!QTCustomDefines \= '') then    
+    if (Opt.!QTCustomDefines \= '') then
         call SaySay 'Custom defines : 'Opt.!QTCustomDefines
     say
@@ -834 +834 @@
     call lineout qmake_cache, 'sql-drivers+='
     call lineout qmake_cache, 'sql-plugins+='
-    call lineout qmake_cache, 'styles+=windows'
+    call lineout qmake_cache, 'styles+=windows warp4 motif'
     call lineout qmake_cache, 'style-plugins+='
     call lineout qmake_cache, 'imageformat-plugins+='
@@ -879 +879 @@
      *  recompiling every source when no affecting settings are changed
      */
-    
+
     create = \FileExists(qmodules_h)
     if (\create) then create = CompareFileToVar(qmodules_h, ModulesHeader) \= 0
@@ -903 +903 @@
         call charout qconfig_cpp
     end
-    
+
     call CopyFile QuotePath(G.!QTDirP)'\qmake\"Makefile.os2-g++"',,
                   G.!QMakeMakefile
@@ -944 +944 @@
         call DeleteFile build_log
     end
-    
+
     build_target = ''
 
@@ -1174 +1174 @@
     if (Opt.!Extra.!FT2LIB.!changed \== 1) then def = 'Y'; else def = ''
     return GetYesNo("Accept the above version?", def)
-    
+
 /**
  */
@@ -1205 +1205 @@
     if (contents > aVar) then return 1
     return 0
- 
+
 CopyFile: procedure expose (Globals)
     parse arg fileFrom, fileTo
@@ -1287 +1287 @@
     call SysCurPos row, col
     return
-    
+
 /**
  *  Displays a prompt to input a text line and returns the line entered by the
@@ -1309 +1309 @@
     allow_empty = pos('N', mode) == 0
     allow_cancel = pos('C', mode) > 0
-    
+
     line = default
     len = length(line)
@@ -1324 +1324 @@
             iterate
         end
-        
+
         select
             when (\extended & key == '08'x) then do
@@ -1405 +1405 @@
         end
     end
-    
+
     say
     return line
@@ -1648 +1648 @@
 
     parse arg stem, prompt, searchPattern, checkPath, checkVer, errPath, mode
-    
+
     mode = translate(mode)
     if (pos('C', mode) > 0) then mode = 'C'
@@ -1654 +1654 @@
 
     if (symbol('Static.!MenuSelectPath.!Recent') \= 'VAR') then
-        Static.!MenuSelectPath.!Recent = '' 
-    
+        Static.!MenuSelectPath.!Recent = ''
+
     do forever
 
@@ -1665 +1665 @@
         choice = GetChoice(prompt, stem, default, mode)
         call SysStemDelete stem, n
-    
+
         if (choice == -1) then return '' /* canceled */
 
@@ -1673 +1673 @@
                             '(or Esc to cancel):',,
                             Static.!MenuSelectPath.!Recent)
-            if (path == '') then iterate /* canceled */ 
+            if (path == '') then iterate /* canceled */
             Static.!MenuSelectPath.!Recent = path
             call SaySay 'Please wait...'
@@ -1742 +1742 @@
     parse arg path
     return Replace(path, '\', '\\')
-    
+
 /**
  *  Fixes the directory path by a) converting all slashes to back
@@ -1836 +1836 @@
     say 'RC:255:CR'
     exit 255
-    
+
 /**
  *  Magic log handler.
@@ -1845 +1845 @@
     file = strip(file)
     signal on halt name MagicLogHalt
-    rc = 0  
+    rc = 0
     do while (stream('STDIN', 'S') == 'READY')
         line = linein()

trunk/src/kernel/qapplication.cpp

@@ -1235 +1235 @@
             else
                 style = "Windows";              // default styles for Windows
-#elif defined(Q_WS_PM)
-            /// @todo (dmik) temporary, until the native style is done
-            style = "Windows";          // default style for OS/2
+// this is temporarily disabled until most bugs are fixed,
+// see http://svn.netlabs.org/qr3/ticket/9 for details
+//#elif defined(Q_WS_PM)
+//          style = "Warp4";            // default style for OS/2
+//#endif
 #elif defined(Q_WS_X11) && defined(Q_OS_SOLARIS)
             style = "CDE";                      // default style for X11 on Solaris
@@ -1253 +1255 @@
         if ( !app_style &&              // platform default style not available, try alternatives
              !(app_style = QStyleFactory::create( "Windows" ) ) &&
+//           !(app_style = QStyleFactory::create( "Warp4" ) ) &&
              !(app_style = QStyleFactory::create( "Platinum" ) ) &&
              !(app_style = QStyleFactory::create( "MotifPlus" ) ) &&
@@ -1370 +1373 @@
   The string must be one of the QStyleFactory::keys(), typically one
   of "windows", "motif", "cde", "motifplus", "platinum", "sgi" and
-  "compact". Depending on the platform, "windowsxp", "aqua" or
+  "compact". Depending on the platform, "windowsxp", "warp4", "aqua" or
   "macintosh" may be available.
 

trunk/src/kernel/qapplication_pm.cpp

@@ -131 +131 @@
                            const QPixmap *, int, int, int );
 
+Q_EXPORT
 QRgb qt_sysclr2qrgb( LONG sysClr )
 {
@@ -139 +140 @@
 }
 
-QFont qt_sysfont2qfont( const PSZ scope ) {
+static
+QFont qt_sysfont2qfont( const PSZ scope )
+{
     static const PSZ app = "PM_SystemFonts";
-    static const PSZ def = "8.Helv";
+    static const PSZ def = "10.System Proportional";
     ULONG keyLen = 0;
-    QFont f( "Helv", 8 );
+    QFont f( "System Proportional", 10 );
 
     if ( PrfQueryProfileSize( HINI_USERPROFILE, app, scope, &keyLen ) && keyLen ) {
@@ -369 +372 @@
     // Do the font settings
 
+#ifndef QT_PM_NO_DEFAULTFONT_OVERRIDE
     QFont windowFont = qt_sysfont2qfont( "WindowText" );
+#else
+    QFont windowFont = qt_sysfont2qfont( "DefaultFont" );
+#endif
     QFont menuFont = qt_sysfont2qfont( "Menus" );
     QFont iconFont = qt_sysfont2qfont( "IconText" );
@@ -440 +447 @@
     *qt_std_pal = pal;
 
-    // a special palette for menus
-    acg.setColor( QColorGroup::Highlight,
+    // special palettes
+    QColorGroup scg;
+
+    // menus
+    scg = acg;
+    scg.setColor( QColorGroup::Background,
+                  QColor( qt_sysclr2qrgb( SYSCLR_MENU ) ) );
+    scg.setColor( QColorGroup::Highlight,
                   QColor( qt_sysclr2qrgb( SYSCLR_MENUHILITEBGND ) ) );
-    acg.setColor( QColorGroup::HighlightedText,
+    scg.setColor( QColorGroup::HighlightedText,
                   QColor( qt_sysclr2qrgb( SYSCLR_MENUHILITE ) ) );
-    QApplication::setPalette( QPalette( acg, dcg, icg ), TRUE, "QPopupMenu");
-    QApplication::setPalette( QPalette( acg, dcg, icg ), TRUE, "QMenuBar");
+    pal.setActive( scg );
+    pal.setInactive( scg );
+    QApplication::setPalette( pal, TRUE, "QPopupMenu" );
+    QApplication::setPalette( pal, TRUE, "QMenuBar" );
+
+    // static widget texts
+    scg = acg;
+    QColor staticTextCol( qt_sysclr2qrgb( SYSCLR_WINDOWSTATICTEXT ) );
+    scg.setColor( QColorGroup::Foreground, staticTextCol );
+    scg.setColor( QColorGroup::Text, staticTextCol );
+    pal.setActive( scg );
+    pal.setInactive( scg );
+    QApplication::setPalette( pal, TRUE, "QLabel" );
+    QApplication::setPalette( pal, TRUE, "QGroupBox" );
 }
 
@@ -457 +482 @@
 {
 public:
-    static bool &installed() { return QtOS2SysXcptMainHandler::installed; } 
+    static bool &installed() { return QtOS2SysXcptMainHandler::installed; }
     static ERR &libcHandler() { return QtOS2SysXcptMainHandler::libcHandler; }
     static ERR handler() { return QtOS2SysXcptMainHandler::handler; }
@@ -486 +511 @@
     DosGetInfoBlocks( &ptib, NULL );
     Q_ASSERT( ptib && ptib->tib_ptib2 );
-    
+
     if ( ptib && ptib->tib_ptib2 ) {
-        // must be called only on the main (first) thread 
+        // must be called only on the main (first) thread
         Q_ASSERT( ptib->tib_ptib2->tib2_ultid == 1 );
         // also make sure that QtOS2SysXcptMainHandler was not already
@@ -551 +576 @@
     // default font
     if ( !qt_app_has_font )
-        QApplication::setFont( QFont( "Helv", 8 ) );
+        QApplication::setFont( QFont( "System Proportional", 10 ) );
 
     // QFont::locale_init();  ### Uncomment when it does something on OS/2
@@ -590 +615 @@
 
 #if !defined(QT_OS2_NO_SYSEXCEPTIONS)
-    // remove the exception handler if it was installed in qt_init() 
+    // remove the exception handler if it was installed in qt_init()
     PTIB ptib = NULL;
     DosGetInfoBlocks( &ptib, NULL );
     Q_ASSERT( ptib && ptib->tib_ptib2 );
-    
+
     if ( ptib && ptib->tib_ptib2 ) {
-        // must be called only on the main (first) thread 
+        // must be called only on the main (first) thread
         Q_ASSERT( ptib->tib_ptib2->tib2_ultid == 1 );
         // also make sure the handler was really installed by qt_init()
@@ -1003 +1028 @@
 enum {
     // some undocumented messages (they have the WM_U_ prefix for clarity)
-    
+
     // sent to hwnd that has been entered to by a mouse pointer.
     // FID_CLIENT also receives enter messages of its WC_FRAME.
@@ -2064 +2089 @@
         return;
     }
-    
+
     // find the modal's group leader
     QWidget *mgl = modal->parentWidget();
@@ -2548 +2573 @@
 #endif
         if ( curWin != winId() ) {              // new current window
-/// @todo (dmik)            
+/// @todo (dmik)
 //  add CS_HITTEST to our window classes and handle WM_HITTEST,
 //  otherwise disabled windows will not get mouse events?
@@ -2764 +2789 @@
 //  Alt+letter shortcuts in the NLS keyboard mode together with Alt+NLS_letter
 //  shortcuts  (nice feature imho). Note that Alt+NLS_letter shortcuts are
-//  correctly processed in any case. 
+//  correctly processed in any case.
 
 // cache table to store Qt::Key_... values for 256 hardware scancodes

trunk/src/kernel/qfont_pm.cpp

@@ -58 +58 @@
 {
     switch( styleHint ) {
-        case QFont::Times:
-            return QString::fromLatin1("Times New Roman");
-        case QFont::Courier:
-            return QString::fromLatin1("Courier");
-        case QFont::Decorative:
-            return QString::fromLatin1("Times New Roman");
-        case QFont::Helvetica:
-            return QString::fromLatin1("Helvetica");
-        case QFont::System:
-//@@TODO (dmik): check for OS/2 ver and return the appropriate system font
-//  (i.e. "System Proportional" for ver <= Warp 3)
-            return QString::fromLatin1("WarpSans");
-        default:
+        case QFont::Times:
+            return QString::fromLatin1( "Times New Roman" );
+        case QFont::Courier:
+            return QString::fromLatin1( "Courier" );
+        case QFont::Decorative:
+            return QString::fromLatin1( "Times New Roman" );
+        case QFont::Helvetica:
+            return QString::fromLatin1( "Helvetica" );
+        case QFont::System: {
+#ifndef QT_PM_NO_DEFAULTFONT_OVERRIDE
+            static ULONG ver[2] = {0};
+            if ( ver[0] == ver[1] == 0 ) {
+                DosQuerySysInfo( QSV_VERSION_MAJOR, QSV_VERSION_MINOR,
+                                 &ver, sizeof(ver) );
+            }
+            if ( ver[0] == 20 && ver[1] >= 40 )
+                return QString::fromLatin1( "WarpSans" );
+            else
+#endif
+            return QString::fromLatin1( "System Proportional" );
+        }
+        default:
             // the family to be used when no StyleHint is set (in accordance
             // with the font matching algorithm stated in QFont docs)
-            return QString::fromLatin1("Helvetica");
+            return QString::fromLatin1( "Helvetica" );
     }
 //@@TODO (dmik): should we also add default font substitutions to
@@ -79 +88 @@
 }
 
-//@@TODO (dmik): remove
-//extern HDC   shared_dc;               // common dc for all fonts
-
-//@@TODO (dmik): remove?
-//// ### maybe move to qapplication_win
-//QFont qt_LOGFONTtoQFont(LOGFONT& lf, bool /*scale*/)
-//{
-//    QString family = QT_WA_INLINE( QString::fromUcs2((ushort*)lf.lfFaceName),
-//                                 QString::fromLocal8Bit((char*)lf.lfFaceName) );
-//    QFont qf(family);
-//    qf.setItalic(lf.lfItalic);
-//    if (lf.lfWeight != FW_DONTCARE) {
-//      int weight;
-//      if ( lf.lfWeight < 400 )
-//          weight = QFont::Light;
-//      else if ( lf.lfWeight < 600 )
-//          weight = QFont::Normal;
-//      else if ( lf.lfWeight < 700 )
-//          weight = QFont::DemiBold;
-//      else if ( lf.lfWeight < 800 )
-//          weight = QFont::Bold;
-//      else
-//          weight = QFont::Black;
-//      qf.setWeight(weight);
-//    }
-//    int lfh = QABS( lf.lfHeight );
-//    Q_ASSERT(shared_dc);
-//    qf.setPointSizeFloat( lfh * 72.0 / GetDeviceCaps(shared_dc,LOGPIXELSY) );
-//    qf.setUnderline(FALSE);
-//    qf.setOverline(FALSE);
-//    qf.setStrikeOut(FALSE);
-//    return qf;
-//}
-
-
-//@@TODO (dmik): need these two funcs?
-//static inline float pixelSize( const QFontDef &request, QPaintDevice *paintdevice,
-//                             int )
-//{
-//    float pSize;
-//    if ( request.pointSize != -1 ) {
-//      if ( paintdevice ) {
-//          pSize = request.pointSize *
-//                  QPaintDeviceMetrics( paintdevice ).logicalDpiY() / 720.;
-//      } else {
-//            LONG dpi;
-//            DevQueryCaps( GpiQueryDevice( qt_display_ps() ),
-//                CAPS_VERTICAL_FONT_RES, 1, &val );
-//          pSize = (request.pointSize*dpi + 360) / 720;
-//        }
-//    } else {
-//      pSize = request.pixelSize;
-//    }
-//    return pSize;
-//}
-//
-//static inline float pointSize( const QFontDef &fd, QPaintDevice *paintdevice,
-//                             int )
-//{
-//    float pSize;
-//    if ( fd.pointSize == -1 ) {
-//      if ( paintdevice ) {
-//          pSize = fd.pixelSize * 720. /
-//                  QPaintDeviceMetrics( paintdevice ).logicalDpiY();
-//      } else {
-//            LONG dpi;
-//            DevQueryCaps( GpiQueryDevice( qt_display_ps() ),
-//                CAPS_VERTICAL_FONT_RES, 1, &val );
-//          pSize = fd.pixelSize * 72.0 / dpi;
-//        }
-//    } else {
-//      pSize = fd.pointSize;
-//    }
-//    return pSize;
-//}
-
 /*****************************************************************************
   QFont member functions
@@ -165 +98 @@
     if ( QFontCache::instance )
         return;
-//@@TODO (dmik): remove
-//    shared_dc = CreateCompatibleDC( qt_display_dc() );
-//#if defined(QT_CHECK_RANGE)
-//    if ( !shared_dc )
-//      qSystemWarning( "QFont::initialize() (qfont_win.cpp, 163): couldn't create device context" );
-//#endif
     new QFontCache();
 
@@ -180 +107 @@
 {
     delete QFontCache::instance;
-//@@TODO (dmik): remove
-//    DeleteDC( shared_dc );
-//    shared_dc = 0;
 }
 
@@ -194 +118 @@
     // sanity checks
     if (!QFontCache::instance)
-        qWarning("Must construct a QApplication before a QFont");
+        qWarning("Must construct a QApplication before a QFont");
     Q_ASSERT( script >= 0 && script < QFont::LastPrivateScript );
 #endif // QT_CHECK_STATE
@@ -204 +128 @@
     } else {
         DevQueryCaps( GpiQueryDevice( qt_display_ps() ),
-            CAPS_VERTICAL_FONT_RES, 1, (PLONG) &dpi );
+                      CAPS_VERTICAL_FONT_RES, 1, (PLONG) &dpi );
     }
     if (req.pointSize != -1)
@@ -212 +136 @@
 
     if ( ! engineData ) {
-        QFontCache::Key key( req, QFont::NoScript, (int)paintdevice );
-
-        // look for the requested font in the engine data cache
-        engineData = QFontCache::instance->findEngineData( key );
-
-        if ( ! engineData) {
-            // create a new one
-            engineData = new QFontEngineData;
-            QFontCache::instance->insertEngineData( key, engineData );
-        } else {
-            engineData->ref();
-        }
+        QFontCache::Key key( req, QFont::NoScript, (int)paintdevice );
+
+        // look for the requested font in the engine data cache
+        engineData = QFontCache::instance->findEngineData( key );
+
+        if ( ! engineData) {
+            // create a new one
+            engineData = new QFontEngineData;
+            QFontCache::instance->insertEngineData( key, engineData );
+        } else {
+            engineData->ref();
+        }
     }
 
@@ -239 +163 @@
 
     if (!req.family.isEmpty()) {
-        family_list = QStringList::split( ',', req.family );
-
-        // append the substitute list for each family in family_list
-        QStringList subs_list;
-        QStringList::ConstIterator it = family_list.begin(), end = family_list.end();
-        for ( ; it != end; ++it )
-            subs_list += QFont::substitutes( *it );
-        family_list += subs_list;
+        family_list = QStringList::split( ',', req.family );
+
+        // append the substitute list for each family in family_list
+        QStringList subs_list;
+        QStringList::ConstIterator it = family_list.begin(), end = family_list.end();
+        for ( ; it != end; ++it )
+            subs_list += QFont::substitutes( *it );
+        family_list += subs_list;
 
 //@@TODO (dmik): need something here?
-        // append the default fallback font for the specified script
-        // family_list << ... ; ###########
+        // append the default fallback font for the specified script
+        // family_list << ... ; ###########
 
         // add the family corresponding to font's styleHint
         QString hintFamily = qt_pm_default_family( request.styleHint );
-        if ( ! family_list.contains( hintFamily ) )
+        if ( ! family_list.contains( hintFamily ) )
             family_list << hintFamily;
 
@@ -262 +186 @@
 //  below added to the list.
 
-        // add the default family
-        QString defaultFamily = QApplication::font().family();
-        if ( ! family_list.contains( defaultFamily ) )
-            family_list << defaultFamily;
-
-        // add QFont::defaultFamily() to the list, for compatibility with
-        // previous versions
-        family_list << QApplication::font().defaultFamily();
+        // add the default family
+        QString defaultFamily = QApplication::font().family();
+        if ( ! family_list.contains( defaultFamily ) )
+            family_list << defaultFamily;
+
+        // add QFont::defaultFamily() to the list, for compatibility with
+        // previous versions
+        family_list << QApplication::font().defaultFamily();
     }
 
@@ -277 +201 @@
     QStringList::ConstIterator it = family_list.begin(), end = family_list.end();
     for ( ; ! engine && it != end; ++it ) {
-        req.family = *it;
-
-        engine = QFontDatabase::findFont( script, this, req );
-        if ( engine ) {
-            if ( engine->type() != QFontEngine::Box )
-                break;
-
-            if ( ! req.family.isEmpty() )
-                engine = 0;
-
-            continue;
-        }
+        req.family = *it;
+
+        engine = QFontDatabase::findFont( script, this, req );
+        if ( engine ) {
+            if ( engine->type() != QFontEngine::Box )
+                break;
+
+            if ( ! req.family.isEmpty() )
+                engine = 0;
+
+            continue;
+        }
     }
 
@@ -343 +267 @@
 QString QFont::lastResortFont() const
 {
-    return QString::fromLatin1("System Proportional");
+    return QString::fromLatin1( "System Proportional" );
 }
 
@@ -351 +275 @@
   QFontMetrics member functions
  *****************************************************************************/
-
-//@@TODO (dmik): remove
-//#define IS_TRUETYPE (QT_WA_INLINE( engine->tm.w.tmPitchAndFamily, engine->tm.a.tmPitchAndFamily ) & TMPF_TRUETYPE)
-//#define TMX engine->tm.w
-//#define TMW engine->tm.w
-//#define TMA engine->tm.a
 
 //@@TODO (dmik): do we need a separate (other than in qfont.cpp)

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 ) {

trunk/src/widgets/qcombobox.cpp

@@ -1339 +1339 @@
     arrowRect.setHeight( QMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) );
 
-    if ( count() && ( !editable() || arrowRect.contains( e->pos() ) ) ) {
+    bool dropDown;
+    int gs = style().styleHint(QStyle::SH_GUIStyle);
+    if ( gs == QStyle::PMStyle )
+        dropDown = count() && arrowRect.contains( e->pos() );
+    else
+        dropDown = count() && ( !editable() || arrowRect.contains( e->pos() ) );
+
+    if ( dropDown ) {
         d->arrowPressed = FALSE;
 
@@ -1358 +1365 @@
         QTimer::singleShot( 200, this, SLOT(internalClickTimeout()));
         d->shortClick = TRUE;
+    }
+    else if ( gs == QStyle::PMStyle ) {
+        setFocus();
     }
 }

trunk/src/widgets/qdatetimeedit.cpp

@@ -1081 +1081 @@
     QFontMetrics fm( font() );
     int fw = style().pixelMetric( QStyle::PM_DefaultFrameWidth, this );
-    int h = QMAX( fm.lineSpacing(), 14 ) + 2;
+    int h = QMAX( fm.lineSpacing(), 14 );
+    if ( style().styleHint( QStyle::SH_GUIStyle ) != QStyle::PMStyle )
+        h += 2;
     int w = 2 + fm.width( '9' ) * 8 + fm.width( d->ed->separator() ) * 2 + d->controls->upRect().width() + fw * 4;
 
-    return QSize( w, QMAX(h + fw * 2,20) ).expandedTo( QApplication::globalStrut() );
+    return QSize( w, QMAX(h + fw * 2, 20) ).expandedTo( QApplication::globalStrut() );
 }
 
@@ -2526 +2528 @@
     QFontMetrics fm( font() );
     int fw = style().pixelMetric( QStyle::PM_DefaultFrameWidth, this );
-    int h = fm.lineSpacing() + 2;
+    int h = fm.lineSpacing();
+    if ( style().styleHint( QStyle::SH_GUIStyle ) != QStyle::PMStyle )
+        h += 2;
     int w = 2 + fm.width( '9' ) * 6 + fm.width( d->ed->separator() ) * 2 +
         d->controls->upRect().width() + fw * 4;
@@ -2536 +2540 @@
     }
 
-    return QSize( w, QMAX(h + fw * 2,20) ).expandedTo( QApplication::globalStrut() );
+    return QSize( w, QMAX(h + fw * 2, 20) ).expandedTo( QApplication::globalStrut() );
 }
 

trunk/src/widgets/qdial.cpp

@@ -261 +261 @@
     p.begin( this );
 
+    // note: drawing dial controls is NOT AT ALL using the QStyle drawing
+    // concept, so we have to draw the Warp4 dial here explicitly in
+    // the widget code!
+    if ( style().styleHint( QStyle::SH_GUIStyle ) == QStyle::PMStyle ) {
+        QRect rr(rect());
+
+        // erase the background
+        QBrush br( paletteBackgroundColor() );
+        p.setPen( QPen::NoPen );
+        p.fillRect( rr, br );
+
+        // centered quadratic rectangle
+        if ( rr.width() > rr.height() ) {
+            rr.setWidth( rr.height() );
+            rr.moveBy( (width() - rr.width()) / 2, 0 );
+        } else {
+            rr.setHeight( rr.width() );
+            rr.moveBy( 0, (height() - rr.height()) / 2 );
+        }
+
+        // draw the ticks ("notches")
+        if ( d->showNotches ) {
+            calcLines();
+            p.setPen( colorGroup().foreground() );
+            p.drawLineSegments( d->lines );
+        }
+
+        // draw dial (circle with shadow)
+        int bigLineSize = calcBigLineSize();
+        int dist = 6;
+        rr.setLeft( rr.left() + bigLineSize + dist );
+        rr.setTop( rr.top() + bigLineSize + dist );
+        rr.setRight( rr.right() - bigLineSize - dist );
+        rr.setBottom( rr.bottom() - bigLineSize - dist );
+        p.setPen( QPen( colorGroup().shadow(), 2) );
+        p.drawEllipse( rr );
+        rr.setLeft( rr.left() + 2 );
+        rr.setTop( rr.top() + 2 );
+        rr.setRight( rr.right() - 2 );
+        rr.setBottom( rr.bottom() - 2 );
+        QPointArray pa;
+        pa.putPoints( 0, 3,
+                      rr.left() - 2, rr.top() - 2,
+                      rr.right() + 2, rr.top() - 2,
+                      rr.left() - 2, rr.bottom() + 2 );
+        p.setClipRegion( QRegion( pa ) );
+        p.setPen( QPen( colorGroup().light(), 2 ) );
+        p.drawEllipse( rr );
+        pa.resize( 0 );
+        pa.putPoints( 0, 3,
+                      rr.right() + 2, rr.top() - 2,
+                      rr.right() + 2, rr.bottom() + 2,
+                      rr.left() - 2, rr.bottom() + 2 );
+        p.setClipRegion( QRegion( pa ) );
+        p.setPen( QPen( colorGroup().dark(), 2 ) );
+        p.drawEllipse( rr );
+        p.setClipping( false );
+
+        // draw pointer (triangle)
+        double a;
+        calcArrow( a );
+        double s = sin( a ),
+               c = cos( a );
+        int r = rr.width() / 2 - 9;
+        double xtr = ((double)rr.left() + rr.right()) * .5 + r * c,
+               ytr = ((double)rr.top() + rr.bottom()) * .5 - r * s;
+        QPointArray ar;
+        ar.putPoints( 0, 3,
+                      (int)(xtr + 3.5 * c), (int)(ytr - 3.5 * s),
+                      (int)(xtr + 4 * cos(a - 2.0944)), (int)(ytr - 4 * sin(a - 2.0944)),
+                      (int)(xtr + 4 * cos(a + 2.0944)), (int)(ytr - 4 * sin(a + 2.0944)) );
+        p.setBrush( colorGroup().foreground() );
+        p.setPen( QPen::NoPen );
+        p.drawPolygon( ar );
+
+        if( hasFocus() )
+            style().drawPrimitive( QStyle::PE_FocusRect, &p, rect(), colorGroup() );
+    }
+
+    // all non-PM styles
+    else
+    {
     bool resetClipping = FALSE;
 
@@ -385 +467 @@
         style().drawPrimitive( QStyle::PE_FocusRect, &p, br, colorGroup());
     }
+    }
+
     p.end();
 }

trunk/src/widgets/qlistview.cpp

@@ -1574 +1574 @@
         for ( uint i = 0; i < lv->d->column.size(); ++i ) {
             if ( pixmap( i ) )
+            {
+                if ( lv->style().styleHint( QStyle::SH_GUIStyle ) == QStyle::PMStyle )
+                    ph = QMAX( ph, pixmap( i )->height() + 4 );
+                else
                 ph = QMAX( ph, pixmap( i )->height() );
+        }
         }
 
@@ -2596 +2601 @@
     d->vci = 0;
     d->timer = new QTimer( this );
+    if ( style().styleHint( QStyle::SH_GUIStyle ) == QStyle::PMStyle )
+        d->levelWidth = 24;
+    else
     d->levelWidth = 20;
     d->r = 0;
@@ -2613 +2621 @@
     d->sortcolumn = 0;
     d->ascending = TRUE;
+    if ( style().styleHint( QStyle::SH_GUIStyle ) == QStyle::PMStyle )
+        d->allColumnsShowFocus = TRUE;
+    else
     d->allColumnsShowFocus = FALSE;
     d->fontMetricsHeight = fontMetrics().height();
@@ -8077 +8088 @@
     if ( d->h->iconSet( col ) )
         w += d->h->iconSet( col )->pixmap().width();
+    if ( style().styleHint( QStyle::SH_GUIStyle ) == QStyle::PMStyle )
+        w = QMAX( w, 24 );
+    else
     w = QMAX( w, 20 );
     QFontMetrics fm( fontMetrics() );

trunk/src/widgets/qmenubar.cpp

@@ -295 +295 @@
     int h = 2*motifBarVMargin + fm.height() + motifItemVMargin + 2*frameWidth() + 2*motifItemFrame;
 
+    if ( style().styleHint( QStyle::SH_GUIStyle ) == QStyle::PMStyle )
+        h++;
+
     setGeometry( 0, 0, width(), h );
 
@@ -483 +486 @@
 void QMenuBar::languageChange()
 {
-    menuContentsChanged(); 
+    menuContentsChanged();
 }
 
@@ -729 +732 @@
     bool reverse = QApplication::reverseLayout();
     const int yoffset = 1; //(style().styleHint( QStyle::SH_GUIStyle ) == QStyle::WindowsStyle) ? 4 : 1; ### this breaks designer mainwindow editing
-    QPoint pos = r.bottomLeft() + QPoint(0,yoffset);
+    // Warp4style: popup menus are displaced by 4
+    const int xoffset = ( style().styleHint( QStyle::SH_GUIStyle ) == QStyle::PMStyle ) ? -4 : 0;
+    QPoint pos = r.bottomLeft() + QPoint( xoffset, yoffset );
     if( reverse ) {
-        pos = r.bottomRight() + QPoint(0,yoffset);
+        pos = r.bottomRight() + QPoint( -xoffset, yoffset );
         pos.rx() -= popup->sizeHint().width();
     }
@@ -913 +918 @@
         x += 2;
         y += 2;
+    } else if ( gs == PMStyle ) {
+        x += 4;
     }
     if ( reverse )
@@ -976 +983 @@
                     x += motifBarHMargin;
                     y += motifBarVMargin;
+                } else if ( gs == PMStyle ) {
+                    x += 5;
                 }
                 if ( reverse )

trunk/src/widgets/qscrollbar.cpp

@@ -941 +941 @@
         flags |= QStyle::Style_Horizontal;
 
+    // For the Warp4 style we need to always check also the "add line" and "sub line"
+    // buttons (they could be activated/deactivated!), so we include them here
+    // for every drawing operation
+    if ( style().styleHint( QStyle::SH_GUIStyle ) == QStyle::PMStyle )
+        controls = controls |
+                   QStyle::SC_ScrollBarSubLine |
+                   QStyle::SC_ScrollBarAddLine;
+
     style().drawComplexControl(QStyle::CC_ScrollBar, p, this, rect(), colorGroup(),
                                flags, (QStyle::SubControl) controls,

trunk/src/widgets/qslider.cpp

@@ -183 +183 @@
     ticks = NoMarks;
     tickInt = 0;
+
+    if ( style().styleHint( QStyle::SH_GUIStyle ) == QStyle::PMStyle )
+        setFocusPolicy( StrongFocus );
+    else
     setFocusPolicy( TabFocus  );
     initTicks();

trunk/src/widgets/qspinwidget.cpp

@@ -136 +136 @@
 
     uint oldButtonDown = d->buttonDown;
-
+    d->buttonDown = 0;
+
+    // With Warp, the up and down buttons are diagonally separated,
+    // so we are disabling the down button entirely and have to find
+    // out the position of the click within the up button in order
+    // to find out what the user wants!
+    int guiStyle = style().styleHint( QStyle::SH_GUIStyle );
+    if ( guiStyle == QStyle::PMStyle ) {
+        if ( d->up.contains( e->pos() ) ) {
+            QPoint rp = e->pos() - d->up.topLeft();
+            if ( d->up.width() > (rp.x() + rp.y()) ) {
+                if ( d->upEnabled )
+                    d->buttonDown = 2;
+            } else {
+                if ( d->downEnabled )
+                    d->buttonDown = 1;
+            }
+        }
+    } else {
     if ( d->down.contains( e->pos() ) && d->downEnabled )
         d->buttonDown = 1;
     else if ( d->up.contains( e->pos() ) && d->upEnabled )
         d->buttonDown = 2;
-    else
-        d->buttonDown = 0;
+    }
 
     d->theButton = d->buttonDown;
@@ -149 +166 @@
             repaint( d->down.unite( d->up ), FALSE );
         } else if ( d->buttonDown & 1 ) {
+            // do all with the "up" button in PM style - see note above
+            if ( guiStyle == QStyle::PMStyle )
+                repaint( d->up, FALSE );
+            else
             repaint( d->down, FALSE );
             stepDown();
+            if ( guiStyle == QStyle::PMStyle )
+                d->startTimer( TRUE, 300 );
+            else
             d->startTimer( FALSE, 300 );
         } else if ( d->buttonDown & 2 ) {
@@ -245 +269 @@
     d->theButton = 0;
     if ( oldButtonDown != d->theButton ) {
-        if ( oldButtonDown & 1 )
+        // do all with the "up" button in PM style -
+        // see note in mousePressEvent
+        int guiStyle = style().styleHint( QStyle::SH_GUIStyle );
+        if ( guiStyle == QStyle::PMStyle )
+            repaint( d->up, FALSE );
+        else if ( oldButtonDown & 1 )
             repaint( d->down, FALSE );
         else if ( oldButtonDown & 2 )
@@ -264 +293 @@
         return;
 
+    // do all with the "up" button in PM style -
+    // see note in mousePressEvent
+    int guiStyle = style().styleHint( QStyle::SH_GUIStyle );
+    uint clickButton = 0;
+    if ( guiStyle == QStyle::PMStyle ) {
+        if( d->up.contains( e->pos() ) ) {
+            QPoint rp = e->pos() - d->up.topLeft();
+            if ( d->up.width() > (rp.x() + rp.y()) )
+                clickButton = 2;
+            else
+                clickButton = 1;
+        }
+    } else {
+        if ( d->down.contains(e->pos()) )
+            clickButton = 1;
+        else if ( d->up.contains(e->pos()) )
+            clickButton = 2;
+    }
+
     uint oldButtonDown = d->theButton;
-    if ( oldButtonDown & 1 && !d->down.contains( e->pos() ) ) {
+    if ( (oldButtonDown & 1) && !(clickButton & 1) ) {
+    //if ( oldButtonDown & 1 && !d->down.contains( e->pos() ) ) {
         d->stopTimer();
         d->theButton = 0;
+        if ( guiStyle == QStyle::PMStyle )
+            repaint( d->up, FALSE );
+        else
         repaint( d->down, FALSE );
-    } else if ( oldButtonDown & 2 && !d->up.contains( e->pos() ) ) {
+    } else if( (oldButtonDown & 2) && !(clickButton & 2) ) {
+    //} else if ( oldButtonDown & 2 && !d->up.contains( e->pos() ) ) {
         d->stopTimer();
         d->theButton = 0;
         repaint( d->up, FALSE );
-    } else if ( !oldButtonDown && d->up.contains( e->pos() ) && d->buttonDown & 2 ) {
+    } else if ( !oldButtonDown && (clickButton & 2) && (d->buttonDown & 2) ) {
+    //} else if ( !oldButtonDown && d->up.contains( e->pos() ) && d->buttonDown & 2 ) {
         d->startTimer( 500 );
         d->theButton = 2;
         repaint( d->up, FALSE );
-    } else if ( !oldButtonDown && d->down.contains( e->pos() ) && d->buttonDown & 1 ) {
+    } else if(!oldButtonDown && (clickButton & 1) && (d->buttonDown & 1)) {
+    //} else if ( !oldButtonDown && d->down.contains( e->pos() ) && d->buttonDown & 1 ) {
         d->startTimer( 500 );
         d->theButton = 1;
+        if ( guiStyle == QStyle::PMStyle )
+            repaint( d->up, FALSE );
+        else
         repaint( d->down, FALSE );
     }