Changeset 5888

Timestamp:

11/28/07 09:26:58 (9 months ago)

Author:

eugene

Message:

• Rectified most paths;
• Moved gui config file into QTGUI_DIR and named config.ini in order to let advanced editors apply their syntax rules;
• Tiny CodingStyle update.

Location:

branches/qt-gui_qt4

Files:

• CMakeLists.txt (modified) (1 diff)
• config.h.cmake (modified) (1 diff)
• src/config/iconmanager.cpp (modified) (2 diffs)
• src/config/skin.cpp (modified) (1 diff)
• src/core/gui-defines.h (modified) (2 diffs)
• src/core/licqgui.cpp (modified) (7 diffs)
• src/dialogs/skinbrowser.cpp (modified) (8 diffs)
• src/dockicons/themeddockicon.cpp (modified) (1 diff)
• src/settings/general.cpp (modified) (1 diff)

branches/qt-gui_qt4/CMakeLists.txt

@@ -24 +24 @@
 mark_as_advanced(INSTALL_DATA_DIR)
 
-if (WITH_KDE)
-  set(INSTALL_QTGUI_DIR kde4-gui CACHE PATH
-    "Icons etc. will be installed to INSTALL_DATA_DIR/licq/INSTALL_QTGUI_DIR.")
-else (WITH_KDE)
-  set(INSTALL_QTGUI_DIR qt4-gui CACHE PATH
-    "Icons etc. will be installed to INSTALL_DATA_DIR/licq/INSTALL_QTGUI_DIR.")
-endif (WITH_KDE)
+set(INSTALL_QTGUI_DIR qt4-gui CACHE PATH
+  "Icons etc. will be installed to INSTALL_DATA_DIR/licq/INSTALL_QTGUI_DIR.")
 mark_as_advanced(INSTALL_QTGUI_DIR)
-set(QTGUI_DIR "${INSTALL_QTGUI_DIR}/")
 
 

branches/qt-gui_qt4/config.h.cmake

@@ -17 +17 @@
 #cmakedefine HAVE_LIBGPGME 1
 
-/* Installation paths */
-#define QTGUI_DIR "@QTGUI_DIR@"
-
 #endif

branches/qt-gui_qt4/src/config/iconmanager.cpp

@@ -99 +99 @@
 
   QString iconListName = iconSet + ".icons";
-  QString subdir = QString::fromLocal8Bit(QTGUI_DIR) + QString::fromLocal8Bit(ICONS_DIR) + iconSet + "/";
+  QString subdir = QString(QTGUI_DIR) + ICONS_DIR + iconSet + "/";
   QString iconPath = QString::fromLocal8Bit(BASE_DIR) + subdir;
   if (!fIconsConf.LoadFile((iconPath + iconListName).toLocal8Bit()))
@@ -215 +215 @@
 
   QString iconListName = iconSet + ".icons";
-  QString subdir = QString::fromLocal8Bit(QTGUI_DIR) + QString::fromLocal8Bit(EXTICONS_DIR) + iconSet + "/";
+  QString subdir = QString(QTGUI_DIR) + EXTICONS_DIR + iconSet + "/";
   QString iconPath = QString::fromLocal8Bit(BASE_DIR) + subdir;
   if (!fIconsConf.LoadFile((iconPath + iconListName).toLocal8Bit()))

branches/qt-gui_qt4/src/config/skin.cpp

@@ -65 +65 @@
 
   QString skinFileName = skinName + ".skin";
-  QString subdir = QString::fromLocal8Bit(QTGUI_DIR) + QString::fromLocal8Bit(SKINS_DIR) + skinName + "/";
+  QString subdir = QString(QTGUI_DIR) + SKINS_DIR + skinName + "/";
   QString baseSkinDir = QString::fromLocal8Bit(BASE_DIR) + subdir;
   if (!skinFile.LoadFile((baseSkinDir + skinFileName).toLocal8Bit()))

branches/qt-gui_qt4/src/core/gui-defines.h

@@ -23 +23 @@
 #include "config.h"
 
+#define QTGUI_DIR "qt4-gui/"
 #define DOCK_DIR "dock/"
 #define EMOTICONS_DIR "emoticons/"
@@ -28 +29 @@
 #define ICONS_DIR "icons/"
 #define SKINS_DIR "skins/"
-#define QTGUI_CONFIGFILE "licq_qt-gui.conf"
+#define QTGUI_CONFIGFILE QTGUI_DIR "config.ini"
 
 #define MAX_COLUMNCOUNT 4

branches/qt-gui_qt4/src/core/licqgui.cpp

@@ -121 +121 @@
   // We need to catch that here and tell the Xlib that we
   // ignore it, otherwise Qt's handler will terminate us. :-(
