Changeset 5333

Timestamp:

09/12/07 10:01:34 (15 months ago)

Author:

eugene

Message:

Updated source files to reflect the new data files directory structure.

Location:

branches/qt-gui_qt4

Files:

• config.h.cmake (modified) (1 diff)
• src/dockicons/themeddockicon.cpp (modified) (1 diff)
• src/gui-defines.h (modified) (1 diff)
• src/licqgui.cpp (modified) (2 diffs)
• src/mainwin.cpp (modified) (4 diffs)
• src/optionsdlg.cpp (modified) (1 diff)
• src/skin.cpp (modified) (2 diffs)
• src/skinbrowser.cpp (modified) (14 diffs)

branches/qt-gui_qt4/config.h.cmake

@@ -19 +19 @@
 /* Installation paths */
 #define QTGUI_DIR "@QTGUI_DIR@"
+#define DOCK_DIR "dock/"
+#define EMOTICONS_DIR "emoticons/"
+#define EXTICONS_DIR "exticons/"
+#define ICONS_DIR "icons/"
+#define SKINS_DIR "skins/"
 
 #endif

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

@@ -77 +77 @@
   }
   else
-    baseDockDir.sprintf("%s%sdock.%s/", SHARE_DIR, QTGUI_DIR, theme.toLatin1().data());
+    baseDockDir.sprintf("%s%s%s%s/", SHARE_DIR, QTGUI_DIR, DOCK_DIR, theme.toLatin1().data());
   QByteArray filename = QFile::encodeName(baseDockDir);
   filename.append(theme);

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

@@ -20 +20 @@
 #ifndef GUIDEFINES_H
 #define GUIDEFINES_H
-
-#define EMOTICONS_DIR "emoticons/"
 
 #define NUM_MSG_PER_HISTORY 40

branches/qt-gui_qt4/src/licqgui.cpp

@@ -61 +61 @@
     "Usage:  Licq [options] -p "PLUGIN_NAME" -- [-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}/"QTGUI_DIR"skin.skinname)\n"
-    " -i : set the icons to use (must be in {base_dir}/"QTGUI_DIR"icons.iconpack)\n"
-    " -e : set the extended icons to use (must be in {base_dir}/"QTGUI_DIR"extended.icons.iconpack)\n"
+    " -s : set the skin to use (must be in {base_dir}/"QTGUI_DIR SKINS_DIR"skinname)\n"
+    " -i : set the icons to use (must be in {base_dir}/"QTGUI_DIR ICONS_DIR"iconpack)\n"
+    " -e : set the extended icons to use (must be in {base_dir}/"QTGUI_DIR EXTICONS_DIR"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"
@@ -84 +84 @@
 const char *LP_ConfigFile(void)
 {
-  return "licq_qt-gui.conf";
+  static const char file[] = "licq_qt-gui.conf";
+  return file;
 }
 

branches/qt-gui_qt4/src/mainwin.cpp

@@ -3188 +3188 @@
    else
    {
-     snprintf(sIconPath, MAX_FILENAME_LEN, "%s%sextended.icons.%s/", BASE_DIR, QTGUI_DIR, _sIconSet);
+     snprintf(sIconPath, MAX_FILENAME_LEN, "%s%s%s%s/", BASE_DIR, QTGUI_DIR, EXTICONS_DIR, _sIconSet);
      sIconPath[MAX_FILENAME_LEN - 1] = '\0';
    }
