- Tagged both 1.3.4 and 1.4.0beta3 releases

Changelog

@@ -1,11 +1,3 @@
-* Fri Jul 24 2009 - Christophe DUMEZ <chris@qbittorrent.org> - 1.3.5
-    - BUGFIX: Made IP filter parser more robust
-    - BUGFIX: Fixed torrent creation tool
-    - BUGFIX: Fixed possible overflow in progress calculation in arborescence.h
-    - BUGFIX: Save properties window size, position, columns width and restore them
-    - BUGFIX: Set a minimum default width for NAME column in properties
-    - BUGFIX: Remember visual indexes of columns in transfer lists
-
 * Sun Jul 12 2009 - Christophe DUMEZ <chris@qbittorrent.org> - v1.3.4
     - BUGFIX: Fixed IP filter file parsing on 64bits
     - BUGFIX: Suppressed QLayout: Attempting to add QLayout "" to properties "properties" warning message when opening a properties dialog

TODO

@@ -1,2 +1,21 @@
 See https://blueprints.launchpad.net/qbittorrent/
 
+// translations done in v1.3.0
+- Romanian
+- Russian
+- Hungarian
+- German
+- Chinese (traditional)
+- Chinese (simplified)
+- Italian
+- Swedish
+- Turkish
+- French
+- Slovak
+- Czech
+- Korean
+- Portuguese
+- Brazilian
+- Greek
+- Bulgarian
+- Finnish

src/FinishedTorrents.cpp

@@ -176,23 +176,6 @@ bool FinishedTorrents::loadColWidthFinishedList(){
         finishedList->header()->resizeSection(i, width_list.at(i).toInt());
   }
   loadLastSortedColumn();
-  QVariantList visualIndexes = settings.value(QString::fromUtf8("FinishedListVisualIndexes"), QVariantList()).toList();
-  if(visualIndexes.size() != finishedListModel->columnCount()-1) {
-    qDebug("Corrupted values for download list columns sizes");
-    return false;
-  }
-  bool change = false;
-  do {
-    change = false;
-    for(int i=0;i<visualIndexes.size(); ++i) {
-      int new_visual_index = visualIndexes.at(finishedList->header()->logicalIndex(i)).toInt();
-      if(i != new_visual_index) {
-        qDebug("Moving column from %d to %d", finishedList->header()->logicalIndex(i), new_visual_index);
-        finishedList->header()->moveSection(i, new_visual_index);
-        change = true;
-      }
-    }
-  }while(change);
   qDebug("Finished list columns width loaded");
   return true;
 }
@@ -240,11 +223,6 @@ void FinishedTorrents::saveColWidthFinishedList() const{
     }
   }
   settings.setValue("FinishedListColsWidth", new_width_list.join(" "));
-  QVariantList visualIndexes;
-  for(int i=0; i<nbColumns; ++i) {
-    visualIndexes.append(finishedList->header()->visualIndex(i));
-  }
-  settings.setValue(QString::fromUtf8("FinishedListVisualIndexes"), visualIndexes);
   qDebug("Finished list columns width saved");
 }
 

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P
-Comment=V1.3.5
+Comment=V1.3.4
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент

src/arborescence.h

@@ -51,8 +51,6 @@ class torrent_file {
     torrent_file(torrent_file *parent, QString path, bool dir, size_type size=0, int index=-1, float progress=0., int priority=1): parent(parent), is_dir(dir), size(size), progress(progress), priority(priority), index(index){
       qDebug("created a file with index %d", index);
       rel_path = QDir::cleanPath(path);
-      Q_ASSERT(progress >= 0.);
-      Q_ASSERT(progress <= 1.);
       if(parent) {
         parent->updateProgress();
         parent->updatePriority(priority);
@@ -77,8 +75,8 @@ class torrent_file {
         progress = 0.;
         return;
       }
-      double wanted = 0.;
-      double done = 0.;
+      float wanted = 0.;
+      float done = 0.;
       foreach(const torrent_file *child, children) {
         wanted += child->getSize();
         done += child->getSize()*child->getProgress();
@@ -207,13 +205,13 @@ class arborescence {
       } else {
         // XXX: Will crash if there is no file in torrent
         qDebug("one file in the torrent, setting it as root with index 0");
-        root = new torrent_file(0, misc::toQString(t.name()), false, fi->size, 0, ((double)fp[0])/t.file_at(0).size, prioritiesTab[0]);
+        root = new torrent_file(0, misc::toQString(t.name()), false, fi->size, 0, ((float)fp[0])/t.file_at(0).size, prioritiesTab[0]);
         return;
       }
       int i = 0;
       while(fi != t.end_files()) {
         QString path = QDir::cleanPath(misc::toQString(fi->path.string()));
-        addFile(path, fi->size, i, ((double)fp[i])/t.file_at(i).size, prioritiesTab[i]);
+        addFile(path, fi->size, i, ((float)fp[i])/t.file_at(i).size, prioritiesTab[i]);
         fi++;
         ++i;
       }

src/createtorrent_imp.cpp

@@ -184,6 +184,7 @@ void createtorrent::on_createButton_clicked(){
 
 void createtorrent::handleCreationFailure(QString msg) {
   QMessageBox::information(0, tr("Torrent creation"), tr("Torrent creation was unsuccessful, reason: %1").arg(msg));
+  hide();
 }
 
 void createtorrent::handleCreationSuccess(QString path, const char* branch_path) {
@@ -204,7 +205,7 @@ void createtorrent::handleCreationSuccess(QString path, const char* branch_path)
         emit torrent_to_seed(path);
     }
     QMessageBox::information(0, tr("Torrent creation"), tr("Torrent was created successfully:")+" "+path);
-    close();
+    hide();
 }
 
 void createtorrent::updateProgressBar(int progress) {
@@ -227,12 +228,8 @@ void torrentCreatorThread::create(QString _input_path, QString _save_path, QStri
   start();
 }
 
-void sendProgressUpdateSignal(int i, int num, torrentCreatorThread *parent){
-    parent->sendProgressSignal((int)(i*100./(float)num));
-}
-
-void torrentCreatorThread::sendProgressSignal(int progress) {
-  emit updateProgress(progress);
+void sendProgressUpdateSignal(int i, int num, QDialog *parent){
+    ((createtorrent*)parent)->updateProgressBar((int)(i*100./(float)num));
 }
 
 void torrentCreatorThread::run() {
@@ -257,13 +254,15 @@ void torrentCreatorThread::run() {
     }
     if(abort) return;
     // calculate the hash for all pieces
-    set_piece_hashes(t, full_path.branch_path(), boost::bind<void>(&sendProgressUpdateSignal, _1, t.num_pieces(), this));
+    set_piece_hashes(t, full_path.branch_path(), boost::bind<void>(&sendProgressUpdateSignal, _1, t.num_pieces(), parent));
     // Set qBittorrent as creator and add user comment to
     // torrent_info structure
     t.set_creator(creator_str);
     t.set_comment((const char*)comment.toUtf8());
     // Is private ?
-    t.set_priv(is_private);
+    if(is_private){
+      t.set_priv(true);
+    }
     if(abort) return;
     // create the torrent and print it to out
     ofstream out(complete(path((const char*)save_path.toUtf8())), std::ios_base::binary);

src/createtorrent_imp.h

@@ -57,7 +57,6 @@ class torrentCreatorThread : public QThread {
       wait();
     }
     void create(QString _input_path, QString _save_path, QStringList _trackers, QStringList _url_seeds, QString _comment, bool _is_private, int _piece_size);
-    void sendProgressSignal(int progress);
   
   protected:
     void run();
@@ -65,8 +64,6 @@ class torrentCreatorThread : public QThread {
   signals:
     void creationFailure(QString msg);
     void creationSuccess(QString path, const char* branch_path);
-
-  signals:
     void updateProgress(int progress);
 };
 

src/downloadingTorrents.cpp

@@ -732,11 +732,6 @@ void DownloadingTorrents::saveColWidthDLList() const{
     }
   }
   settings.setValue(QString::fromUtf8("DownloadListColsWidth"), new_width_list.join(QString::fromUtf8(" ")));
-  QVariantList visualIndexes;
-  for(int i=0; i<nbColumns; ++i) {
-    visualIndexes.append(downloadList->header()->visualIndex(i));
-  }
-  settings.setValue(QString::fromUtf8("DownloadListVisualIndexes"), visualIndexes);
   qDebug("Download list columns width saved");
 }
 
@@ -757,23 +752,6 @@ bool DownloadingTorrents::loadColWidthDLList() {
   for(unsigned int i=0; i<listSize; ++i) {
         downloadList->header()->resizeSection(i, width_list.at(i).toInt());
   }
-  QVariantList visualIndexes = settings.value(QString::fromUtf8("DownloadListVisualIndexes"), QVariantList()).toList();
-  if(visualIndexes.size() != DLListModel->columnCount()-1) {
-    qDebug("Corrupted values for download list columns sizes");
-    return false;
-  }
-  bool change = false;
-  do {
-    change = false;
-    for(int i=0;i<visualIndexes.size(); ++i) {
-      int new_visual_index = visualIndexes.at(downloadList->header()->logicalIndex(i)).toInt();
-      if(i != new_visual_index) {
-        qDebug("Moving column from %d to %d", downloadList->header()->logicalIndex(i), new_visual_index);
-        downloadList->header()->moveSection(i, new_visual_index);
-        change = true;
-      }
-    }
-  }while(change);
   qDebug("Download list columns width loaded");
   return true;
 }

src/filterParserThread.h

@@ -191,12 +191,8 @@ class FilterParserThread : public QThread  {
               if(IPv4) {
                 //IPv4 addresses
                 IP = strStartIP.split('.');
-                if(IP.size() != 4)
-                  throw exception();
                 address_v4 start((IP.at(0).toUInt() << 24) + (IP.at(1).toUInt() << 16) + (IP.at(2).toUInt() << 8) + IP.at(3).toUInt());
                 IP = strEndIP.split('.');
-                if(IP.size() != 4)
-                  throw exception();
                 address_v4 last((IP.at(0).toUInt() << 24) + (IP.at(1).toUInt() << 16) + (IP.at(2).toUInt() << 8) + IP.at(3).toUInt());
                 // Apply to bittorrent session
                 filter.add_rule(start, last, ip_filter::blocked);

src/properties_imp.cpp

@@ -146,7 +146,6 @@ properties::properties(QWidget *parent, bittorrent *BTSession, QTorrentHandle &h
 }
 
 properties::~properties(){
-  writeSettings();
   qDebug("Properties destroyed");
   delete updateInfosTimer;
   delete PropDelegate;
@@ -188,11 +187,6 @@ void properties::writeSettings() {
   settings.beginGroup(QString::fromUtf8("PropWindow"));
   settings.setValue(QString::fromUtf8("size"), size());
   settings.setValue(QString::fromUtf8("pos"), pos());
-  QVariantList contentColsWidths;
-  for(int i=0; i<PropListModel->columnCount()-1; ++i) {
-    contentColsWidths.append(filesList->columnWidth(i));
-  }
-  settings.setValue(QString::fromUtf8("contentColsWidths"), contentColsWidths);
   settings.endGroup();
 }
 
@@ -200,14 +194,6 @@ void properties::loadSettings() {
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   resize(settings.value(QString::fromUtf8("PropWindow/size"), size()).toSize());
   move(settings.value(QString::fromUtf8("PropWindow/pos"), screenCenter()).toPoint());
-  QVariantList contentColsWidths = settings.value(QString::fromUtf8("PropWindow/contentColsWidths"), QVariantList()).toList();
-  if(contentColsWidths.empty()) {
-    filesList->header()->resizeSection(NAME, 200);
-  } else {
-    for(int i=0; i<contentColsWidths.size(); ++i) {
-      filesList->setColumnWidth(i, contentColsWidths.at(i).toInt());
-    }
-  }
 }
 
 // Center window

src/src.pro

@@ -14,10 +14,10 @@ CONFIG += qt \
     network
 
 # Update this VERSION for each release
-DEFINES += VERSION=\\\"v1.3.5\\\"
+DEFINES += VERSION=\\\"v1.3.4\\\"
 DEFINES += VERSION_MAJOR=1
 DEFINES += VERSION_MINOR=3
-DEFINES += VERSION_BUGFIX=5
+DEFINES += VERSION_BUGFIX=4
 !mac:QMAKE_LFLAGS += -Wl,--as-needed
 contains(DEBUG_MODE, 1) { 
     CONFIG += debug