void MainWin::updateIcon()
{
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
const int size = 128;
#else
const int size = 48;
configureShortcutsAct->setMenuRole(QAction::NoRole);
coll->addAction("ConfigureShortcuts", configureShortcutsAct);
- #ifdef Q_WS_MAC
+ #ifdef Q_OS_MAC
QAction *configureQuasselAct = new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
this, SLOT(showSettingsDlg()));
configureQuasselAct->setMenuRole(QAction::PreferencesRole);
this, SLOT(on_jumpHotBuffer_triggered()), QKeySequence(Qt::META + Qt::Key_A)));
// Jump keys
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
const int bindModifier = Qt::ControlModifier | Qt::AltModifier;
const int jumpModifier = Qt::ControlModifier;
#else
connect(_nickListWidget, SIGNAL(nickSelectionChanged(QModelIndexList)),
QtUi::toolBarActionProvider(), SLOT(nickSelectionChanged(QModelIndexList)));
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
setUnifiedTitleAndToolBarOnMac(true);
#endif
QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar);
_toolbarMenu->addAction(_mainToolBar->toggleViewAction());
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
QtUiSettings uiSettings;
bool visible = uiSettings.value("ShowMainToolBar", QVariant(true)).toBool();
#endif
}
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
void MainWin::saveMainToolBarStatus(bool enabled)
{
QtUiSettings uiSettings;
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());
}
void MainWin::on_actionDebugHotList_triggered()
{
+ _bufferHotList->invalidate();
+ _bufferHotList->sort(0, Qt::DescendingOrder);
+
QTreeView *view = new QTreeView;
view->setAttribute(Qt::WA_DeleteOnClose);
view->setModel(_bufferHotList);