Changeset 6169 for trunk/qt-gui

Timestamp:

04/23/08 04:30:09 (7 months ago)

Author:

flynd

Message:

Moved plugin name, config path and name of config file to gui-defines.h.

Location:

trunk/qt-gui/src

Files:

• gui-defines.h (modified) (1 diff)
• licqgui.cpp (modified) (7 diffs)
• mainwin.cpp (modified) (3 diffs)
• skinbrowser.cpp (modified) (5 diffs)

trunk/qt-gui/src/gui-defines.h

@@ -21 +21 @@
 #define GUIDEFINES_H
 
+#ifdef USE_KDE
+# define PLUGIN_NAME "kde-gui"
+#else
+# define PLUGIN_NAME "qt-gui"
+#endif
+
 #define QTGUI_DIR "qt-gui/"
 #define EMOTICONS_DIR "emoticons/"
+#define QTGUI_CONFIGFILE "licq_qt-gui.conf"
 
 #define NUM_MSG_PER_HISTORY 40

trunk/qt-gui/src/licqgui.cpp

@@ -36 +36 @@
 #include <unistd.h> // for getopt
 
+#include "gui-defines.h"
 #include "mainwin.h"
 #include "sigman.h"
@@ -48 +49 @@
 const char *LP_Usage(void)
 {
-#ifdef USE_KDE
-  static const char usage[] =
-    "Usage:  Licq [options] -p kde-gui -- [-h] [-s skinname] [-i iconpack] [-e extendediconpack] [-g gui style]\n"
-    " -h : this help screen\n"
-    " -s : set the skin to use (must be in {base dir}/qt-gui/skin.skinname)\n"
-    " -i : set the icons to use (must be in {base dir}/qt-gui/icons.iconpack)\n"
-    " -e : set the extended icons to use (must be in [base dir]/qt-gui/extended.icons.iconpack)\n"
-    " -g : set the gui style (MOTIF / WINDOWS / MAC / CDE / GTK / SGI / LCD), ignored by KDE support\n"
-    " -d : start hidden (dock icon only)\n"
-    " -D : disable dock icon for this session (does not affect dock icon settings)";
-#else
-  static const char usage[] =
-    "Usage:  Licq [options] -p qt-gui -- [-h] [-s skinname] [-i iconpack] [-e extendediconpack] [-g gui style]\n"
-    " -h : this help screen\n"
-    " -s : set the skin to use (must be in {base dir}/qt-gui/skin.skinname)\n"
-    " -i : set the icons to use (must be in {base dir}/qt-gui/icons.iconpack)\n"
-    " -e : set the extended icons to use (must be in [base dir]/qt-gui/extended.icons.iconpack)\n"
-    " -g : set the gui style (MOTIF / WINDOWS / MAC / CDE / GTK / SGI / LCD), ignored by KDE support\n"
-    " -d : start hidden (dock icon only)\n"
-    " -D : disable dock icon for this session (does not affect dock icon settings)";
-#endif
-
-  return usage;
+  static const QString usage = QString(
+      "Usage:  Licq [options] -p %1 -- [-h] [-s skinname] [-i iconpack] [-e extendediconpack]"
+#ifndef USE_KDE
+      " [-g gui style]"
+#endif
+      "\n"
+      " -h : this help screen\n"
+      " -s : set the skin to use (must be in %2%3skin.skinname)\n"
+      " -i : set the icons to use (must be in %4%5icons.iconpack)\n"
+      " -e : set the extended icons to use (must be in %6%7extended.icons.iconpack)\n"
+#ifndef USE_KDE
+      " -g : set the gui style (%8 or 'default' to follow global Qt settings)\n"
+#endif
+      " -d : start hidden (dock icon only)\n"
+      " -D : disable dock icon for this session (does not affect dock icon settings)"
+      )
+      .arg(PLUGIN_NAME)
+      .arg(BASE_DIR)
+      .arg(QTGUI_DIR)
+      .arg(BASE_DIR)
+      .arg(QTGUI_DIR)
+      .arg(BASE_DIR)
+      .arg(QTGUI_DIR)
+#ifndef USE_KDE
+      .arg(QStyleFactory::keys().join(", "))
+#endif
+      ;
+
+  return usage.latin1();
 }
 
@@ -86 +93 @@
 const char *LP_ConfigFile(void)
 {
-  return "licq_qt-gui.conf";
+  return QTGUI_CONFIGFILE;
 }
 
@@ -216 +223 @@
   char iconsName[32] = "";
   char extendedIconsName[32] = "";
+#ifndef USE_KDE
   char styleName[32] = "";
+#endif
   bool bStartHidden = false;
 
@@ -226 +235 @@
   cmdLineParams += QString(argv[0]);
   cmdLineParams += QString("-p");
-#ifdef USE_KDE
-  cmdLineParams += QString("kde-gui");
-#else
-  cmdLineParams += QString("qt-gui");
-#endif
+  cmdLineParams += QString(PLUGIN_NAME);
   cmdLineParams += QString("--");
   for(int i=1;i<argc;i++)
