From 49fd36aa2c8e8f7e4e131c4fe33c4ec5de9f5db5 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sun, 13 Mar 2011 17:53:51 +0000
Subject: [PATCH] BUGFIX: Fix column hiding/showing in transfer list

---
 Changelog                  |  7 +++++--
 src/transferlistwidget.cpp | 31 ++++++++++++++++++-------------
 src/transferlistwidget.h   |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Changelog b/Changelog
index cd51c4829..bb083a91a 100644
--- a/Changelog
+++ b/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
diff --git a/src/transferlistwidget.cpp b/src/transferlistwidget.cpp
index 91cb66778..a7661a863 100644
--- a/src/transferlistwidget.cpp
+++ b/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;
 }
 
diff --git a/src/transferlistwidget.h b/src/transferlistwidget.h
index 0da2d83cf..7d0026cd1 100644
--- a/src/transferlistwidget.h
+++ b/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: