setupNickWidget();
setupInputWidget();
setupChatMonitor();
+ setupViewMenuTail();
setupStatusBar();
setupToolBars();
setupSystray();
coll->addAction("ToggleStatusBar", new Action(tr("Show Status &Bar"), coll,
0, 0))->setCheckable(true);
+ coll->addAction("ToggleFullscreen", new Action(SmallIcon("window_fullscreen"), tr("&Fullscreen mode"), coll,
+ this, SLOT(toggleFullscreen()), QKeySequence(Qt::Key_F11)));
// Settings
coll->addAction("ConfigureShortcuts", new Action(SmallIcon("configure-shortcuts"), tr("Configure &Shortcuts..."), coll,
coll->addAction("NextBufferView", new Action(SmallIcon("go-next-view"), tr("Activate Next Chat List"), coll,
this, SLOT(nextBufferView()), QKeySequence(QKeySequence::Forward)));
coll->addAction("PreviousBufferView", new Action(SmallIcon("go-previous-view"), tr("Activate Previous Chat List"), coll,
- this, SLOT(previousBufferView()), QKeySequence(QKeySequence::Back)));
+ this, SLOT(previousBufferView()), QKeySequence::Back));
+ coll->addAction("NextBuffer", new Action(SmallIcon("go-down"), tr("Go to Next Chat"), coll,
+ this, SLOT(nextBuffer()), QKeySequence(Qt::ALT + Qt::Key_Down)));
+ coll->addAction("PreviousBuffer", new Action(SmallIcon("go-up"), tr("Go to Previous Chat"), coll,
+ this, SLOT(previousBuffer()), QKeySequence(Qt::ALT + Qt::Key_Up)));
}
void MainWin::setupMenus() {
return dock->isActive() ? qobject_cast<BufferView*>(dock->widget()) : 0;
}
+void MainWin::changeActiveBufferView(int bufferViewId) {
+ if(bufferViewId < 0)
+ return;
+
+ BufferView *current = activeBufferView();
+ if(current) {
+ qobject_cast<BufferViewDock*>(current->parent())->setActive(false);
+ _activeBufferViewIndex = -1;
+ }
+
+ for(int i = 0; i < _bufferViews.count(); i++) {
+ BufferViewDock *dock = _bufferViews.at(i);
+ if(dock->bufferViewId() == bufferViewId && !dock->isHidden()) {
+ _activeBufferViewIndex = i;
+ dock->setActive(true);
+ return;
+ }
+ }
+
+ nextBufferView(); // fallback
+}
+
void MainWin::changeActiveBufferView(bool backwards) {
BufferView *current = activeBufferView();
if(current)
changeActiveBufferView(true);
}
+void MainWin::nextBuffer() {
+ BufferView *view = activeBufferView();
+ if(view)
+ view->nextBuffer();
+}
+
+void MainWin::previousBuffer() {
+ BufferView *view = activeBufferView();
+ if(view)
+ view->previousBuffer();
+}
+
void MainWin::showNotificationsDlg() {
SettingsPageDlg dlg(new NotificationsSettingsPage(this), this);
dlg.exec();
dock->toggleViewAction()->setText(tr("Show Topic Line"));
}
+void MainWin::setupViewMenuTail() {
+ _viewMenu->addSeparator();
+ _viewMenu->addAction(QtUi::actionCollection("General")->action("ToggleFullscreen"));
+}
+
void MainWin::setupTitleSetter() {
_titleSetter.setModel(Client::bufferModel());
_titleSetter.setSelectionModel(Client::bufferModel()->standardSelectionModel());
wizard->show();
}
else {
- QtUiSettings s;
- BufferId lastUsedBufferId(s.value("LastUsedBufferId").toInt());
- if(lastUsedBufferId.isValid())
- Client::bufferModel()->switchToBuffer(lastUsedBufferId);
+ // Monolithic always preselects last used buffer - Client only if the connection died
+ if(Client::coreConnection()->wasReconnect() || Quassel::runMode() == Quassel::Monolithic) {
+ QtUiSettings s;
+ BufferId lastUsedBufferId(s.value("LastUsedBufferId").toInt());
+ if(lastUsedBufferId.isValid())
+ Client::bufferModel()->switchToBuffer(lastUsedBufferId);
+ }
}
}
}
restoreState(state, accountId);
+ int bufferViewId = s.value(QString("ActiveBufferView-%1").arg(accountId), -1).toInt();
+ if(bufferViewId >= 0)
+ changeActiveBufferView(bufferViewId);
+
_layoutLoaded = true;
}
void MainWin::saveLayout() {
QtUiSettings s;
int accountId = _bufferViews.count()? Client::currentCoreAccount().accountId().toInt() : 0; // only save if we still have a layout!
- if(accountId > 0)
+ if(accountId > 0) {
s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId));
+ BufferView *view = activeBufferView();
+ s.setValue(QString("ActiveBufferView-%1").arg(accountId), view ? view->config()->bufferViewId() : -1);
+ }
}
void MainWin::disconnectedFromCore() {
}
}
+ // store last active buffer
QtUiSettings s;
+ BufferId lastBufId = _bufferWidget->currentBuffer();
+ if(lastBufId.isValid()) {
+ s.setValue("LastUsedBufferId", lastBufId.toInt());
+ // clear the current selection
+ Client::bufferModel()->standardSelectionModel()->clearSelection();
+ }
restoreState(s.value("MainWinState").toByteArray());
setDisconnectedState();
}
#endif
}
+void MainWin::toggleFullscreen() {
+ QAction *action = QtUi::actionCollection("General")->action("ToggleFullscreen");
+
+ if(isFullScreen()) {
+ showNormal();
+ action->setIcon(SmallIcon("window_fullscreen"));
+ action->setText(tr("&Fullscreen mode"));
+ }
+ else {
+ showFullScreen();
+ action->setIcon(SmallIcon("window_nofullscreen"));
+ action->setText(tr("&Normal mode"));
+ }
+}
+
/********************************************************************************************************/
bool MainWin::event(QEvent *event) {
switch(net->connectionState()) {
case Network::Initialized:
action->setIcon(SmallIcon("network-connect"));
+ // if we have no currently selected buffer, jump to the first connecting statusbuffer
+ if(!bufferWidget()->currentBuffer().isValid()) {
+ QModelIndex idx = Client::networkModel()->networkIndex(net->networkId());
+ if(idx.isValid()) {
+ BufferId statusBufferId = idx.data(NetworkModel::BufferIdRole).value<BufferId>();
+ Client::bufferModel()->switchToBuffer(statusBufferId);
+ }
+ }
break;
case Network::Disconnected:
action->setIcon(SmallIcon("network-disconnect"));