Bump version to v3.0.5

May be related to issue #68.

AUTHORS

@@ -94,7 +94,7 @@ Translations authors:
   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
   - Hebrew: David Deutsch (d.deffo@gmail.com)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
-  - Italian: Matteo Sechi (bu17714@gmail.com)
+  - Italian: bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)
   - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
   - Lithuanian: Naglis Jonaitis (njonaitis@gmail.com)

Changelog

@@ -1,3 +1,10 @@
+* Sun Sep 30 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.5
+    - BUGFIX: Disabling systray icon no longer disables file association settings (closes #114)
+    - BUGFIX: Import new trackers from magnet link in case of duplicate torrent (closes #111)
+    - BUGFIX: Fix "Skip hash check" feature in torrent import dialog (closes #128)
+    - BUGFIX: Several Web UI connection fixes
+    - BUGFIX: Add Basque locale to Web UI
+
 * Tue Sep 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.4
     - BUGFIX: Fix issue with downloads starting from scratch on startup if temporary
       directory setting is enabled.

install.os2

@@ -146,6 +146,11 @@ development, you can do so in one of the following ways:
 7. HISTORY
 ==========
 
+2012-09-19
+
+  * updated to 3.0.4 code level of QBittorrent
+  * updated libtorrent to 0.16.3 level
+
 2012-09-06
 
   * updated to 3.0.2 code level of QBittorrent

os2conf.pri

@@ -13,6 +13,7 @@ RC_FILE = qbittorrent_os2.rc
 
 # LIBTORRENT DEFINES
 DEFINES += WITH_SHIPPED_GEOIP_H
+DEFINES += BOOST_ASIO_DYN_LINK
 
 DEFINES += WITH_GEOIP_EMBEDDED
 message("On eCS(OS/2), GeoIP database must be embedded.")

src/mac/Info.plist

@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.4</string>
+	<string>3.0.5</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>

src/misc.cpp

@@ -309,7 +309,7 @@ QString misc::bcLinkToMagnet(QString bc_link) {
   return magnet;
 }
 
-QString misc::magnetUriToName(QString magnet_uri) {
+QString misc::magnetUriToName(const QString& magnet_uri) {
   QString name = "";
   QRegExp regHex("dn=([^&]+)");
   const int pos = regHex.indexIn(magnet_uri);
@@ -321,7 +321,23 @@ QString misc::magnetUriToName(QString magnet_uri) {
   return name;
 }
 
-QString misc::magnetUriToHash(QString magnet_uri) {
+QList<QUrl> misc::magnetUriToTrackers(const QString& magnet_uri)
+{
+  QList<QUrl> trackers;
+  QRegExp rx("tr=([^&]+)");
+  int pos = 0;
+
+  while ((pos = rx.indexIn(magnet_uri, pos)) != -1) {
+    const QUrl tracker = QUrl::fromEncoded(rx.cap(1).toUtf8());
+    qDebug() << Q_FUNC_INFO << "Found tracker: " << tracker.toString();
+    trackers << tracker;
+    pos += rx.matchedLength();
+  }
+
+  return trackers;
+}
+
+QString misc::magnetUriToHash(const QString& magnet_uri) {
   QString hash = "";
   QRegExp regHex("urn:btih:([0-9A-Za-z]+)");
   // Hex

src/misc.h

@@ -42,6 +42,7 @@
 #include <QPoint>
 #include <QFile>
 #include <QDir>
+#include <QUrl>
 #include <QCoreApplication>
 #ifndef DISABLE_GUI
 #include <QIcon>
@@ -99,8 +100,9 @@ public:
   // value must be given in bytes
   static QString friendlyUnit(qreal val, bool is_speed = false);
   static bool isPreviewable(QString extension);
-  static QString magnetUriToName(QString magnet_uri);
-  static QString magnetUriToHash(QString magnet_uri);
+  static QString magnetUriToName(const QString& magnet_uri);
+  static QString magnetUriToHash(const QString& magnet_uri);
+  static QList<QUrl> magnetUriToTrackers(const QString& magnet_uri);
   static QString bcLinkToMagnet(QString bc_link);
   // Take a number of seconds and return an user-friendly
   // time duration like "1d 2h 10m".

src/preferences/options.ui

@@ -176,7 +176,7 @@
            <property name="geometry">
             <rect>
              <x>0</x>
-             <y>0</y>
+             <y>-161</y>
              <width>486</width>
              <height>638</height>
             </rect>
@@ -433,27 +433,27 @@
                     </item>
                    </layout>
                   </item>
+                 </layout>
+                </widget>
+               </item>
+               <item>
+                <widget class="QGroupBox" name="groupFileAssociation">
+                 <property name="title">
+                  <string>File association</string>
+                 </property>
+                 <layout class="QVBoxLayout" name="verticalLayout_28">
                   <item>
-                   <widget class="QGroupBox" name="groupFileAssociation">
-                    <property name="title">
-                     <string>File association</string>
+                   <widget class="QCheckBox" name="checkAssociateTorrents">
+                    <property name="text">
+                     <string>Use qBittorrent for .torrent files</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QCheckBox" name="checkAssociateMagnetLinks">
+                    <property name="text">
+                     <string>Use qBittorrent for magnet links</string>
                     </property>
-                    <layout class="QVBoxLayout" name="verticalLayout_28">
-                     <item>
-                      <widget class="QCheckBox" name="checkAssociateTorrents">
-                       <property name="text">
-                        <string>Use qBittorrent for .torrent files</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item>
-                      <widget class="QCheckBox" name="checkAssociateMagnetLinks">
-                       <property name="text">
-                        <string>Use qBittorrent for magnet links</string>
-                       </property>
-                      </widget>
-                     </item>
-                    </layout>
                    </widget>
                   </item>
                  </layout>
@@ -509,7 +509,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>486</width>
+             <width>482</width>
              <height>952</height>
             </rect>
            </property>
@@ -969,7 +969,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>486</width>
+             <width>474</width>
              <height>577</height>
             </rect>
            </property>
@@ -1413,7 +1413,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>486</width>
+             <width>395</width>
              <height>480</height>
             </rect>
            </property>
@@ -2613,8 +2613,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>98</width>
-             <height>28</height>
+             <width>74</width>
+             <height>24</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_36"/>