From 64dad99c363da8c99df766b8d9e6760e00d719ae Mon Sep 17 00:00:00 2001
From: sledgehammer999 <hammered999@gmail.com>
Date: Sat, 29 Jun 2013 13:28:29 +0300
Subject: [PATCH] Ensure that all columns in the peerlist are showing.

---
 src/properties/peerlistwidget.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/properties/peerlistwidget.cpp b/src/properties/peerlistwidget.cpp
index 5b4f228ce..25af2b2e7 100644
--- a/src/properties/peerlistwidget.cpp
+++ b/src/properties/peerlistwidget.cpp
@@ -74,7 +74,19 @@ PeerListWidget::PeerListWidget(PropertiesWidget *parent):
   m_proxyModel->setDynamicSortFilter(true);
   m_proxyModel->setSourceModel(m_listModel);
   setModel(m_proxyModel);
+  //Explicitly set the column visibility. When columns are added/removed
+  //between versions this prevents some of them being hidden due to
+  //incorrect restoreState() being used.
+  for (unsigned int i=0; i<PeerListDelegate::IP_HIDDEN; i++)
+    showColumn(i);
   hideColumn(PeerListDelegate::IP_HIDDEN);
+  hideColumn(PeerListDelegate::COL_COUNT);
+  //To also migitate the above issue, we have to resize each column when
+  //its size is 0, because explicitely 'showing' the column isn't enough
+  //in the above scenario.
+  for (unsigned int i=0; i<PeerListDelegate::IP_HIDDEN; i++)
+    if (!columnWidth(i))
+      resizeColumnToContents(i);
   // Context menu
   setContextMenuPolicy(Qt::CustomContextMenu);
   connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showPeerListMenu(QPoint)));