Tagged v2.6.9 release

Changelog

@@ -1,5 +1,8 @@
-* Sn Mar 13 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.8
-  - BUFIX: Fix compilation with libtorrent v0.14.x
+* Sun Mar 13 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.9
+  - BUGFIX: Fix column hiding/showing in transfer list
+
+* Sun Mar 13 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.8
+  - BUGFIX: Fix compilation with libtorrent v0.14.x
   - BUGFIX: Fix issues when writing on NTFS (Linux, Mac)
   - BUGFIX: Fix root folder being cut off if the torrent comes from a scanned folder (Christian Kandeler)
   - BUGFIX: Improve folder removal behavior

src/Icons/qBittorrent.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P;
-Comment=V2.6.8
+Comment=V2.6.9
 Exec=qbittorrent %U
 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.8</string>
+	<string>2.6.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

src/transferlistwidget.cpp

@@ -66,7 +66,7 @@ TransferListWidget::TransferListWidget(QWidget *parent, MainWindow *main_window,
   QTreeView(parent), BTSession(_BTSession), main_window(main_window) {
 
   // Load settings
-  loadSettings();
+  bool column_loaded = loadSettings();
 
   // Create and apply delegate
   listDelegate = new TransferListDelegate(this);
@@ -106,15 +106,17 @@ TransferListWidget::TransferListWidget(QWidget *parent, MainWindow *main_window,
   setDragDropMode(QAbstractItemView::DragOnly);
 
   // Default hidden columns
-  setColumnHidden(TorrentModelItem::TR_PRIORITY, true);
-  setColumnHidden(TorrentModelItem::TR_ADD_DATE, true);
-  setColumnHidden(TorrentModelItem::TR_SEED_DATE, true);
-  setColumnHidden(TorrentModelItem::TR_UPLIMIT, true);
-  setColumnHidden(TorrentModelItem::TR_DLLIMIT, true);
-  setColumnHidden(TorrentModelItem::TR_TRACKER, true);
-  setColumnHidden(TorrentModelItem::TR_AMOUNT_DOWNLOADED, true);
-  setColumnHidden(TorrentModelItem::TR_AMOUNT_LEFT, true);
-  setColumnHidden(TorrentModelItem::TR_TIME_ELAPSED, true);
+  if(!column_loaded) {
+    setColumnHidden(TorrentModelItem::TR_PRIORITY, true);
+    setColumnHidden(TorrentModelItem::TR_ADD_DATE, true);
+    setColumnHidden(TorrentModelItem::TR_SEED_DATE, true);
+    setColumnHidden(TorrentModelItem::TR_UPLIMIT, true);
+    setColumnHidden(TorrentModelItem::TR_DLLIMIT, true);
+    setColumnHidden(TorrentModelItem::TR_TRACKER, true);
+    setColumnHidden(TorrentModelItem::TR_AMOUNT_DOWNLOADED, true);
+    setColumnHidden(TorrentModelItem::TR_AMOUNT_LEFT, true);
+    setColumnHidden(TorrentModelItem::TR_TIME_ELAPSED, true);
+  }
 
   setContextMenuPolicy(Qt::CustomContextMenu);
 
@@ -873,10 +875,13 @@ void TransferListWidget::saveSettings()
   settings.setValue("TransferList/HeaderState", header()->saveState());
 }
 
-void TransferListWidget::loadSettings()
+bool TransferListWidget::loadSettings()
 {
   QIniSettings settings("qBittorrent", "qBittorrent");
-  header()->resizeSection(0, 200); // Default
-  header()->restoreState(settings.value("TransferList/HeaderState").toByteArray());
+  bool ok = header()->restoreState(settings.value("TransferList/HeaderState").toByteArray());
+  if(!ok) {
+    header()->resizeSection(0, 200); // Default
+  }
+  return ok;
 }
 

src/transferlistwidget.h

@@ -88,7 +88,7 @@ protected:
   QModelIndex mapFromSource(const QModelIndex &index) const;
   QStringList getCustomLabels() const;
   void saveSettings();
-  void loadSettings();
+  bool loadSettings();
   QStringList getSelectedTorrentsHashes() const;
 
 protected slots:

version.pri

@@ -1,11 +1,11 @@
 os2 {
-    DEFINES += VERSION=\'\"v2.6.8\"\'
+    DEFINES += VERSION=\'\"v2.6.9\"\'
 } else {
-    DEFINES += VERSION=\\\"v2.6.8\\\"
+    DEFINES += VERSION=\\\"v2.6.9\\\"
 }
 DEFINES += VERSION_MAJOR=2
 DEFINES += VERSION_MINOR=6
-DEFINES += VERSION_BUGFIX=8
+DEFINES += VERSION_BUGFIX=9
 
 # NORMAL,ALPHA,BETA,RELEASE_CANDIDATE,DEVEL
 DEFINES += VERSION_TYPE=NORMAL