-  if(err->error_code == BadDrawable)
+  if (err->error_code == BadDrawable)
     return 0;
 
@@ -191 +191 @@
   char* ptr;
   char buf[MAX_FILENAME_LEN];
-  snprintf(buf, MAX_FILENAME_LEN, "%s/licq_qt-gui.style", BASE_DIR);
+  snprintf(buf, MAX_FILENAME_LEN, "%s%sstyle.ini", BASE_DIR, QTGUI_DIR);
   buf[MAX_FILENAME_LEN - 1] = '\0';
 
@@ -265 +265 @@
 
   gLog.Info("%s%s configuration.\n", L_INITxSTR, PLUGIN_NAME);
-  snprintf(szTemp, MAX_FILENAME_LEN, "%s/%s", BASE_DIR, QTGUI_CONFIGFILE);
+  snprintf(szTemp, MAX_FILENAME_LEN, "%s%s", BASE_DIR, QTGUI_CONFIGFILE);
   szTemp[MAX_FILENAME_LEN - 1] = '\0';
   CIniFile licqConf;
   if (!licqConf.LoadFile(szTemp))
   {
-    // File doesn't exist so define sections and write them now so saving won't generate warnings later
+    // File doesn't exist so define sections and write them now
+    // so saving won't generate warnings later
     licqConf.SetFlags(INI_FxALLOWxCREATE);
     licqConf.ReloadFile();
@@ -308 +309 @@
   licqConf.ReadStr("Emoticons", szTemp, Emoticons::DEFAULT_THEME.toLatin1());
   QStringList emoticonsDirs;
-  emoticonsDirs += QString::fromLatin1(SHARE_DIR) + QTGUI_DIR + EMOTICONS_DIR;
-  emoticonsDirs += QString::fromLatin1(BASE_DIR) + QTGUI_DIR + EMOTICONS_DIR;
+  emoticonsDirs += QString::fromLocal8Bit(SHARE_DIR) + QTGUI_DIR + EMOTICONS_DIR;
+  emoticonsDirs += QString::fromLocal8Bit(BASE_DIR) + QTGUI_DIR + EMOTICONS_DIR;
 #ifdef USE_KDE
   // emoticons resource added in KDE 3.4
@@ -352 +353 @@
 {
   char szTemp[MAX_FILENAME_LEN];
-  snprintf(szTemp, MAX_FILENAME_LEN, "%s/%s", BASE_DIR, QTGUI_CONFIGFILE);
+  snprintf(szTemp, MAX_FILENAME_LEN, "%s%s", BASE_DIR, QTGUI_CONFIGFILE);
   szTemp[MAX_FILENAME_LEN - 1] = '\0';
   CIniFile licqConf;
@@ -387 +388 @@
   // Save all our options
   char filename[MAX_FILENAME_LEN];
-  snprintf(filename, MAX_FILENAME_LEN, "%s/%s", BASE_DIR, QTGUI_CONFIGFILE);
+  snprintf(filename, MAX_FILENAME_LEN, "%s%s", BASE_DIR, QTGUI_CONFIGFILE);
   filename[MAX_FILENAME_LEN - 1] = '\0';
   CIniFile licqConf(INI_FxERROR | INI_FxALLOWxCREATE);
-  if (!licqConf.LoadFile(filename)) return;
+
+  if (!licqConf.LoadFile(filename))
+    return;
 
   Config::General::instance()->saveConfiguration(licqConf);
@@ -1072 +1075 @@
   {
     if (!myLicqDaemon->ViewUrl(url.toLocal8Bit().data()))
-      WarnUser(parent, tr("Licq is unable to start your browser and open the URL.\nYou will need to start the browser and open the URL manually."));
+      WarnUser(parent,
+          tr("Licq is unable to start your browser and open the URL.\n"
+            "You will need to start the browser and open the URL manually."));
   }
 }

branches/qt-gui_qt4/src/dialogs/skinbrowser.cpp

@@ -208 +208 @@
 
   // Load up the available packs
-  QString szDir, szDirUser;
-  szDir.sprintf("%s%s", SHARE_DIR, QTGUI_DIR);
-  szDirUser.sprintf("%s%s", BASE_DIR, QTGUI_DIR);
+  QString szDir = QString::fromLocal8Bit(SHARE_DIR) + QTGUI_DIR;
+  QString szDirUser = QString::fromLocal8Bit(BASE_DIR) + QTGUI_DIR;
   QDir dSkins(szDir + SKINS_DIR);
   QDir dSkinsUser(szDirUser + SKINS_DIR);
@@ -239 +238 @@
       int num = cmbSkin->count();
       bool dup = false;
-      for (int i=0; i < num; i++)
+      for (int i = 0; i < num; i++)
         if (*it == cmbSkin->itemText(i))
           dup = true;
@@ -274 +273 @@
       if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
       {
-        WarnUser(this, tr("Unable to open icons file\n%1\nIconset '%2' has been disabled.").arg(iconsFile).arg(*it));
+        WarnUser(this,
+            tr("Unable to open icons file\n%1\nIconset '%2' has been disabled.")
+            .arg(iconsFile)
+            .arg(*it));
         dIcons.cdUp();
         continue;
@@ -306 +308 @@
       int num = cmbIcon->count();
       bool dup = false;
-      for (int i=0; i < num; i++)
+      for (int i = 0; i < num; i++)
       {
         if (*it == cmbIcon->itemText(i))
@@ -348 +350 @@
       if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
       {
-        WarnUser(this, tr("Unable to open extended icons file\n%1\nExtended Iconset '%2' has been disabled.").arg(iconsFile).arg(*it));
+        WarnUser(this,
+            tr("Unable to open extended icons file\n%1\n"
+              "Extended Iconset '%2' has been disabled.")
+            .arg(iconsFile)
+            .arg(*it));
         dExtendedIcons.cdUp();
         continue;
@@ -370 +376 @@
       if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
       {
-        WarnUser(this, tr("Unable to open extended icons file\n%1\nExtended Iconset '%2' has been disabled.").arg(iconsFile).arg(*it));
+        WarnUser(this,
+            tr("Unable to open extended icons file\n%1\n"
+              "Extended Iconset '%2' has been disabled.")
+            .arg(iconsFile)
+            .arg(*it));
         dExtendedIconsUser.cdUp();
         continue;
@@ -517 +527 @@
   // force a sane state and then load all icons into the valuelist
   lstIcons->clear();
-  QString iconsFile = QString("%1%2%3%4/%4.icons").arg(BASE_DIR).arg(QTGUI_DIR).arg(ICONS_DIR).arg(icon);
+  QString iconsFile = QString::fromLocal8Bit(BASE_DIR) + QTGUI_DIR + ICONS_DIR +
+    icon + "/" + icon + ".icons";
   char sFileName[MAX_FILENAME_LEN] = "";
   CIniFile fIconsConf;
   if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
   {
-    iconsFile = QString("%1%2%3%4/%4.icons").arg(SHARE_DIR).arg(QTGUI_DIR).arg(ICONS_DIR).arg(icon);
+    iconsFile = QString::fromLocal8Bit(SHARE_DIR) + QTGUI_DIR + ICONS_DIR +
+      icon + "/" + icon + ".icons";
     if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
     {
@@ -551 +563 @@
   // force a sane state and then load all icons into the valuelist
   lstExtIcons->clear();
-  QString iconsFile = QString("%1%2%3%4/%4.icons").arg(BASE_DIR).arg(QTGUI_DIR).arg(EXTICONS_DIR).arg(extIcon);
+  QString iconsFile = QString::fromLocal8Bit(BASE_DIR) + QTGUI_DIR +
+    EXTICONS_DIR + extIcon + "/" + extIcon + ".icons";
   char sFileName[MAX_FILENAME_LEN] = "";
   CIniFile fIconsConf;
   if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
   {
-    iconsFile = QString("%1%2%3%4/%4.icons").arg(SHARE_DIR).arg(QTGUI_DIR).arg(EXTICONS_DIR).arg(extIcon);
+    iconsFile = QString::fromLocal8Bit(SHARE_DIR) + QTGUI_DIR +
+      EXTICONS_DIR + extIcon + "/" + extIcon + ".icons";
     if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
     {

branches/qt-gui_qt4/src/dockicons/themeddockicon.cpp

@@ -63 +63 @@
     baseDockDir = myTheme;
     if (baseDockDir[baseDockDir.length() - 1] != '/')
-      baseDockDir += QString("/");
+      baseDockDir += "/";
   }
   else
-    baseDockDir.sprintf("%s%s%s%s/",
-        SHARE_DIR, QTGUI_DIR, DOCK_DIR, myTheme.toLatin1().data());
+    baseDockDir = QString::fromLocal8Bit(SHARE_DIR) + QTGUI_DIR +
+      DOCK_DIR + myTheme + "/";
 
   QByteArray filename = QFile::encodeName(baseDockDir);

branches/qt-gui_qt4/src/settings/general.cpp

@@ -96 +96 @@
   cmbDockTheme = new QComboBox();
   // Set the currently available themes
-  QString szDockThemesDir;
-  szDockThemesDir.sprintf("%s%s%s", SHARE_DIR, QTGUI_DIR, DOCK_DIR);
+  QString szDockThemesDir = QString::fromLocal8Bit(SHARE_DIR) + QTGUI_DIR + DOCK_DIR;
   QDir d(szDockThemesDir);
   d.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);