Bump to 3.3.10

Changelog

@@ -1,3 +1,14 @@
+* Sat Dec 17 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.10
+    - BUGFIX: Fix share ratio limiting. Broken by commit 259b5e51c49b744. Closes #6039 #6048. (sledgehammer999)
+    - BUGFIX: Case insensitive sort for client column. Closes #6054. (Oke Atime)
+    - BUGFIX: Make resume/pause menu items clickable. Closes #6040. (Oke Atime)
+    - WINDOWS: Make the updater to look for the x64 installer if running x64 version. (sledgehammer999)
+
+* Wed Dec 14 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.9
+    - BUGFIX: Fix slider for per torrent speed limits when no global speed limit has been set. Closes #6046. (sledgehammer999)
+    - BUGFIX: Fix GUI for proxy settings. Closes #6045. (sledgehammer999)
+    - OSX: Correctly migrate settings/rss/usage stats in macOS. Closes #6041. (sledgehammer999)
+
 * Wed Dec 14 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.8
     - FEATURE: Start using new libtorrent 1.1.x APIs (needs at least 1.1.2). Still unofficial support. (glassez, sledgehammer999)
     - FEATURE: Add a new DHT bootstrap node run by libtorrent author arvidn. (sledgehammer999)

dist/mac/Info.plist

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

dist/windows/options.nsi

@@ -19,7 +19,7 @@ XPStyle on
 !define CSIDL_APPDATA '0x1A' ;Application Data path
 !define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path
 
-!define PROG_VERSION "3.3.8"
+!define PROG_VERSION "3.3.10"
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
 !define MUI_FINISHPAGE_RUN_TEXT $(launch_qbt)

src/app/upgrade.h