@@ -3196 +3196 @@
    if (!fIconsConf.LoadFile(sFilename))
    {
-     snprintf(sIconPath, MAX_FILENAME_LEN, "%s%sextended.icons.%s/", SHARE_DIR, QTGUI_DIR, _sIconSet);
+     snprintf(sIconPath, MAX_FILENAME_LEN, "%s%s%s%s/", SHARE_DIR, QTGUI_DIR, EXTICONS_DIR, _sIconSet);
      sIconPath[MAX_FILENAME_LEN - 1] = '\0';
      snprintf(sFilename, MAX_FILENAME_LEN, "%s%s.icons", sIconPath, _sIconSet);
@@ -3329 +3329 @@
    else
    {
-     snprintf(sIconPath, MAX_FILENAME_LEN, "%s%sicons.%s/", BASE_DIR, QTGUI_DIR, _sIconSet);
+     snprintf(sIconPath, MAX_FILENAME_LEN, "%s%s%s%s/", BASE_DIR, QTGUI_DIR, ICONS_DIR, _sIconSet);
      sIconPath[MAX_FILENAME_LEN - 1] = '\0';
    }
@@ -3337 +3337 @@
    if (!fIconsConf.LoadFile(sFilename))
    {
-     snprintf(sIconPath, MAX_FILENAME_LEN, "%s%sicons.%s/", SHARE_DIR, QTGUI_DIR, _sIconSet);
+     snprintf(sIconPath, MAX_FILENAME_LEN, "%s%s%s%s/", SHARE_DIR, QTGUI_DIR, ICONS_DIR, _sIconSet);
      sIconPath[MAX_FILENAME_LEN - 1] = '\0';
      snprintf(sFilename, MAX_FILENAME_LEN, "%s%s.icons", sIconPath, _sIconSet);

branches/qt-gui_qt4/src/optionsdlg.cpp

@@ -758 +758 @@
   // Set the currently available themes
   QString szDockThemesDir;
-  szDockThemesDir.sprintf("%s%s", SHARE_DIR, QTGUI_DIR);
-  QDir d(szDockThemesDir, "dock.*", QDir::Name, QDir::Dirs | QDir::Readable);
-  QStringList s = d.entryList();
-  QStringList::Iterator sit;
-  for (sit = s.begin(); sit != s.end(); sit++)
-    (*sit).remove(0, 5);
-  cmbDockTheme->addItems(s);
+  szDockThemesDir.sprintf("%s%s%s", SHARE_DIR, QTGUI_DIR, DOCK_DIR);
+  QDir d(szDockThemesDir);
+  d.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
+  cmbDockTheme->addItems(d.entryList());
   connect(rdbDockDefault, SIGNAL(toggled(bool)), chkDockFortyEight, SLOT(setEnabled(bool)));
   connect(rdbDockThemed, SIGNAL(toggled(bool)), cmbDockTheme, SLOT(setEnabled(bool)));

branches/qt-gui_qt4/src/skin.cpp

@@ -46 +46 @@
    else
    {
-     snprintf(baseSkinDir, MAX_FILENAME_LEN, "%s%sskin.%s/", BASE_DIR, QTGUI_DIR, skinname);
+     snprintf(baseSkinDir, MAX_FILENAME_LEN, "%s%s%s%s/", BASE_DIR, QTGUI_DIR, SKINS_DIR, skinname);
      baseSkinDir[MAX_FILENAME_LEN - 1] = '\0';
    }
@@ -56 +56 @@
    if (!skinFile.LoadFile(filename))
    {
-     snprintf(baseSkinDir, MAX_FILENAME_LEN, "%s%sskin.%s/", SHARE_DIR, QTGUI_DIR, skinname);
+     snprintf(baseSkinDir, MAX_FILENAME_LEN, "%s%s%s%s/", SHARE_DIR, QTGUI_DIR, SKINS_DIR, skinname);
      baseSkinDir[MAX_FILENAME_LEN - 1] = '\0';
      snprintf(filename, MAX_FILENAME_LEN, "%s%s.skin", baseSkinDir, skinname);

branches/qt-gui_qt4/src/skinbrowser.cpp

@@ -70 +70 @@
 
   // Setup a list of previewable icons
-  // The strings reflect what we exptect to find in the *.icons files.
+  // The strings reflect what we expect to find in the icon files.
   // The result of these two lists is used to load the icons, the order of
   // this list will be the order that the icons get rendered in the preview.
@@ -189 +189 @@
   szDir.sprintf("%s%s", SHARE_DIR, QTGUI_DIR);
   szDirUser.sprintf("%s%s", BASE_DIR, QTGUI_DIR);
-  QDir dSkins(szDir, "skin.*", QDir::Name | QDir::IgnoreCase, QDir::Dirs);
-  QDir dSkinsUser(szDirUser, "skin.*", QDir::Name | QDir::IgnoreCase, QDir::Dirs);
+  QDir dSkins(szDir + SKINS_DIR);
+  QDir dSkinsUser(szDirUser + SKINS_DIR);
+  dSkins.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
+  dSkinsUser.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
   if (!dSkins.count() && !dSkinsUser.count())
   {
@@ -204 +206 @@
     for (it = lst.begin(); it != lst.end(); ++it)
     {
-      cmbSkin->addItem((*it).mid(5));
-      if (current == (*it).mid(5))
+      cmbSkin->addItem(*it);
+      if (current == *it)
         cmbSkin->setCurrentIndex(cmbSkin->count() - 1);
     }
@@ -216 +218 @@
       bool dup = false;
       for (int i=0; i < num; i++)
-        if ((*it).mid(5) == cmbSkin->itemText(i)) dup = true;
+        if (*it == cmbSkin->itemText(i))
+          dup = true;
       if (!dup)
       {
-        cmbSkin->addItem((*it).mid(5));
-        if (current == (*it).mid(5))
+        cmbSkin->addItem(*it);
+        if (current == *it)
           cmbSkin->setCurrentIndex(cmbSkin->count() - 1);
       }
@@ -226 +229 @@
   }
 
-  QDir dIcons(szDir, "icons.*", QDir::Name | QDir::IgnoreCase, QDir::Dirs);
-  QDir dIconsUser(szDirUser, "icons.*", QDir::Name | QDir::IgnoreCase, QDir::Dirs);
+  QDir dIcons(szDir + ICONS_DIR);
+  QDir dIconsUser(szDirUser + ICONS_DIR);
+  dIcons.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
+  dIconsUser.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
   if (!dIcons.count() && !dIconsUser.count())
   {
@@ -241 +246 @@
     for (it = lst.begin(); it != lst.end(); ++it)
     {
-      QString iconsFile = QString("%1%2icons.%3/%4.icons").arg(SHARE_DIR).arg(QTGUI_DIR).arg((*it).mid(6)).arg((*it).mid(6));
+      dIcons.cd(*it);
+      QString iconsFile = QString("%1/%2.icons").arg(dIcons.path()).arg(*it);
       char sFileName[MAX_FILENAME_LEN] = "";
       CIniFile fIconsConf;
       if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
       {
-        WarnUser(this, tr("Unable to open icons file\n%1\nIconset '%2' has been disabled.").arg(iconsFile).arg((*it).mid(6)));
+        WarnUser(this, tr("Unable to open icons file\n%1\nIconset '%2' has been disabled.").arg(iconsFile).arg(*it));
+        dIcons.cdUp();
         continue;
       }
       fIconsConf.SetSection("icons");
       fIconsConf.ReadStr("Online", sFileName, "");
-      QString pmFile = QString("%1%2icons.%3/%4").arg(SHARE_DIR).arg(QTGUI_DIR).arg((*it).mid(6)).arg(sFileName);
-      cmbIcon->addItem(QPixmap(pmFile), (*it).mid(6));
-      if (current == (*it).mid(6))
+      QString pmFile = QString("%1/%2").arg(dIcons.path()).arg(sFileName);
+      cmbIcon->addItem(QPixmap(pmFile), *it);
+      if (current == *it)
         cmbIcon->setCurrentIndex(cmbIcon->count() - 1);
+      dIcons.cdUp();
     }
     // check for icons in current base dir, too
@@ -260 +268 @@
     for (it = lst.begin(); it != lst.end(); ++it)
     {
-      QString iconsFile = QString("%1%2icons.%3/%4.icons").arg(BASE_DIR).arg(QTGUI_DIR).arg((*it).mid(6)).arg((*it).mid(6));
+      dIconsUser.cd(*it);
+      QString iconsFile = QString("%1/%2.icons").arg(dIconsUser.path()).arg(*it);
       char sFileName[MAX_FILENAME_LEN] = "";
       CIniFile fIconsConf;
       if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
       {
-        WarnUser(this, tr("Unable to open icons file\n%1\nIconset '%2' has been disabled.").arg(iconsFile).arg((*it).mid(6)));
+        WarnUser(this, tr("Unable to open icons file\n%1\nIconset '%2' has been disabled.").arg(iconsFile).arg(*it));
+        dIconsUser.cdUp();
         continue;
       }
       fIconsConf.SetSection("icons");
       fIconsConf.ReadStr("Online", sFileName, "");
-      QString pmFile = QString("%1%2icons.%3/%4").arg(BASE_DIR).arg(QTGUI_DIR).arg((*it).mid(6)).arg(sFileName);
+      QString pmFile = QString("%1/%2").arg(dIconsUser.path()).arg(sFileName);
       // Check for duplicates
       int num = cmbIcon->count();
@@ -276 +286 @@
       for (int i=0; i < num; i++)
       {
-        if ((*it).mid(6) == cmbIcon->itemText(i))
+        if (*it == cmbIcon->itemText(i))
         {
           dup = true;
           cmbIcon->setItemIcon(i, QPixmap(pmFile));
-          cmbIcon->setItemText(i, (*it).mid(6));
+          cmbIcon->setItemText(i, *it);
         }
       }
       if (!dup)
       {
-        cmbIcon->addItem(QPixmap(pmFile), (*it).mid(6));
-        if (current == (*it).mid(6))
+        cmbIcon->addItem(QPixmap(pmFile), *it);
+        if (current == *it)
           cmbIcon->setCurrentIndex(cmbIcon->count() - 1);
       }
-    }
-  }
-
-  QDir dExtendedIcons(szDir, "extended.icons.*", QDir::Name | QDir::IgnoreCase, QDir::Dirs);
-  QDir dExtendedIconsUser(szDirUser, "extended.icons.*", QDir::Name | QDir::IgnoreCase, QDir::Dirs);
+      dIconsUser.cdUp();
+    }
+  }
+
+  QDir dExtendedIcons(szDir + EXTICONS_DIR);
+  QDir dExtendedIconsUser(szDirUser + EXTICONS_DIR);
+  dExtendedIcons.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
+  dExtendedIconsUser.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
   if (!dExtendedIcons.count() && !dExtendedIconsUser.count())
   {
@@ -307 +320 @@
     for (it = lst.begin(); it != lst.end(); ++it)
     {
-      QString iconsFile = QString("%1%2extended.icons.%3/%4.icons").arg(SHARE_DIR).arg(QTGUI_DIR).arg((*it).mid(15)).arg((*it).mid(15));
+      dExtendedIcons.cd(*it);
+      QString iconsFile = QString("%1/%2.icons").arg(dExtendedIcons.path()).arg(*it);
       char sFileName[MAX_FILENAME_LEN] = "";
       CIniFile fIconsConf;
       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).mid(15)));