@@ -256 +261 @@
       extendedIconsName[sizeof(extendedIconsName) - 1] = '\0';
       break;
+#ifndef USE_KDE
     case 'g': // gui style
       strncpy(styleName, optarg, sizeof(styleName));
       styleName[sizeof(styleName) - 1] = '\0';
       break;
+#endif
     case 'd': // dock icon
       if (!m_bDisableDockIcon)
@@ -310 +317 @@
   gLog.Info("%sAttempting to load %s Qt-GUI translation.\n", L_INITxSTR,
             GetLocale());
-  QString str;
-  str.sprintf("%sqt-gui/locale/%s", SHARE_DIR, GetLocale());
   QTranslator *trans = new QTranslator(this);
-  trans->load(str);
+  trans->load(QString("%1" QTGUI_DIR "locale/%2").arg(SHARE_DIR).arg(GetLocale()));
   installTranslator(trans);
 }

trunk/qt-gui/src/mainwin.cpp

@@ -380 +380 @@
   gLog.Info("%sQt GUI configuration.\n", L_INITxSTR);
 #endif
-  snprintf(szTemp, MAX_FILENAME_LEN, "%s/licq_qt-gui.conf", BASE_DIR);
+  snprintf(szTemp, MAX_FILENAME_LEN, "%s/" QTGUI_CONFIGFILE , BASE_DIR);
   szTemp[MAX_FILENAME_LEN - 1] = '\0';
   CIniFile licqConf;
@@ -1195 +1195 @@
     // save window position and size
     char buf[MAX_FILENAME_LEN];
-    snprintf(buf, MAX_FILENAME_LEN, "%s/licq_qt-gui.conf", BASE_DIR);
+    snprintf(buf, MAX_FILENAME_LEN, "%s/" QTGUI_CONFIGFILE, BASE_DIR);
     buf[MAX_FILENAME_LEN - 1] = '\0';
     CIniFile licqConf(INI_FxALLOWxCREATE | INI_FxWARN);
@@ -3427 +3427 @@
   // Save all our options
   char filename[MAX_FILENAME_LEN];
-  snprintf(filename, MAX_FILENAME_LEN, "%s/licq_qt-gui.conf", BASE_DIR);
+  snprintf(filename, MAX_FILENAME_LEN, "%s/" QTGUI_CONFIGFILE, BASE_DIR);
   filename[MAX_FILENAME_LEN - 1] = '\0';
   CIniFile licqConf(INI_FxERROR | INI_FxALLOWxCREATE);

trunk/qt-gui/src/skinbrowser.cpp

@@ -33 +33 @@
 #include "editfile.h"
 #include "ewidgets.h"
+#include "gui-defines.h"
 #include "licq_log.h"
 #include "licq_constants.h"
@@ -177 +178 @@
     if (!dSkins.count() && !dSkinsUser.count())
     {
-        gLog.Error("%sError reading qt-gui directory %s.\n", L_ERRORxSTR, szDir.latin1());
+        gLog.Error("%sError reading " PLUGIN_NAME " directory %s.\n", L_ERRORxSTR, szDir.latin1());
         cmbSkin->insertItem(tr("Error"));
         cmbSkin->setEnabled(false);
@@ -214 +215 @@
     if (!dIcons.count() && !dIconsUser.count())
     {
-        gLog.Error("%sError reading qt-gui directory %s.\n", L_ERRORxSTR, szDir.latin1());
+        gLog.Error("%sError reading " PLUGIN_NAME " directory %s.\n", L_ERRORxSTR, szDir.latin1());
         cmbIcon->insertItem(tr("Error"));
         cmbIcon->setEnabled(false);
@@ -279 +280 @@
     if (!dExtendedIcons.count() && !dExtendedIconsUser.count())
     {
-        gLog.Error("%sError reading qt-gui directory %s.\n", L_ERRORxSTR, szDir.latin1());
+        gLog.Error("%sError reading " PLUGIN_NAME " directory %s.\n", L_ERRORxSTR, szDir.latin1());
         cmbExtIcon->insertItem(tr("Error"));
         cmbExtIcon->setEnabled(false);
@@ -419 +420 @@
 {
   if (!cmbSkin->currentText()) return;
-  QString f;
-  f.sprintf("%s/qt-gui/skin.%s/%s.skin", BASE_DIR,
-            QFile::encodeName(cmbSkin->currentText()).data(),
-            QFile::encodeName(cmbSkin->currentText()).data());
-  if (!QFile(f).exists())
-    f.sprintf("%sqt-gui/skin.%s/%s.skin", SHARE_DIR,
-              QFile::encodeName(cmbSkin->currentText()).data(),
-              QFile::encodeName(cmbSkin->currentText()).data());
+  QString skinName = QFile::encodeName(cmbSkin->currentText());
+  QString f = QTGUI_DIR "skin." + skinName + "/" + skinName + ".skin";
+  QString baseF = QString(BASE_DIR) + "/" + f;
+  if (QFile(baseF).exists())
+    f = baseF;
+  else
+    f = SHARE_DIR + f;
   (void) new EditFileDlg(f);
 }