@@ -233,7 +233,7 @@ bool upgrade(bool ask = true)
 void migratePlistToIni(const QString &application)
 {
     QIniSettings iniFile("qBittorrent", application);
-    if (iniFile.allKeys().isEmpty()) return; // We copy the contents of plist, only if inifile does not exist(is empty).
+    if (!iniFile.allKeys().isEmpty()) return; // We copy the contents of plist, only if inifile does not exist(is empty).
 
     QSettings *plistFile = new QSettings("qBittorrent", application);
     plistFile->setFallbacksEnabled(false);

src/base/bittorrent/session.cpp

@@ -1292,7 +1292,8 @@ void Session::processBigRatios()
     qreal globalMaxRatio = this->globalMaxRatio();
     foreach (TorrentHandle *const torrent, m_torrents) {
         if (torrent->isSeed()
-            && ((torrent->ratioLimit() != TorrentHandle::NO_RATIO_LIMIT) || !torrent->isForced())) {
+            && (torrent->ratioLimit() != TorrentHandle::NO_RATIO_LIMIT)
+            && !torrent->isForced()) {
             const qreal ratio = torrent->realRatio();
             qreal ratioLimit = torrent->ratioLimit();
             if (ratioLimit == TorrentHandle::USE_GLOBAL_RATIO) {

src/gui/mainwindow.cpp

@@ -174,12 +174,6 @@ MainWindow::MainWindow(QWidget *parent)
     m_ui->menuAutoShutdownOnDownloadsCompletion->setIcon(GuiIconProvider::instance()->getIcon("application-exit"));
     m_ui->actionManageCookies->setIcon(GuiIconProvider::instance()->getIcon("preferences-web-browser-cookies"));
 
-    QMenu *startAllMenu = new QMenu(this);
-    startAllMenu->addAction(m_ui->actionStartAll);
-    m_ui->actionStart->setMenu(startAllMenu);
-    QMenu *pauseAllMenu = new QMenu(this);
-    pauseAllMenu->addAction(m_ui->actionPauseAll);
-    m_ui->actionPause->setMenu(pauseAllMenu);
     QMenu *lockMenu = new QMenu(this);
     QAction *defineUiLockPasswdAct = lockMenu->addAction(tr("&Set Password"));
     connect(defineUiLockPasswdAct, SIGNAL(triggered()), this, SLOT(defineUILockPassword()));

src/gui/mainwindow.ui

@@ -35,7 +35,7 @@
      <x>0</x>
      <y>0</y>
      <width>914</width>
-     <height>21</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuEdit">
@@ -44,6 +44,8 @@
     </property>
     <addaction name="actionStart"/>
     <addaction name="actionPause"/>
+    <addaction name="actionStartAll"/>
+    <addaction name="actionPauseAll"/>
     <addaction name="separator"/>
     <addaction name="actionDelete"/>
     <addaction name="actionTopPriority"/>
@@ -191,6 +193,16 @@
     <string>&amp;Pause</string>
    </property>
   </action>
+  <action name="actionStartAll">
+   <property name="text">
+    <string>R&amp;esume All</string>
+   </property>
+  </action>
+  <action name="actionPauseAll">
+   <property name="text">
+    <string>P&amp;ause All</string>
+   </property>
+  </action>
   <action name="actionDelete">
    <property name="text">
     <string>&amp;Delete</string>
@@ -334,16 +346,6 @@
     <string>If you like qBittorrent, please donate!</string>
    </property>
   </action>
-  <action name="actionStartAll">
-   <property name="text">
-    <string>R&amp;esume All</string>
-   </property>
-  </action>
-  <action name="actionPauseAll">
-   <property name="text">
-    <string>P&amp;ause All</string>
-   </property>
-  </action>
   <action name="actionAutoExit">
    <property name="checkable">
     <bool>true</bool>

src/gui/optionsdlg.cpp

@@ -867,7 +867,7 @@ void OptionsDialog::loadOptions()
     m_ui->checkProxyPeerConnecs->setChecked(session->isProxyPeerConnectionsEnabled());
     m_ui->checkForceProxy->setChecked(session->isForceProxyEnabled());
     m_ui->isProxyOnlyForTorrents->setChecked(proxyConfigManager->isProxyOnlyForTorrents());
-    enableProxy(m_ui->comboProxyType->currentIndex() > 0);
+    enableProxy(m_ui->comboProxyType->currentIndex());
 
     m_ui->checkIPFilter->setChecked(session->isIPFilteringEnabled());
     m_ui->checkIpFilterTrackers->setChecked(session->isTrackerFilteringEnabled());

src/gui/programupdater.cpp

@@ -45,6 +45,8 @@ namespace
 
 #ifdef Q_OS_MAC
     const QString OS_TYPE("Mac OS X");
+#elif defined(Q_OS_WIN) && (defined(__x86_64__) || defined(_M_X64))
+    const QString OS_TYPE("Windows x64");
 #else
     const QString OS_TYPE("Windows");
 #endif

src/gui/properties/peerlistsortmodel.h

@@ -48,7 +48,7 @@ protected:
   case PeerListDelegate::CLIENT: {
     QString vL = left.data().toString();
     QString vR = right.data().toString();
-    return Utils::String::naturalCompareCaseSensitive(vL, vR);
+    return Utils::String::naturalCompareCaseInsensitive(vL, vR);
   }
   };
 

src/gui/speedlimitdlg.cpp

@@ -103,7 +103,7 @@ void SpeedLimitDialog::setupDialog(long max_slider, long val) const
 {
     if (val < 0)
         val = 0;
-    if (max_slider < 0)
+    if (max_slider <= 0)
         max_slider = 1000;
     // This can happen for example if global rate limit is lower
     // than torrent rate limit.

version.pri

@@ -3,7 +3,7 @@ PROJECT_NAME = qbittorrent
 # Define version numbers here
 VER_MAJOR = 3
 VER_MINOR = 3
-VER_BUGFIX = 8
+VER_BUGFIX = 10
 VER_BUILD = 0
 VER_STATUS = # Should be empty for stable releases!