Tagged v2.6.0 release

2025-10-30 23:30:54 +01:00 · 2011-01-09 11:17:28 +00:00
12 changed files with 33 additions and 44 deletions
--- a/7
+++ b/7
@@ -1,10 +1,3 @@
-* Mon Jan 10 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.1
-    - BUGFIX: Really disable torrent addition dialog by default
-    - BUGFIX: Fix some missing icons in the Web UI
-    - BUGFIX: Fix magnet torrent name update problem
-    - COSMETIC: Use 24px size for toolbar icons and reduce spacing
-    - COSMETIC: Move transfer list filter on the right side of the toolbar
-
 * Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0
    - FEATURE: Use system icons (Linux, Qt >= 4.6)
    - FEATURE: Improved ETA calculation
--- a/src/Icons/qBittorrent.desktop
+++ b/src/Icons/qBittorrent.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.6.1
+Comment=V2.6.0
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[ar]=العميل Bittorrent
--- a/src/Info.plist
+++ b/src/Info.plist
@@ -47,7 +47,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.6.1</string>
+	<string>2.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -294,12 +294,6 @@ int main(int argc, char *argv[]){
  QStringList torrentCmdLine = app.arguments();
  // Remove first argument (program name)
  torrentCmdLine.removeFirst();
-#ifndef QT_NO_DEBUG_OUTPUT
-  foreach(const QString &argument, torrentCmdLine) {
-    qDebug() << "Command line argument:" << argument;
-  }
-#endif
-
 #ifndef DISABLE_GUI
  MainWindow window(0, torrentCmdLine);
  if(!no_splash)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -84,7 +84,7 @@ void qt_mac_set_dock_menu(QMenu *menu);
 using namespace libtorrent;

 #define TIME_TRAY_BALLOON 5000
-#define TOOLBAR_SPACING 0
+#define TOOLBAR_SPACING 10

 /*****************************************************
 *                                                   *
@@ -174,13 +174,13 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
  vboxLayout->addWidget(tabs);
  // Name filter
  search_filter = new LineEdit();
-  connect(search_filter, SIGNAL(textChanged(QString)), transferList, SLOT(applyNameFilter(QString)));
-  QAction *searchFilterAct = toolBar->insertWidget(actionLock_qBittorrent, search_filter);
+  toolBar->insertWidget(actionLock_qBittorrent, search_filter);
  search_filter->setFixedWidth(200);
+  connect(search_filter, SIGNAL(textChanged(QString)), transferList, SLOT(applyNameFilter(QString)));
+
  QWidget *spacer = new QWidget(this);
  spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-  toolBar->insertWidget(searchFilterAct, spacer);
-
+  toolBar->insertWidget(actionLock_qBittorrent, spacer);

  prioSeparator = toolBar->insertSeparator(actionDecreasePriority);
  prioSeparatorMenu = menu_Edit->insertSeparator(actionDecreasePriority);
@@ -804,8 +804,8 @@ void MainWindow::dropEvent(QDropEvent *event) {
    files = event->mimeData()->text().split(QString::fromUtf8("\n"));
  }
  // Add file to download list
-  Preferences pref;
-  const bool useTorrentAdditionDialog = pref.useAdditionDialog();
+  QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  const bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
  foreach(QString file, files) {
    qDebug("Dropped file %s on download list", qPrintable(file));
    if(misc::isUrl(file)) {
@@ -857,7 +857,6 @@ void MainWindow::dragEnterEvent(QDragEnterEvent *event) {
 // Display a dialog to allow user to add
 // torrents to download list
 void MainWindow::on_actionOpen_triggered() {
-  Preferences pref;
  QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
  // Open File Open Dialog
  // Note: it is possible to select more than one file
@@ -865,7 +864,7 @@ void MainWindow::on_actionOpen_triggered() {
                                                              tr("Open Torrent Files"), settings.value(QString::fromUtf8("MainWindowLastDir"), QDir::homePath()).toString(),
                                                              tr("Torrent Files")+QString::fromUtf8(" (*.torrent)"));
  if(!pathsList.empty()) {
-    const bool useTorrentAdditionDialog = pref.useAdditionDialog();
+    const bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
    const uint listSize = pathsList.size();
    for(uint i=0; i<listSize; ++i) {
      if(useTorrentAdditionDialog) {
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -115,6 +115,12 @@
   <property name="orientation">
    <enum>Qt::Horizontal</enum>
   </property>
+   <property name="iconSize">
+    <size>
+     <width>32</width>
+     <height>32</height>
+    </size>
+   </property>
   <property name="floatable">
    <bool>false</bool>
   </property>
@@ -133,6 +139,7 @@
   <addaction name="actionIncreasePriority"/>
   <addaction name="separator"/>
   <addaction name="actionOptions"/>
+   <addaction name="separator"/>
   <addaction name="actionLock_qBittorrent"/>
  </widget>
  <widget class="QStatusBar" name="statusBar"/>
--- a/src/qtlibtorrent/torrentmodel.cpp
+++ b/src/qtlibtorrent/torrentmodel.cpp
@@ -142,7 +142,7 @@ QVariant TorrentModelItem::data(int column, int role) const
  if(role != Qt::DisplayRole && role != Qt::UserRole) return QVariant();
  switch(column) {
  case TR_NAME:
-    return m_name.isEmpty()? m_torrent.name() : m_name;
+    return m_name;
  case TR_PRIORITY:
    return m_torrent.queue_position();
  case TR_SIZE:
--- a/src/webui/css/style.css
+++ b/src/webui/css/style.css
@@ -262,11 +262,8 @@ a.propButton img {

 /* Mocha Customization */
 #mochaToolbar .divider {
-	background-image: url(../images/skin/toolbox-divider.gif);
-	background-repeat: no-repeat;
-        background-position: left center;
-        padding-left: 14px;
-	padding-top: 15px;
+        background: url(../images/skin/toolbox-divider.gif) left center no-repeat;
+        padding: 25px 0 0 14px;
 }

 .MyMenuIcon {
--- a/src/webui/html/download.html
+++ b/src/webui/html/download.html
@@ -10,7 +10,7 @@
 <body>
 <center>
 	<br/>
-	<h2 class="vcenter"><img class="vcenter" title="Download from URL" src="theme/insert-link"/>_(Download Torrents from their URL or Magnet link)</h2>
+	<h2 class="vcenter"><img class="vcenter" title="Download from URL" src="images/skin/url.png"/>_(Download Torrents from their URL or Magnet link)</h2>
 	<textarea name="list" id="urls" rows="10" cols="1"></textarea><p>_(Only one link per line)</p><a id=downButton>_(Download)</a>
 	</center>
 </body>
--- a/src/webui/html/index.html
+++ b/src/webui/html/index.html
@@ -69,17 +69,16 @@
 				</ul>
 			</div>
 			<div id="mochaToolbar">
-&nbsp;&nbsp;
-				<a id="uploadButton"><img class="mochaToolButton" title="_(Download local torrent)" src="theme/list-add" width="24" height="24" onload="fixPNG(this)"/></a>
-				<a id="downloadButton"><img class="mochaToolButton" title="_(Download from URL)" src="theme/insert-link" width="24" height="24" onload="fixPNG(this)"/></a>
-			  <a id="deleteButton" class="divider"><img class="mochaToolButton" title="_(Delete)" src="theme/list-remove" width="24" height="24" onload="fixPNG(this)"/></a>
-				<a id="resumeButton" class="divider"><img class="mochaToolButton" title="_(Start)" src="theme/media-playback-start" width="24" height="24" onload="fixPNG(this)"/></a>
-				<a id="pauseButton"><img class="mochaToolButton" title="_(Pause)" src="theme/media-playback-pause" width="24" height="24" onload="fixPNG(this)"/></a>
+				<a id="uploadButton"><img class="mochaToolButton" title="_(Download local torrent)" src="theme/list-add" width="32" height="32" onload="fixPNG(this)"/></a>
+				<a id="downloadButton"><img class="mochaToolButton" title="_(Download from URL)" src="theme/insert-link" width="32" height="32" onload="fixPNG(this)"/></a>
+			  <a id="deleteButton" class="divider"><img class="mochaToolButton" title="_(Delete)" src="theme/list-remove" width="32" height="32" onload="fixPNG(this)"/></a>
+				<a id="resumeButton" class="divider"><img class="mochaToolButton" title="_(Start)" src="theme/media-playback-start" width="32" height="32" onload="fixPNG(this)"/></a>
+				<a id="pauseButton"><img class="mochaToolButton" title="_(Pause)" src="theme/media-playback-pause" width="32" height="32" onload="fixPNG(this)"/></a>
 				<span id="queueingButtons">
-				<a id="decreasePrioButton" class="divider"><img class="mochaToolButton" title="_(Decrease priority)" src="theme/go-down" width="24" height="24" onload="fixPNG(this)"/></a>
-				<a id="increasePrioButton"><img class="mochaToolButton" title="_(Increase priority)" src="theme/go-up" width="24" height="24" onload="fixPNG(this)"/></a>
+				<a id="decreasePrioButton" class="divider"><img class="mochaToolButton" title="_(Decrease priority)" src="theme/go-down" width="32" height="32" onload="fixPNG(this)"/></a>
+				<a id="increasePrioButton"><img class="mochaToolButton" title="_(Increase priority)" src="theme/go-up" width="32" height="32" onload="fixPNG(this)"/></a>
 				</span>
-				<a id="preferencesButton" class="divider"><img class="mochaToolButton" title="_(Preferences)" src="theme/preferences-system" width="24" height="24" onload="fixPNG(this)"/></a>
+				<a id="preferencesButton" class="divider"><img class="mochaToolButton" title="_(Preferences)" src="theme/preferences-system" width="32" height="32" onload="fixPNG(this)"/></a>
 			</div>
 		</div>
 		<div id="pageWrapper"><span id="error_div"></span>
--- a/src/webui/html/upload.html
+++ b/src/webui/html/upload.html
@@ -13,7 +13,7 @@ function hideAll() {
 </head>
 <body>
 <center>
-	<h1 class="vcenter"><img class="vcenter" title="Download local torrent" src="theme/list-add"/>_(Download local torrent)</h1>
+	<h1 class="vcenter"><img class="vcenter" title="Download local torrent" src="images/skin/open.png"/>_(Download local torrent)</h1>
 <iframe src="uploadframe.html" frameborder="0" style="padding: 10px; height: 70px; width: 450px;" id="myiframe">
 <p>Your Web browser does not support iframes</p>
 </iframe>	
--- a/version.pri
+++ b/version.pri
@@ -1,11 +1,11 @@
 os2 {
-    DEFINES += VERSION=\'\"v2.6.1\"\'
+    DEFINES += VERSION=\'\"v2.6.0\"\'
 } else {
-    DEFINES += VERSION=\\\"v2.6.1\\\"
+    DEFINES += VERSION=\\\"v2.6.0\\\"
 }
 DEFINES += VERSION_MAJOR=2
 DEFINES += VERSION_MINOR=6
-DEFINES += VERSION_BUGFIX=1
+DEFINES += VERSION_BUGFIX=0

 # NORMAL,ALPHA,BETA,RELEASE_CANDIDATE,DEVEL
 DEFINES += VERSION_TYPE=NORMAL