+        WarnUser(this, tr("Unable to open extended icons file\n%1\nExtended Iconset '%2' has been disabled.").arg(iconsFile).arg(*it));
+        dExtendedIcons.cdUp();
         continue;
       }
       fIconsConf.SetSection("icons");
       fIconsConf.ReadStr("Phone", sFileName, "");
-      QString pmFile = QString("%1%2extended.icons.%3/%4").arg(SHARE_DIR).arg(QTGUI_DIR).arg((*it).mid(15)).arg(sFileName);
-      cmbExtIcon->addItem(QPixmap(pmFile), (*it).mid(15));
-      if (current == (*it).mid(15))
+      QString pmFile = QString("%1/%2").arg(dExtendedIcons.path()).arg(sFileName);
+      cmbExtIcon->addItem(QPixmap(pmFile), *it);
+      if (current == *it)
         cmbExtIcon->setCurrentIndex(cmbExtIcon->count() - 1);
+      dExtendedIcons.cdUp();
     }
     // check for ext. icons in current base dir, too
@@ -326 +342 @@
     for (it = lst.begin(); it != lst.end(); ++it)
     {
-      QString iconsFile = QString("%1%2extended.icons.%3/%4.icons").arg(BASE_DIR).arg(QTGUI_DIR).arg((*it).mid(15)).arg((*it).mid(15));
+      dExtendedIconsUser.cd(*it);
+      QString iconsFile = QString("%1/%2.icons").arg(dExtendedIconsUser.path()).arg(*it);
       char sFileName[MAX_FILENAME_LEN] = "";
       CIniFile fIconsConf;
       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).mid(15)));
