# include <KShortcutsDialog>
# include <KStatusBar>
# include <KToolBar>
+# include <KWindowSystem>
#endif
#ifdef Q_WS_X11
#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"
#include "flatproxymodel.h"
#include "iconloader.h"
#include "inputwidget.h"
-#include "inputline.h"
#include "irclistmodel.h"
#include "ircconnectionwizard.h"
#include "jumpkeyhandler.h"
# 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"
#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"
+#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
sslLabel(new QLabel()),
msgProcessorStatusWidget(new MsgProcessorStatusWidget()),
_titleSetter(this),
- _awayLog(0)
+ _awayLog(0),
+ _layoutLoaded(false)
{
#ifdef Q_WS_WIN
dwTickCount = 0;
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);
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
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() {
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));
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,
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)));
}
_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"));
_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() {
//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->show();
+ view->installEventFilter(_inputWidget); // for key presses
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());
dock = qobject_cast<BufferViewDock *>(action->parent());
if(dock && actionData.toInt() == bufferViewConfigId) {
removeAction(action);
+ _bufferViews.removeAll(dock);
+ Client::bufferViewOverlay()->removeView(dock->bufferViewId());
dock->deleteLater();
}
}
Q_ASSERT(action);
BufferViewDock *dock = qobject_cast<BufferViewDock *>(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();
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() {
_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);
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));
}
void MainWin::disconnectedFromCore() {
// save core specific layout and remove bufferviews;
saveLayout();
+ _layoutLoaded = false;
+
QVariant actionData;
BufferViewDock *dock;
foreach(QAction *action, _bufferViewsMenu->actions()) {
dock = qobject_cast<BufferViewDock *>(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();
syncer->useInternalCore();
}
-void MainWin::showCoreConnectionDlg(bool autoConnect) {
- CoreConnectDlg(autoConnect, this).exec();
-}
-
void MainWin::showChannelList(NetworkId netId) {
ChannelListDlg *channelListDlg = new ChannelListDlg();
channelListDlg->show();
}
+void MainWin::showIgnoreList(QString newRule) {
+ SettingsPageDlg dlg(new IgnoreListSettingsPage(this), this);
+ // prepare config dialog for new rule
+ if(!newRule.isEmpty())
+ qobject_cast<IgnoreListSettingsPage *>(dlg.currentPage())->editIgnoreRule(newRule);
+ dlg.exec();
+}
+
void MainWin::showCoreInfoDlg() {
CoreInfoDlg(this).exec();
}
void MainWin::showSettingsDlg() {
SettingsDlg *dlg = new SettingsDlg();
- //Category: Appearance
+ //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));
dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg));
dlg->registerSettingsPage(new NetworksSettingsPage(dlg));
dlg->registerSettingsPage(new AliasesSettingsPage(dlg));
+ dlg->registerSettingsPage(new IgnoreListSettingsPage(dlg));
+
+ if(Quassel::runMode() != Quassel::Monolithic) {
+ dlg->registerSettingsPage(new CoreAccountSettingsPage(dlg));
+ }
dlg->show();
}
/********************************************************************************************************/
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);
}
}
void MainWin::forceActivated() {
+#ifdef HAVE_KDE
+ show();
+ KWindowSystem::forceActiveWindow(winId());
+#else
+
#ifdef Q_WS_X11
// Bypass focus stealing prevention
QX11Info::setAppUserTime(QX11Info::appTime());
show();
raise();
activateWindow();
+#endif /* HAVE_KDE */
}
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<BufferId>();
BufferInfo::Type bufType = Client::networkModel()->bufferType(bufId);
- if(hasFocus && bufId == _bufferWidget->currentBuffer())
+ if(hasFocus && bufId == Client::bufferModel()->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<Message>(),
+ 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();
}
}
+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);
projects / quassel.git / blobdiff