Tagged v2.6.3 release

Changelog

@@ -1,9 +1,18 @@
-* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.6.2
+* Sat Jan 15 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.3
+   - BUGFIX: Fix possible crashes in full allocation mode
+   - BUGFIX: Fix icon size issues (Linux, icon theme)
+   - BUGFIX: Fixed file priority context menu
+   - BUGFIX: Remove dbus dependency in nox mode
+   - BUGFIX: Fix compilation on FreeBSD
+   - I18N: Improve Web UI translation
+   - I18N: Updated Polish translation
+
+* Wed Jan 12 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.2
     - BUGFIX: Do not report PeX as being disabled when DHT is
     - BUGFIX: Fix possible crash on adding magnet links
-    - BUGFIX: Fix torrent import
-    - I18N: Updated Greek, Croatian, Unkrainian and Bulgarian translations
-    - I18N: Added Armenian translation
+    - BUGFIX: Fix torrent import (was not working)
+    - I18N: Updated Greek, Croatian, Russian, Unkrainian and Bulgarian translations
+    - I18N: Added Armenian translation (New)
     - I18N: Remove country flags from program preferences (language selection)
     - I18N: Translate locale names (language selection)
 

configure

@@ -346,6 +346,12 @@ public:
                 if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
                   conf->addExtra("CONFIG += debug");
                 }
+                #ifdef Q_OS_FREEBSD
+                  conf->addLib("-lexecinfo");
+                  conf->addExtra("MANPREFIX = \$\$PREFIX");
+                #else
+                  conf->addExtra("MANPREFIX = \$\$PREFIX/share"); 
+                #endif
 		return(QT_VERSION >= 0x040500);
 	}
 };

qcm/qt4.qcm

@@ -21,6 +21,12 @@ public:
                 if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
                   conf->addExtra("CONFIG += debug");
                 }
+                #ifdef Q_OS_FREEBSD
+                  conf->addLib("-lexecinfo");
+                  conf->addExtra("MANPREFIX = $$PREFIX");
+                #else
+                  conf->addExtra("MANPREFIX = $$PREFIX/share"); 
+                #endif
 		return(QT_VERSION >= 0x040500);
 	}
 };

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.6.1
+Comment=V2.6.3
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[ar]=العميل Bittorrent

src/Info.plist

@@ -47,7 +47,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.6.1</string>
+	<string>2.6.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

src/filesystemwatcher.h

@@ -12,7 +12,7 @@
 #include <QSet>
 #include <iostream>
 #include <errno.h>
-#ifdef Q_WS_MAC
+#if defined(Q_WS_MAC) || defined(Q_OS_FREEBSD)
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <string.h>

src/iconprovider.cpp

@@ -58,8 +58,11 @@ void IconProvider::drop()
 QIcon IconProvider::getIcon(const QString &iconId)
 {
 #if defined(Q_WS_X11) && (QT_VERSION >= QT_VERSION_CHECK(4,6,0))
-  if(m_useSystemTheme)
-    return QIcon::fromTheme(iconId, QIcon(":/Icons/oxygen/"+iconId+".png"));
+  if(m_useSystemTheme) {
+    QIcon icon = QIcon::fromTheme(iconId, QIcon(":/Icons/oxygen/"+iconId+".png"));
+    icon = generateDifferentSizes(icon);
+    return icon;
+  }
 #endif
   return QIcon(":/Icons/oxygen/"+iconId+".png");
 }
@@ -69,6 +72,28 @@ void IconProvider::useSystemIconTheme(bool enable)
 {
   m_useSystemTheme = enable;
 }
+
+QIcon IconProvider::generateDifferentSizes(const QIcon &icon)
+{
+  QIcon new_icon;
+  QList<QSize> required_sizes;
+  required_sizes << QSize(16, 16) << QSize(24, 24);
+  QList<QIcon::Mode> modes;
+  modes << QIcon::Normal << QIcon::Active << QIcon::Selected << QIcon::Disabled;
+  foreach(const QSize& size, required_sizes) {
+    foreach(QIcon::Mode mode, modes) {
+      QPixmap pixoff = icon.pixmap(size, mode, QIcon::Off);
+      if(pixoff.height() > size.height())
+        pixoff = pixoff.scaled(size, Qt::KeepAspectRatio,  Qt::SmoothTransformation);
+      new_icon.addPixmap(pixoff, mode, QIcon::Off);
+      QPixmap pixon = icon.pixmap(size, mode, QIcon::On);
+      if(pixon.height() > size.height())
+        pixon = pixoff.scaled(size, Qt::KeepAspectRatio,  Qt::SmoothTransformation);
+      new_icon.addPixmap(pixon, mode, QIcon::On);
+    }
+  }
+  return new_icon;
+}
 #endif
 
 QString IconProvider::getIconPath(const QString &iconId)

src/iconprovider.h

@@ -52,6 +52,9 @@ public:
 public:
   void useSystemIconTheme(bool enable);
 
+private:
+  QIcon generateDifferentSizes(const QIcon& icon);
+
 private:
   bool m_useSystemTheme;
 #endif