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

psi/trunk/src/common.cpp

@@ -27 +27 @@
 
 QString PROG_NAME = "Psi";
+#ifdef Q_WS_PM
+QString PROG_VERSION = "0.10-os2-b1 (" __DATE__ ")"; // OS/2 versions are betas yet
+#else
 //QString PROG_VERSION = "0.11-dev" " (" __DATE__ ")"; //CVS Builds are dated
 QString PROG_VERSION = "0.10";
+#endif
 
 #ifdef HAVE_CONFIG
@@ -58 +62 @@
 #ifdef Q_WS_WIN
 #include<windows.h>
+#endif
+
+#ifdef Q_WS_PM
+#include<sys/types.h>
+#include<sys/stat.h>
 #endif
 
@@ -995 +1004 @@
                 useCustom = FALSE;
 #endif
+#ifdef Q_WS_PM
+        /// @todo (dmik) use HINI_USER_PROFILE\WPURLDEFAULTSETTINGS\DefaultBrowserExe
+#endif
 #ifdef Q_WS_X11
         if(option.browser == 0 || option.browser == 2)
@@ -1040 +1052 @@
                         QMessageBox::critical(0, CAP(QObject::tr("URL error")), QObject::tr("Unable to open the URL. Ensure that you have a web browser installed."));
                 }
+#endif
+#ifdef Q_WS_PM
+        /// @todo (dmik) use HINI_USER_PROFILE\WPURLDEFAULTSETTINGS\DefaultBrowserExe
 #endif
 #ifdef Q_WS_X11
@@ -1102 +1117 @@
 static void getSysInfo()
 {
-#if defined(Q_WS_X11) || defined(Q_WS_MAC)
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_PM)
+        /// @todo (dmik) test it
         time_t x;
         time(&x);
@@ -1206 +1222 @@
                 }
         }
+#elif defined(Q_WS_PM)
+        os_str = "OS/2";
 #elif defined(Q_WS_MAC)
         os_str = "Mac OS X";
@@ -1328 +1346 @@
         else
                 base = QDir::homeDirPath();
+
+        // no trailing slash
+        if(base.at(base.length()-1) == '/')
+                base.truncate(base.length()-1);
+
+        QDir proghome(base + "/PsiData");
+        if(!proghome.exists()) {
+                QDir home(base);
+                home.mkdir("PsiData");
+        }
+
+        return proghome.path();
+}
+#endif
+
+#ifdef Q_WS_PM
+QString getResourcesDir()
+{
+#if QT_VERSION >= 0x030200
+        return qApp->applicationDirPath();
+#else
+#  error Not implemented!
+#endif
+}
+
+QString getHomeDir()
+{
+        QString base = QDir::homeDirPath();
 
         // no trailing slash
@@ -1465 +1511 @@
                 return;
 
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_WS_MAC)
         QSound::play(str);
 #else