+        WarnUser(this, tr("Unable to open extended icons file\n%1\nExtended Iconset '%2' has been disabled.").arg(iconsFile).arg(*it));
+        dExtendedIconsUser.cdUp();
         continue;
       }
       fIconsConf.SetSection("icons");
       fIconsConf.ReadStr("Phone", sFileName, "");
-      QString pmFile = QString("%1%2extended.icons.%3/%4").arg(BASE_DIR).arg(QTGUI_DIR).arg((*it).mid(15)).arg(sFileName);
+      QString pmFile = QString("%1/%2").arg(dExtendedIconsUser.path()).arg(sFileName);
       // Check for duplicates
       int num = cmbExtIcon->count();
@@ -342 +360 @@
       for (int i=0; i < num; i++)
       {
-        if ((*it).mid(15) == cmbExtIcon->itemText(i))
+        if (*it == cmbExtIcon->itemText(i))
         {
           dup = true;
           cmbExtIcon->setItemIcon(i, QPixmap(pmFile));
-          cmbExtIcon->setItemText(i, (*it).mid(15));
+          cmbExtIcon->setItemText(i, *it);
         }
       }
       if (!dup)
       {
-        cmbExtIcon->addItem(QPixmap(pmFile), (*it).mid(15));
-        if (current == (*it).mid(15))
+        cmbExtIcon->addItem(QPixmap(pmFile), *it);
+        if (current == *it)
           cmbExtIcon->setCurrentIndex(cmbExtIcon->count() - 1);
       }
