From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 23 Sep 2014 21:04:41 +0000 (+0200)
Subject: Merge pull request #83 from m5/hotlist-fix
X-Git-Tag: 0.11.0~2
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=755e966f66d2c05970e831088dea4df92c8787a5;hp=-c

Merge pull request #83 from m5/hotlist-fix

Fix buffer sorting for hot buffer hotkey
---

755e966f66d2c05970e831088dea4df92c8787a5
diff --combined src/qtui/mainwin.cpp
index 63fe459b,645ce366..73124aa8
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@@ -1025,15 -1025,13 +1025,15 @@@ void MainWin::setupToolBars(
  #endif
  }
  
 -#ifdef Q_OS_MAC
  void MainWin::saveMainToolBarStatus(bool enabled)
  {
 +#ifdef Q_OS_MAC
      QtUiSettings uiSettings;
      uiSettings.setValue("ShowMainToolBar", enabled);
 -}
 +#else
 +    Q_UNUSED(enabled);
  #endif
 +}
  
  
  void MainWin::connectedToCore()
@@@ -1609,9 -1607,7 +1609,7 @@@ void MainWin::on_jumpHotBuffer_triggere
      if (!_bufferHotList->rowCount())
          return;
  
-     QModelIndex topIndex = _bufferHotList->index(0, 0);
-     BufferId bufferId = _bufferHotList->data(topIndex, NetworkModel::BufferIdRole).value<BufferId>();
-     Client::bufferModel()->switchToBuffer(bufferId);
+     Client::bufferModel()->switchToBuffer(_bufferHotList->hottestBuffer());
  }
  
  
@@@ -1662,6 -1658,9 +1660,9 @@@ void MainWin::on_actionDebugNetworkMode
  
  void MainWin::on_actionDebugHotList_triggered()
  {
+     _bufferHotList->invalidate();
+     _bufferHotList->sort(0, Qt::DescendingOrder);
+ 
      QTreeView *view = new QTreeView;
      view->setAttribute(Qt::WA_DeleteOnClose);
      view->setModel(_bufferHotList);