X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=043146883b6554dfd6476ec8c67535b2c8eaee7f;hb=46865cac259e0b6e2ee37f8a1d8703e1898219f4;hp=0bd221d4134cd8a972a9847c4255ff2d4290fe77;hpb=ef316d0db50a39efe45d71fe2eb4ea880724526b;p=quassel.git diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 0bd221d4..04314688 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -54,6 +54,7 @@ #include "clientbacklogmanager.h" #include "clientbufferviewconfig.h" #include "clientbufferviewmanager.h" +#include "clientignorelistmanager.h" #include "coreinfodlg.h" #include "coreconnectdlg.h" #include "contextmenuactionprovider.h" @@ -63,7 +64,6 @@ #include "flatproxymodel.h" #include "iconloader.h" #include "inputwidget.h" -#include "inputline.h" #include "irclistmodel.h" #include "ircconnectionwizard.h" #include "jumpkeyhandler.h" @@ -98,13 +98,17 @@ #include "settingspages/backlogsettingspage.h" #include "settingspages/bufferviewsettingspage.h" #include "settingspages/chatmonitorsettingspage.h" -#include "settingspages/colorsettingspage.h" +#include "settingspages/chatviewsettingspage.h" #include "settingspages/connectionsettingspage.h" #include "settingspages/generalsettingspage.h" #include "settingspages/highlightsettingspage.h" #include "settingspages/identitiessettingspage.h" +#include "settingspages/ignorelistsettingspage.h" +#include "settingspages/inputwidgetsettingspage.h" +#include "settingspages/itemviewsettingspage.h" #include "settingspages/networkssettingspage.h" #include "settingspages/notificationssettingspage.h" +#include "settingspages/topicwidgetsettingspage.h" MainWin::MainWin(QWidget *parent) #ifdef HAVE_KDE @@ -286,7 +290,7 @@ void MainWin::setupActions() { this, SLOT(quit()), tr("Ctrl+Q"))); // View - coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Buffer Views..."), coll, + coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Chat Lists..."), coll, this, SLOT(on_actionConfigureViews_triggered()))); QAction *lockAct = coll->addAction("LockLayout", new Action(tr("&Lock Layout"), coll)); @@ -297,8 +301,11 @@ void MainWin::setupActions() { 0, 0, QKeySequence::Find))->setCheckable(true); coll->addAction("ShowAwayLog", new Action(tr("Show Away Log"), coll, 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, @@ -320,10 +327,10 @@ void MainWin::setupActions() { coll->addAction("DebugLog", new Action(SmallIcon("tools-report-bug"), tr("Debug &Log"), coll, this, SLOT(on_actionDebugLog_triggered()))); coll->addAction("ReloadStyle", new Action(SmallIcon("view-refresh"), tr("Reload Stylesheet"), coll, - QtUi::style(), SLOT(loadStyleSheet()), QKeySequence::Refresh)); + QtUi::style(), SLOT(reload()), QKeySequence::Refresh)); // Navigation - coll->addAction("JumpHotBuffer", new Action(tr("Jump to hot buffer"), coll, + coll->addAction("JumpHotBuffer", new Action(tr("Jump to hot chat"), coll, this, SLOT(on_jumpHotBuffer_triggered()), QKeySequence(Qt::META + Qt::Key_A))); } @@ -350,24 +357,26 @@ void MainWin::setupMenus() { _fileMenu->addAction(coll->action("Quit")); _viewMenu = menuBar()->addMenu(tr("&View")); - _bufferViewsMenu = _viewMenu->addMenu(tr("&Buffer Views")); + _bufferViewsMenu = _viewMenu->addMenu(tr("&Chat Lists")); _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")); @@ -387,6 +396,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() { @@ -410,7 +430,7 @@ void MainWin::addBufferView(ClientBufferViewConfig *config) { //create the view and initialize it's filter BufferView *view = new BufferView(dock); view->setFilteredModel(Client::bufferModel(), config); - view->installEventFilter(_inputWidget->inputLine()); // for key presses + view->installEventFilter(_inputWidget); // for key presses view->show(); Client::bufferModel()->synchronizeView(view); @@ -615,6 +635,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); @@ -807,9 +832,12 @@ void MainWin::awayLogDestroyed() { void MainWin::showSettingsDlg() { SettingsDlg *dlg = new SettingsDlg(); - //Category: Appearance - dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); //General - dlg->registerSettingsPage(new ColorSettingsPage(dlg)); + //Category: Interface + dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); + 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)); @@ -822,6 +850,7 @@ void MainWin::showSettingsDlg() { dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg)); dlg->registerSettingsPage(new NetworksSettingsPage(dlg)); dlg->registerSettingsPage(new AliasesSettingsPage(dlg)); + dlg->registerSettingsPage(new IgnoreListSettingsPage(dlg)); dlg->show(); } @@ -944,8 +973,6 @@ void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) { Message::Flags flags = (Message::Flags)idx.data(ChatLineModel::FlagsRole).toInt(); if(flags.testFlag(Message::Backlog) || flags.testFlag(Message::Self)) continue; - flags |= Message::Backlog; // we only want to trigger a highlight once! - Client::messageModel()->setData(idx, (int)flags, ChatLineModel::FlagsRole); BufferId bufId = idx.data(ChatLineModel::BufferIdRole).value(); BufferInfo::Type bufType = Client::networkModel()->bufferType(bufId); @@ -953,7 +980,10 @@ void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) { if(hasFocus && bufId == _bufferWidget->currentBuffer()) continue; - if(flags & Message::Highlight || bufType == BufferInfo::QueryBuffer) { + 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();