Changeset 8 for trunk/src/dialogs

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

Location:

trunk/src/dialogs

Files:

• qfiledialog.cpp (modified) (11 diffs)
• qmessagebox.cpp (modified) (3 diffs)

trunk/src/dialogs/qfiledialog.cpp

@@ -991 +991 @@
                 return 1;
 
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
             if ( sortFilesBy == QDir::Name ) {
                 QString name1 = i1->name().lower();
@@ -3693 +3693 @@
             if ( !nameEdit->text().contains( "/" ) &&
                  !nameEdit->text().contains( "\\" )
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
                  && nameEdit->text()[ 1 ] != ':'
 #endif
@@ -3700 +3700 @@
             else if ( nameEdit->text()[ 0 ] == '/' ||
                       nameEdit->text()[ 0 ] == '\\'
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
                       || nameEdit->text()[ 1 ] == ':'
 #endif
@@ -4597 +4597 @@
 void QFileDialog::done( int i )
 {
+    // stop any pending operations
+    d->url.stop();
+    
     if ( i == QDialog::Accepted && (d->mode == ExistingFile || d->mode == ExistingFiles) ) {
         QStringList selection = selectedFiles();
@@ -5339 +5342 @@
         if ( ( nameEdit->cursorPosition() == (int)nameEdit->text().length() || nameEdit->hasSelectedText() ) &&
              isprint(((QKeyEvent *)e)->ascii()) ) {
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
             QString nt( nameEdit->text().lower() );
 #else
@@ -5347 +5350 @@
             nt += (char)(((QKeyEvent *)e)->ascii());
             QListViewItem * i = files->firstChild();
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
             while( i && i->text( 0 ).left(nt.length()).lower() != nt )
 #else
@@ -5643 +5646 @@
     if ( u.path() == "/" )
         return TRUE;
-#elif defined(Q_OS_WIN32)
+#elif defined(Q_OS_WIN32) || defined(Q_OS_OS2)
     QString p = u.path();
     if ( p.length() == 3 &&
@@ -5702 +5705 @@
         bool found = FALSE;
         for ( int i = 0; i < d->paths->count(); ++i ) {
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
             if ( d->paths->text( i ).lower() == s.lower() ) {
 #else
@@ -5769 +5772 @@
         if ( !d->hadDotDot && !isRoot( d->url ) ) {
             bool ok = TRUE;
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
             if ( d->url.path().left( 2 ) == "//" )
                 ok = FALSE;
@@ -5857 +5860 @@
             if ( isRoot( d->url ) )
                 continue;
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
             if ( d->url.path().left( 2 ) == "//" )
                 continue;
@@ -5885 +5888 @@
             }
         }
+#elif defined(Q_OS_OS2)
+        if ( !bShowHiddenFiles ) {
+            if ( d->url.isLocalFile() ) {
+                QString file = d->url.path();
+                if ( !file.endsWith( "/" ) )
+                    file.append( "/" );
+                file += inf.name();
+                if ( QFileInfo( file ).isHidden() )
+                    continue;
+            } else {
+                if ( inf.name() != ".." && inf.name()[0] == QChar('.') )
+                    continue;
+            }
+        }
 #else
         if ( !bShowHiddenFiles && inf.name() != ".." ) {

trunk/src/dialogs/qmessagebox.cpp

@@ -53 +53 @@
 #include "qnc_win.h"
 #endif
-
+#if defined(Q_WS_PM)
+//@@TODO (dmik): this is necessary for WinAlarm() which will be
+//  probably removed from here later.
+#include "qt_os2.h"
+#endif
 
 // Internal class - don't touch
@@ -592 +596 @@
             "<p>Qt provides single-source "
             "portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, "
+            "IBM&nbsp;OS/2&nbsp;Warp and eComStation, "
             "Linux, and all major commercial Unix variants."
             "<br>Qt is also available for embedded devices.</p>"
@@ -1034 +1039 @@
 #if defined(QT_ACCESSIBILITY_SUPPORT)
     QAccessible::updateAccessibility( this, 0, QAccessible::Alert );
+#else
+#if defined(Q_WS_PM)
+//@@TODO (dmik): currently, the accessibility support is not implemented
+//  on OS/2, but we still need to play a sound when QMessageBox is opened.
+    ULONG alarmStyle;
+    bool playAlarm = TRUE;
+    switch ( icon() ) {
+        case Warning:
+            alarmStyle = WA_WARNING;
+            break;
+        case Critical:
+            alarmStyle = WA_ERROR;
+            break;
+        case Information:
+            alarmStyle = WA_NOTE;
+            break;
+        default:
+            playAlarm = FALSE;
+            break;
+    }
+    if ( playAlarm )
+        WinAlarm( HWND_DESKTOP, alarmStyle );
+#endif
 #endif
     QDialog::showEvent( e );