Changeset 19 for psi/trunk/src/options/opt_application.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/options/opt_application.cpp (modified) (4 diffs)

psi/trunk/src/options/opt_application.cpp

@@ -79 +79 @@
         d->gb_docklet->hide();
 #endif
+#ifdef Q_WS_PM
+        /// @todo (dmik) disable "always on top" until implemented in Qt/2  
+        d->ck_alwaysOnTop->hide();
+        /// @todo (dmik) disable the docklet until the xCenter plugin is implemented
+        d->ck_docklet->hide();
+        d->gb_docklet->hide();
+#endif
 #ifndef Q_WS_X11
         d->ck_dockUseWM->hide();
@@ -86 +93 @@
 }
 
+#ifdef Q_WS_X11
 static int om_x11browse[] = { 0, 2, 1 };
+#endif
 
 void OptionsTabApplication::applyOptions(Options *opt)
@@ -143 +152 @@
         selectBrowser( opt->browser );
 #endif
+#ifdef Q_WS_PM
+        d->cb_link->insertItem(tr("PM Default Browser/Mail"));
+        d->cb_link->insertItem(tr("Custom"));
+        d->cb_link->setCurrentItem( opt->browser );
+        selectBrowser( opt->browser );
+#endif
 #ifdef Q_WS_X11
         d->cb_link->insertItem(tr("KDE Default Browser/Mail"));
@@ -179 +194 @@
 
 #ifdef Q_WS_WIN
+        if(x == 0)
+                enableCustom = FALSE;
+#endif
+#ifdef Q_WS_PM
         if(x == 0)
                 enableCustom = FALSE;