Changeset 19 for psi/trunk/src/mainwin.cpp

Timestamp:

09/05/06 01:31:01 (2 years ago)

Author:

dmik

Message:

UI: Misc changes:
- Added OS/2-related definitions.
- On all platforms but Mac, the main (roster) window will be minimized (instead of closing) when Esc is pressed, but the doclet window is disabled.

Files:

• psi/trunk/src/mainwin.cpp (modified) (4 diffs)

psi/trunk/src/mainwin.cpp

@@ -449 +449 @@
 void MainWin::setUseDock(bool use)
 {
+#ifdef Q_WS_PM
+        /// @todo (dmik) disable the docklet until the xCenter plugin is implemented
+        //  (this ifdef is necessary in order to share the same config between
+        //  different platforms where the Use Docklet option may be set to true.
+        return;
+#else   
         if(use == false || (d->tray && option.isWMDock != d->tray->isWMDock())) {
                 if(d->tray) {
@@ -478 +484 @@
 
         d->tray->show();
+#endif  
 }
 
@@ -688 +695 @@
 void MainWin::actReadmeActivated ()
 {
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
         ShowTextDlg *w = new ShowTextDlg(g.pathBase + "/readme.txt");
 #else
@@ -868 +875 @@
 #endif
 
-        if(allowed && closekey) {
-                close();
+        if(closekey) {
+#ifdef Q_WS_MAC
+                if(allowed) {
+                        close();
+                        e->accept();
+                        return;
+                }
+#else                   
+                if(allowed)
+                        close();
+                else
+                        showMinimized();
                 e->accept();
                 return;
+#endif
         }