X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=6e6b8513735759f204baf739ab0e9168c302dc7f;hp=2a5bad4c225268c3ca2baef2eea46f646d8fe44e;hb=fa00b68a21c777682d9feb37ade6b3904fc19d92;hpb=064c4dbb6b34cce490846ddf02c3e8db22e69ebb diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 2a5bad4c..6e6b8513 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -27,6 +27,7 @@ # include # include # include +# include #endif #ifdef Q_WS_X11 @@ -50,13 +51,12 @@ #include "chatmonitorview.h" #include "chatview.h" #include "client.h" -#include "clientsyncer.h" #include "clientbacklogmanager.h" #include "clientbufferviewconfig.h" #include "clientbufferviewmanager.h" #include "clientignorelistmanager.h" +#include "coreconnection.h" #include "coreinfodlg.h" -#include "coreconnectdlg.h" #include "contextmenuactionprovider.h" #include "debugbufferviewoverlay.h" #include "debuglogwidget.h" @@ -93,6 +93,10 @@ # include "knotificationbackend.h" #endif /* HAVE_KDE */ +#ifdef HAVE_INDICATEQT + #include "indicatornotificationbackend.h" +#endif + #include "settingspages/aliasessettingspage.h" #include "settingspages/appearancesettingspage.h" #include "settingspages/backlogsettingspage.h" @@ -100,6 +104,7 @@ #include "settingspages/chatmonitorsettingspage.h" #include "settingspages/chatviewsettingspage.h" #include "settingspages/connectionsettingspage.h" +#include "settingspages/coreaccountsettingspage.h" #include "settingspages/generalsettingspage.h" #include "settingspages/highlightsettingspage.h" #include "settingspages/identitiessettingspage.h" @@ -108,6 +113,7 @@ #include "settingspages/itemviewsettingspage.h" #include "settingspages/networkssettingspage.h" #include "settingspages/notificationssettingspage.h" +#include "settingspages/topicwidgetsettingspage.h" MainWin::MainWin(QWidget *parent) #ifdef HAVE_KDE @@ -120,7 +126,8 @@ MainWin::MainWin(QWidget *parent) sslLabel(new QLabel()), msgProcessorStatusWidget(new MsgProcessorStatusWidget()), _titleSetter(this), - _awayLog(0) + _awayLog(0), + _layoutLoaded(false) { #ifdef Q_WS_WIN dwTickCount = 0; @@ -147,6 +154,7 @@ void MainWin::init() { connect(Client::messageModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)), SLOT(messagesInserted(const QModelIndex &, int, int))); connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showChannelList(NetworkId)), SLOT(showChannelList(NetworkId))); + connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showIgnoreList(QString)), SLOT(showIgnoreList(QString))); // Setup Dock Areas setDockNestingEnabled(true); @@ -183,6 +191,12 @@ void MainWin::init() { QtUi::registerNotificationBackend(new KNotificationBackend(this)); #endif /* HAVE_KDE */ +#ifdef HAVE_INDICATEQT + QtUi::registerNotificationBackend(new IndicatorNotificationBackend(this)); +#endif + + connect(bufferWidget(), SIGNAL(currentChanged(BufferId)), SLOT(currentBufferChanged(BufferId))); + setDisconnectedState(); // Disable menus and stuff #ifdef HAVE_KDE @@ -197,10 +211,11 @@ void MainWin::init() { QtUi::actionCollection("General")->action("LockLayout")->setChecked(s.value("LockLayout", false).toBool()); if(Quassel::runMode() != Quassel::Monolithic) { - showCoreConnectionDlg(true); // autoconnect if appropriate + //showCoreConnectionDlg(true); // autoconnect if appropriate } else { startInternalCore(); } + Client::coreConnection()->start(); } MainWin::~MainWin() { @@ -297,11 +312,14 @@ void MainWin::setupActions() { connect(lockAct, SIGNAL(toggled(bool)), SLOT(on_actionLockLayout_toggled(bool))); coll->addAction("ToggleSearchBar", new Action(SmallIcon("edit-find"), tr("Show &Search Bar"), coll, - 0, 0, QKeySequence::Find))->setCheckable(true); + 0, 0, QKeySequence::Find))->setCheckable(true); coll->addAction("ShowAwayLog", new Action(tr("Show Away Log"), coll, - this, SLOT(showAwayLog()))); + this, SLOT(showAwayLog()))); + coll->addAction("ToggleMenuBar", new Action(SmallIcon("show-menu"), tr("Show &Menubar"), coll, + 0, 0, tr("Ctrl+M")))->setCheckable(true); + coll->addAction("ToggleStatusBar", new Action(tr("Show Status &Bar"), coll, - 0, 0))->setCheckable(true); + 0, 0))->setCheckable(true); // Settings coll->addAction("ConfigureQuassel", new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll, @@ -357,20 +375,22 @@ void MainWin::setupMenus() { _bufferViewsMenu->addAction(coll->action("ConfigureBufferViews")); _toolbarMenu = _viewMenu->addMenu(tr("&Toolbars")); _viewMenu->addSeparator(); + + _viewMenu->addAction(coll->action("ToggleMenuBar")); + _viewMenu->addAction(coll->action("ToggleStatusBar")); _viewMenu->addAction(coll->action("ToggleSearchBar")); coreAction = coll->action("ShowAwayLog"); flagRemoteCoreOnly(coreAction); _viewMenu->addAction(coreAction); - _viewMenu->addAction(coll->action("ToggleStatusBar")); _viewMenu->addSeparator(); _viewMenu->addAction(coll->action("LockLayout")); _settingsMenu = menuBar()->addMenu(tr("&Settings")); #ifdef HAVE_KDE - _settingsMenu->addAction(KStandardAction::keyBindings(this, SLOT(showShortcutsDlg()), this)); _settingsMenu->addAction(KStandardAction::configureNotifications(this, SLOT(showNotificationsDlg()), this)); + _settingsMenu->addAction(KStandardAction::keyBindings(this, SLOT(showShortcutsDlg()), this)); #endif _settingsMenu->addAction(coll->action("ConfigureQuassel")); @@ -390,6 +410,17 @@ void MainWin::setupMenus() { _helpDebugMenu->addAction(coll->action("DebugLog")); _helpDebugMenu->addSeparator(); _helpDebugMenu->addAction(coll->action("ReloadStyle")); + + // Toggle visibility + QAction *showMenuBar = QtUi::actionCollection("General")->action("ToggleMenuBar"); + + QtUiSettings uiSettings; + bool enabled = uiSettings.value("ShowMenuBar", QVariant(true)).toBool(); + showMenuBar->setChecked(enabled); + enabled ? menuBar()->show() : menuBar()->hide(); + + connect(showMenuBar, SIGNAL(toggled(bool)), menuBar(), SLOT(setVisible(bool))); + connect(showMenuBar, SIGNAL(toggled(bool)), this, SLOT(saveMenuBarStatus(bool))); } void MainWin::setupBufferWidget() { @@ -414,12 +445,11 @@ void MainWin::addBufferView(ClientBufferViewConfig *config) { BufferView *view = new BufferView(dock); view->setFilteredModel(Client::bufferModel(), config); view->installEventFilter(_inputWidget); // for key presses - view->show(); Client::bufferModel()->synchronizeView(view); dock->setWidget(view); - dock->show(); + dock->setVisible(_layoutLoaded); // don't show before state has been restored addDockWidget(Qt::LeftDockWidgetArea, dock); _bufferViewsMenu->addAction(dock->toggleViewAction()); @@ -439,6 +469,8 @@ void MainWin::removeBufferView(int bufferViewConfigId) { dock = qobject_cast(action->parent()); if(dock && actionData.toInt() == bufferViewConfigId) { removeAction(action); + _bufferViews.removeAll(dock); + Client::bufferViewOverlay()->removeView(dock->bufferViewId()); dock->deleteLater(); } } @@ -449,6 +481,11 @@ void MainWin::bufferViewToggled(bool enabled) { Q_ASSERT(action); BufferViewDock *dock = qobject_cast(action->parent()); Q_ASSERT(dock); + + // Make sure we don't toggle backlog fetch for a view we've already removed + if(!_bufferViews.contains(dock)) + return; + if(enabled) { Client::bufferViewOverlay()->addView(dock->bufferViewId()); BufferViewConfig *config = dock->config(); @@ -610,6 +647,8 @@ void MainWin::setupStatusBar() { connect(showStatusbar, SIGNAL(toggled(bool)), statusBar(), SLOT(setVisible(bool))); connect(showStatusbar, SIGNAL(toggled(bool)), this, SLOT(saveStatusBarStatus(bool))); + + connect(Client::coreConnection(), SIGNAL(connectionMsg(QString)), statusBar(), SLOT(showMessage(QString))); } void MainWin::setupHotList() { @@ -618,6 +657,11 @@ void MainWin::setupHotList() { _bufferHotList = new BufferHotListFilter(flatProxy); } +void MainWin::saveMenuBarStatus(bool enabled) { + QtUiSettings uiSettings; + uiSettings.setValue("ShowMenuBar", enabled); +} + void MainWin::saveStatusBarStatus(bool enabled) { QtUiSettings uiSettings; uiSettings.setValue("ShowStatusBar", enabled); @@ -705,13 +749,22 @@ void MainWin::setConnectedState() { void MainWin::loadLayout() { QtUiSettings s; - int accountId = Client::currentCoreAccount().toInt(); - restoreState(s.value(QString("MainWinState-%1").arg(accountId)).toByteArray(), accountId); + int accountId = Client::currentCoreAccount().accountId().toInt(); + QByteArray state = s.value(QString("MainWinState-%1").arg(accountId)).toByteArray(); + if(state.isEmpty()) { + // Make sure that the default bufferview is shown + if(_bufferViews.count()) + _bufferViews.at(0)->show(); + return; + } + + restoreState(state, accountId); + _layoutLoaded = true; } void MainWin::saveLayout() { QtUiSettings s; - int accountId = Client::currentCoreAccount().toInt(); + int accountId = Client::currentCoreAccount().accountId().toInt(); if(accountId > 0) s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId)); } @@ -727,6 +780,8 @@ void MainWin::updateLagIndicator(int lag) { void MainWin::disconnectedFromCore() { // save core specific layout and remove bufferviews; saveLayout(); + _layoutLoaded = false; + QVariant actionData; BufferViewDock *dock; foreach(QAction *action, _bufferViewsMenu->actions()) { @@ -737,9 +792,12 @@ void MainWin::disconnectedFromCore() { dock = qobject_cast(action->parent()); if(dock && actionData.toInt() != -1) { removeAction(action); + _bufferViews.removeAll(dock); + Client::bufferViewOverlay()->removeView(dock->bufferViewId()); dock->deleteLater(); } } + QtUiSettings s; restoreState(s.value("MainWinState").toByteArray()); setDisconnectedState(); @@ -770,10 +828,6 @@ void MainWin::startInternalCore() { syncer->useInternalCore(); } -void MainWin::showCoreConnectionDlg(bool autoConnect) { - CoreConnectDlg(autoConnect, this).exec(); -} - void MainWin::showChannelList(NetworkId netId) { ChannelListDlg *channelListDlg = new ChannelListDlg(); @@ -788,6 +842,14 @@ void MainWin::showChannelList(NetworkId netId) { channelListDlg->show(); } +void MainWin::showIgnoreList(QString newRule) { + SettingsPageDlg dlg(new IgnoreListSettingsPage(this), this); + // prepare config dialog for new rule + if(!newRule.isEmpty()) + qobject_cast(dlg.currentPage())->editIgnoreRule(newRule); + dlg.exec(); +} + void MainWin::showCoreInfoDlg() { CoreInfoDlg(this).exec(); } @@ -815,6 +877,7 @@ void MainWin::showSettingsDlg() { dlg->registerSettingsPage(new ChatViewSettingsPage(dlg)); dlg->registerSettingsPage(new ItemViewSettingsPage(dlg)); dlg->registerSettingsPage(new InputWidgetSettingsPage(dlg)); + dlg->registerSettingsPage(new TopicWidgetSettingsPage(dlg)); dlg->registerSettingsPage(new HighlightSettingsPage(dlg)); dlg->registerSettingsPage(new NotificationsSettingsPage(dlg)); dlg->registerSettingsPage(new BacklogSettingsPage(dlg)); @@ -829,6 +892,10 @@ void MainWin::showSettingsDlg() { dlg->registerSettingsPage(new AliasesSettingsPage(dlg)); dlg->registerSettingsPage(new IgnoreListSettingsPage(dlg)); + if(Quassel::runMode() != Quassel::Monolithic) { + dlg->registerSettingsPage(new CoreAccountSettingsPage(dlg)); + } + dlg->show(); } @@ -845,8 +912,11 @@ void MainWin::showShortcutsDlg() { /********************************************************************************************************/ bool MainWin::event(QEvent *event) { - if(event->type() == QEvent::WindowActivate) - QtUi::closeNotifications(); + if(event->type() == QEvent::WindowActivate) { + BufferId buffer = Client::bufferModel()->currentBuffer(); + if(buffer.isValid()) + QtUi::closeNotifications(buffer); + } return QMainWindow::event(event); } @@ -919,6 +989,11 @@ void MainWin::toggleMinimizedToTray() { } void MainWin::forceActivated() { +#ifdef HAVE_KDE + show(); + KWindowSystem::forceActiveWindow(winId()); +#else + #ifdef Q_WS_X11 // Bypass focus stealing prevention QX11Info::setAppUserTime(QX11Info::appTime()); @@ -934,6 +1009,7 @@ void MainWin::forceActivated() { show(); raise(); activateWindow(); +#endif /* HAVE_KDE */ } void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) { @@ -954,12 +1030,13 @@ void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) { BufferId bufId = idx.data(ChatLineModel::BufferIdRole).value(); BufferInfo::Type bufType = Client::networkModel()->bufferType(bufId); - if(hasFocus && bufId == _bufferWidget->currentBuffer()) + if(hasFocus && bufId == Client::bufferModel()->currentBuffer()) continue; - const MessageModelItem *item = const_cast(Client::messageModel())->messageItemAt(i); - if((flags & Message::Highlight || bufType == BufferInfo::QueryBuffer) && - !Client::ignoreListManager()->match(item->message(), Client::networkModel()->networkName(bufId))) { + if((flags & Message::Highlight || bufType == BufferInfo::QueryBuffer) + && !(Client::ignoreListManager() && Client::ignoreListManager()->match(idx.data(MessageModel::MessageRole).value(), + Client::networkModel()->networkName(bufId)))) + { QModelIndex senderIdx = Client::messageModel()->index(i, ChatLineModel::SenderColumn); QString sender = senderIdx.data(ChatLineModel::EditRole).toString(); QString contents = idx.data(ChatLineModel::DisplayRole).toString(); @@ -979,6 +1056,11 @@ void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) { } } +void MainWin::currentBufferChanged(BufferId buffer) { + if(buffer.isValid()) + QtUi::closeNotifications(buffer); +} + void MainWin::clientNetworkCreated(NetworkId id) { const Network *net = Client::network(id); QAction *act = new QAction(net->networkName(), this);