+      dExtendedIconsUser.cdUp();
     }
   }
@@ -438 +457 @@
   if (cmbSkin->currentText().isEmpty()) return;
   QString f;
-  f.sprintf("%s%sskin.%s/%s.skin", BASE_DIR, QTGUI_DIR,
+  f.sprintf("%s%s%s%s/%s.skin", BASE_DIR, QTGUI_DIR, SKINS_DIR,
             QFile::encodeName(cmbSkin->currentText()).data(),
             QFile::encodeName(cmbSkin->currentText()).data());
   if (!QFile(f).exists())
-    f.sprintf("%s%sskin.%s/%s.skin", SHARE_DIR, QTGUI_DIR,
+    f.sprintf("%s%s%s%s/%s.skin", SHARE_DIR, QTGUI_DIR, SKINS_DIR,
               QFile::encodeName(cmbSkin->currentText()).data(),
               QFile::encodeName(cmbSkin->currentText()).data());
@@ -469 +488 @@
   // force a sane state and then load all icons into the valuelist
   lstIcons->clear();
-  QString iconsFile = QString("%1%2icons.%3/%4.icons").arg(BASE_DIR).arg(QTGUI_DIR).arg(icon).arg(icon);
+  QString iconsFile = QString("%1%2%3%4/%4.icons").arg(BASE_DIR).arg(QTGUI_DIR).arg(ICONS_DIR).arg(icon);
   char sFileName[MAX_FILENAME_LEN] = "";
   CIniFile fIconsConf;
   if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
   {
-    iconsFile = QString("%1%2icons.%3/%4.icons").arg(SHARE_DIR).arg(QTGUI_DIR).arg(icon).arg(icon);
+    iconsFile = QString("%1%2%3%4/%4.icons").arg(SHARE_DIR).arg(QTGUI_DIR).arg(ICONS_DIR).arg(icon);
     if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
     {
@@ -503 +522 @@
   // force a sane state and then load all icons into the valuelist
   lstExtIcons->clear();
-  QString iconsFile = QString("%1%2extended.icons.%3/%4.icons").arg(BASE_DIR).arg(QTGUI_DIR).arg(extIcon).arg(extIcon);
+  QString iconsFile = QString("%1%2%3%4/%4.icons").arg(BASE_DIR).arg(QTGUI_DIR).arg(EXTICONS_DIR).arg(extIcon);
   char sFileName[MAX_FILENAME_LEN] = "";
   CIniFile fIconsConf;
   if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
   {
-    iconsFile = QString("%1%2extended.icons.%3/%4.icons").arg(SHARE_DIR).arg(QTGUI_DIR).arg(extIcon).arg(extIcon);
+    iconsFile = QString("%1%2%3%4/%4.icons").arg(SHARE_DIR).arg(QTGUI_DIR).arg(EXTICONS_DIR).arg(extIcon);
     if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
     {