#include "mainwin.h"
#include "aboutdlg.h"
-#include "chatwidget.h"
-#include "bufferview.h"
-#include "bufferviewconfig.h"
-#include "bufferviewfilter.h"
+#include "action.h"
+#include "actioncollection.h"
+#include "buffermodel.h"
#include "bufferviewmanager.h"
#include "channellistdlg.h"
+#include "chatlinemodel.h"
+#include "chatmonitorfilter.h"
+#include "chatmonitorview.h"
+#include "chatview.h"
#include "client.h"
#include "clientbacklogmanager.h"
#include "coreinfodlg.h"
#include "coreconnectdlg.h"
-#include "networkmodel.h"
-#include "buffermodel.h"
+#include "iconloader.h"
+#include "inputwidget.h"
+#include "irclistmodel.h"
+#include "jumpkeyhandler.h"
+#include "msgprocessorstatuswidget.h"
#include "nicklistwidget.h"
+#include "qtuiapplication.h"
+#include "qtuimessageprocessor.h"
+#include "qtuisettings.h"
+#include "sessionsettings.h"
#include "settingsdlg.h"
#include "settingspagedlg.h"
-#include "signalproxy.h"
#include "topicwidget.h"
-#include "inputwidget.h"
-#include "irclistmodel.h"
#include "verticaldock.h"
-#include "uisettings.h"
-#include "qtuisettings.h"
-#include "jumpkeyhandler.h"
-#include "uisettings.h"
-
-#include "selectionmodelsynchronizer.h"
-#include "mappedselectionmodel.h"
+#include "desktopnotificationbackend.h"
+#include "systraynotificationbackend.h"
+#include "settingspages/aliasessettingspage.h"
#include "settingspages/appearancesettingspage.h"
#include "settingspages/bufferviewsettingspage.h"
#include "settingspages/colorsettingspage.h"
#include "settingspages/highlightsettingspage.h"
#include "settingspages/identitiessettingspage.h"
#include "settingspages/networkssettingspage.h"
+#include "settingspages/notificationssettingspage.h"
-
-#include "debugconsole.h"
-#include "global.h"
-#include "qtuistyle.h"
-
-
-MainWin::MainWin(QtUi *_gui, QWidget *parent)
+MainWin::MainWin(QWidget *parent)
: QMainWindow(parent),
- gui(_gui),
+ coreLagLabel(new QLabel()),
sslLabel(new QLabel()),
+ msgProcessorStatusWidget(new MsgProcessorStatusWidget()),
_titleSetter(this),
- systray(new QSystemTrayIcon(this)),
- activeTrayIcon(":/icons/quassel-icon-active.png"),
- onlineTrayIcon(":/icons/quassel-icon.png"),
- offlineTrayIcon(":/icons/quassel-icon-offline.png"),
- trayIconActive(false),
- timer(new QTimer(this)),
- channelListDlg(new ChannelListDlg(this)),
- settingsDlg(new SettingsDlg(this)),
- debugConsole(new DebugConsole(this))
+ _trayIcon(new QSystemTrayIcon(this)),
+ _actionCollection(new ActionCollection(this))
{
+ QtUiSettings uiSettings;
+ QString style = uiSettings.value("Style", QString("")).toString();
+ if(style != "") {
+ QApplication::setStyle(style);
+ }
ui.setupUi(this);
setWindowTitle("Quassel IRC");
- setWindowIcon(offlineTrayIcon);
- qApp->setWindowIcon(offlineTrayIcon);
- systray->setIcon(offlineTrayIcon);
setWindowIconText("Quassel IRC");
+ updateIcon();
+
+ QtUi::actionCollection()->addAssociatedWidget(this);
statusBar()->showMessage(tr("Waiting for core..."));
installEventFilter(new JumpKeyHandler(this));
- UiSettings uiSettings;
- QString style = uiSettings.value("Style", QString("")).toString();
- if(style != "") {
- QApplication::setStyle(style);
- }
+ QtUi::registerNotificationBackend(new SystrayNotificationBackend(this));
+#ifdef HAVE_DBUS
+ QtUi::registerNotificationBackend(new DesktopNotificationBackend(this));
+#endif
+
+ QtUiApplication* app = qobject_cast<QtUiApplication*> qApp;
+ connect(app, SIGNAL(saveStateToSession(const QString&)), this, SLOT(saveStateToSession(const QString&)));
+ connect(app, SIGNAL(saveStateToSessionSettings(SessionSettings&)), this, SLOT(saveStateToSessionSettings(SessionSettings&)));
}
void MainWin::init() {
else
resize(QSize(800, 500));
- Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)));
-
connect(QApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(saveLayout()));
connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientNetworkCreated(NetworkId)));
setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
// setup stuff...
+ setupActions();
setupMenus();
setupViews();
setupNickWidget();
setupStatusBar();
setupSystray();
- setupSettingsDlg();
-
// restore mainwin state
restoreState(s.value("MainWinState").toByteArray());
- // restore locked state of docks
+ // restore locked state of docks
ui.actionLockDockPositions->setChecked(s.value("LockDocks", false).toBool());
-
setDisconnectedState(); // Disable menus and stuff
showCoreConnectionDlg(true); // autoconnect if appropriate
// attach the BufferWidget to the BufferModel and the default selection
ui.bufferWidget->setModel(Client::bufferModel());
ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
+ ui.menuViews->addAction(QtUi::actionCollection()->action("toggleSearchBar"));
_titleSetter.setModel(Client::bufferModel());
_titleSetter.setSelectionModel(Client::bufferModel()->standardSelectionModel());
s.setValue("MainWinState", saveState());
}
+void MainWin::updateIcon() {
+ QPixmap icon;
+ if(Client::isConnected())
+ icon = DesktopIcon("quassel", IconLoader::SizeEnormous);
+ else
+ icon = DesktopIcon("quassel_disconnected", IconLoader::SizeEnormous);
+ setWindowIcon(icon);
+ qApp->setWindowIcon(icon);
+ systemTrayIcon()->setIcon(icon);
+}
+
+void MainWin::setupActions() {
+ // TODO don't get these from *.ui anymore... we shouldn't need one
+ ui.actionQuit->setIcon(SmallIcon("application-exit"));
+ ui.actionSettingsDlg->setIcon(SmallIcon("configure"));
+ ui.actionManageViews->setIcon(SmallIcon("view-tree"));
+ ui.actionManageViews2->setIcon(SmallIcon("view-tree"));
+ ui.actionAboutQt->setIcon(SmallIcon("qt"));
+ ui.actionAboutQuassel->setIcon(SmallIcon("quassel"));
+ ui.actionConnectCore->setIcon(SmallIcon("network-connect"));
+ ui.actionDisconnectCore->setIcon(SmallIcon("network-disconnect"));
+ ui.actionCoreInfo->setIcon(SmallIcon("help-about"));
+}
+
void MainWin::setupMenus() {
connect(ui.actionConnectCore, SIGNAL(triggered()), this, SLOT(showCoreConnectionDlg()));
connect(ui.actionDisconnectCore, SIGNAL(triggered()), Client::instance(), SLOT(disconnectFromCore()));
connect(ui.actionCoreInfo, SIGNAL(triggered()), this, SLOT(showCoreInfoDlg()));
connect(ui.actionQuit, SIGNAL(triggered()), QCoreApplication::instance(), SLOT(quit()));
connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg()));
- // connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole()));
connect(ui.actionAboutQuassel, SIGNAL(triggered()), this, SLOT(showAboutDlg()));
connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt()));
}
view->show();
connect(&view->showChannelList, SIGNAL(triggered()), this, SLOT(showChannelList()));
-
+
Client::bufferModel()->synchronizeView(view);
dock->setWidget(view);
}
}
-void MainWin::setupSettingsDlg() {
- //Category: Appearance
- settingsDlg->registerSettingsPage(new ColorSettingsPage(settingsDlg));
- settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
- settingsDlg->registerSettingsPage(new AppearanceSettingsPage(settingsDlg)); //General
- //Category: Behaviour
- settingsDlg->registerSettingsPage(new GeneralSettingsPage(settingsDlg));
- settingsDlg->registerSettingsPage(new HighlightSettingsPage(settingsDlg));
- //Category: General
- settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
- settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
- settingsDlg->registerSettingsPage(new BufferViewSettingsPage(settingsDlg));
-}
-
void MainWin::on_actionEditNetworks_triggered() {
SettingsPageDlg dlg(new NetworksSettingsPage(this), this);
dlg.exec();
}
void MainWin::setupChatMonitor() {
-#ifndef SPUTDEV
VerticalDock *dock = new VerticalDock(tr("Chat Monitor"), this);
dock->setObjectName("ChatMonitorDock");
- ChatWidget *chatWidget = new ChatWidget(0, this);
- chatWidget->show();
- dock->setWidget(chatWidget);
+ ChatMonitorFilter *filter = new ChatMonitorFilter(Client::messageModel(), this);
+ ChatMonitorView *chatView = new ChatMonitorView(filter, this);
+ chatView->show();
+ dock->setWidget(chatView);
dock->show();
- Buffer *buf = Client::monitorBuffer();
- if(!buf)
- return;
-
- chatWidget->setContents(buf->contents());
- connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatWidget, SLOT(appendMsg(AbstractUiMsg *)));
- connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), chatWidget, SLOT(prependMsg(AbstractUiMsg *)));
-
addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical);
ui.menuViews->addAction(dock->toggleViewAction());
-#endif /* SPUTDEV */
}
void MainWin::setupInputWidget() {
VerticalDock *dock = new VerticalDock(tr("Topic"), this);
dock->setObjectName("TopicDock");
TopicWidget *topicwidget = new TopicWidget(dock);
- connect(topicwidget, SIGNAL(topicChanged(const QString &)), this, SLOT(changeTopic(const QString &)));
dock->setWidget(topicwidget);
}
void MainWin::setupStatusBar() {
+ // MessageProcessor progress
+ statusBar()->addPermanentWidget(msgProcessorStatusWidget);
+ connect(Client::messageProcessor(), SIGNAL(progressUpdated(int, int)), msgProcessorStatusWidget, SLOT(setProgress(int, int)));
+
+ // Core Lag:
+ updateLagIndicator(0);
+ statusBar()->addPermanentWidget(coreLagLabel);
+ connect(Client::signalProxy(), SIGNAL(lagUpdated(int)), this, SLOT(updateLagIndicator(int)));
+
+ // SSL indicator
connect(Client::instance(), SIGNAL(securedConnection()), this, SLOT(securedConnection()));
sslLabel->setPixmap(QPixmap());
statusBar()->addPermanentWidget(sslLabel);
}
void MainWin::setupSystray() {
- connect(timer, SIGNAL(timeout()), this, SLOT(makeTrayIconBlink()));
- connect(Client::instance(), SIGNAL(messageReceived(const Message &)), this, SLOT(receiveMessage(const Message &)));
+ connect(Client::messageModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+ SLOT(messagesInserted(const QModelIndex &, int, int)));
systrayMenu = new QMenu(this);
systrayMenu->addAction(ui.actionAboutQuassel);
systrayMenu->addSeparator();
systrayMenu->addAction(ui.actionQuit);
- systray->setContextMenu(systrayMenu);
+ systemTrayIcon()->setContextMenu(systrayMenu);
UiSettings s;
if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) {
- systray->show();
+ systemTrayIcon()->show();
}
#ifndef Q_WS_MAC
- connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )),
+ connect(systemTrayIcon(), SIGNAL(activated( QSystemTrayIcon::ActivationReason )),
this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason )));
#endif
}
}
-// FIXME this should be made prettier...
-void MainWin::changeTopic(const QString &topic) {
- BufferId id = ui.bufferWidget->currentBuffer();
- if(!id.isValid()) return;
- Buffer *buffer = Client::buffer(id);
- if(buffer) Client::userInput(buffer->bufferInfo(), QString("/topic %1").arg(topic));
-}
-
void MainWin::connectedToCore() {
Q_CHECK_PTR(Client::bufferViewManager());
connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigAdded(int)), this, SLOT(addBufferView(int)));
connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigDeleted(int)), this, SLOT(removeBufferView(int)));
connect(Client::bufferViewManager(), SIGNAL(initDone()), this, SLOT(loadLayout()));
-
- foreach(BufferInfo id, Client::allBufferInfos()) {
- Client::backlogManager()->requestBacklog(id.bufferId(), 500, -1);
- }
+
+ Client::backlogManager()->requestInitialBacklog();
setConnectedState();
}
void MainWin::setConnectedState() {
- ui.menuViews->setEnabled(true);
//ui.menuCore->setEnabled(true);
ui.actionConnectCore->setEnabled(false);
ui.actionDisconnectCore->setEnabled(true);
+ ui.actionCoreInfo->setEnabled(true);
+ ui.menuViews->setEnabled(true);
ui.bufferWidget->show();
statusBar()->showMessage(tr("Connected to core."));
- setWindowIcon(onlineTrayIcon);
- qApp->setWindowIcon(onlineTrayIcon);
- systray->setIcon(onlineTrayIcon);
if(sslLabel->width() == 0)
- sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/no-ssl")));
+ sslLabel->setPixmap(SmallIcon("security-low"));
+ updateIcon();
}
void MainWin::loadLayout() {
if(accountId > 0) s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId));
}
+void MainWin::updateLagIndicator(int lag) {
+ coreLagLabel->setText(QString(tr("Core Lag: %1 msec")).arg(lag));
+}
+
+
void MainWin::securedConnection() {
// todo: make status bar entry
- sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/ssl")));
+ sslLabel->setPixmap(SmallIcon("security-high"));
}
void MainWin::disconnectedFromCore() {
}
void MainWin::setDisconnectedState() {
- ui.menuViews->setEnabled(false);
//ui.menuCore->setEnabled(false);
+ ui.actionConnectCore->setEnabled(true);
ui.actionDisconnectCore->setEnabled(false);
+ ui.actionCoreInfo->setEnabled(false);
+ ui.menuViews->setEnabled(false);
ui.bufferWidget->hide();
- ui.actionConnectCore->setEnabled(true);
statusBar()->showMessage(tr("Not connected to core."));
- setWindowIcon(offlineTrayIcon);
- qApp->setWindowIcon(offlineTrayIcon);
- systray->setIcon(offlineTrayIcon);
sslLabel->setPixmap(QPixmap());
+ updateIcon();
}
void MainWin::showCoreConnectionDlg(bool autoConnect) {
- coreConnectDlg = new CoreConnectDlg(this, autoConnect);
- connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int)));
- coreConnectDlg->setModal(true);
- coreConnectDlg->show();
-}
-
-void MainWin::coreConnectionDlgFinished(int /*code*/) {
- coreConnectDlg->close();
- //exit(1);
+ CoreConnectDlg(autoConnect, this).exec();
}
void MainWin::showChannelList(NetworkId netId) {
+ ChannelListDlg *channelListDlg = new ChannelListDlg();
+
if(!netId.isValid()) {
QAction *action = qobject_cast<QAction *>(sender());
if(action)
netId = action->data().value<NetworkId>();
}
+
+ channelListDlg->setAttribute(Qt::WA_DeleteOnClose);
channelListDlg->setNetwork(netId);
channelListDlg->show();
}
void MainWin::showCoreInfoDlg() {
- CoreInfoDlg dlg(this);
- dlg.exec();
+ CoreInfoDlg(this).exec();
}
void MainWin::showSettingsDlg() {
- settingsDlg->show();
-}
+ SettingsDlg *dlg = new SettingsDlg();
-void MainWin::showDebugConsole() {
- debugConsole->show();
+ //Category: Appearance
+ dlg->registerSettingsPage(new ColorSettingsPage(dlg));
+ dlg->registerSettingsPage(new FontsSettingsPage(dlg));
+ dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); //General
+ //Category: Behaviour
+ dlg->registerSettingsPage(new GeneralSettingsPage(dlg));
+ dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
+ dlg->registerSettingsPage(new AliasesSettingsPage(dlg));
+ dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
+ //Category: General
+ dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg));
+ dlg->registerSettingsPage(new NetworksSettingsPage(dlg));
+ dlg->registerSettingsPage(new BufferViewSettingsPage(dlg));
+
+ dlg->show();
}
void MainWin::showAboutDlg() {
- AboutDlg dlg(this);
- dlg.exec();
+ AboutDlg(this).exec();
}
void MainWin::closeEvent(QCloseEvent *event) {
// setFocus(); //Qt::ActiveWindowFocusReason
} else {
- if(systray->isSystemTrayAvailable ()) {
+ if(systemTrayIcon()->isSystemTrayAvailable ()) {
clearFocus();
hide();
- if(!systray->isVisible()) {
- systray->show();
+ if(!systemTrayIcon()->isVisible()) {
+ systemTrayIcon()->show();
}
} else {
lower();
}
}
-void MainWin::receiveMessage(const Message &msg) {
+void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) {
+ Q_UNUSED(parent);
+
if(QApplication::activeWindow() != 0)
return;
- if(msg.flags() & Message::Highlight || msg.bufferInfo().type() == BufferInfo::QueryBuffer) {
- QString title = msg.bufferInfo().bufferName();;
- if(msg.bufferInfo().type() != BufferInfo::QueryBuffer) {
- QString sender = msg.sender();
- int i = sender.indexOf("!");
- if(i != -1)
- sender = sender.left(i);
- title += QString(" - %1").arg(sender);
- }
-
- UiSettings uiSettings;
-
-#ifndef SPUTDEV
- if(uiSettings.value("DisplayPopupMessages", QVariant(true)).toBool()) {
- // FIXME don't invoke style engine for this!
- QString text = QtUi::style()->styleString(Message::mircToInternal(msg.contents())).plainText;
- displayTrayIconMessage(title, text);
+ for(int i = start; i <= end; i++) {
+ QModelIndex idx = Client::messageModel()->index(i, ChatLineModel::ContentsColumn);
+ if(!idx.isValid()) {
+ qDebug() << "MainWin::messagesInserted(): Invalid model index!";
+ continue;
}
-#endif
- if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) {
- QApplication::alert(this);
- setTrayIconActivity(true);
+ Message::Flags flags = (Message::Flags)idx.data(ChatLineModel::FlagsRole).toInt();
+ if(flags.testFlag(Message::Backlog)) 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(flags & Message::Highlight || bufType == BufferInfo::QueryBuffer) {
+ QModelIndex senderIdx = Client::messageModel()->index(i, ChatLineModel::SenderColumn);
+ QString sender = senderIdx.data(ChatLineModel::EditRole).toString();
+ QString contents = idx.data(ChatLineModel::DisplayRole).toString();
+ QtUi::invokeNotification(bufId, sender, contents);
}
}
}
bool MainWin::event(QEvent *event) {
if(event->type() == QEvent::WindowActivate)
- setTrayIconActivity(false);
+ QtUi::closeNotifications();
return QMainWindow::event(event);
}
-void MainWin::displayTrayIconMessage(const QString &title, const QString &message) {
- systray->showMessage(title, message);
-}
-
-void MainWin::setTrayIconActivity(bool active) {
- if(active) {
- if(!timer->isActive())
- timer->start(500);
- } else {
- timer->stop();
- systray->setIcon(onlineTrayIcon);
- }
-}
-
-void MainWin::makeTrayIconBlink() {
- if(trayIconActive) {
- systray->setIcon(onlineTrayIcon);
- trayIconActive = false;
- } else {
- systray->setIcon(activeTrayIcon);
- trayIconActive = true;
- }
-}
-
void MainWin::clientNetworkCreated(NetworkId id) {
const Network *net = Client::network(id);
QAction *act = new QAction(net->networkName(), this);
switch(net->connectionState()) {
case Network::Initialized:
- action->setIcon(QIcon(":/16x16/actions/network-connect"));
+ action->setIcon(SmallIcon("network-connect"));
break;
case Network::Disconnected:
- action->setIcon(QIcon(":/16x16/actions/network-disconnect"));
+ action->setIcon(SmallIcon("network-disconnect"));
break;
default:
- action->setIcon(QIcon(":/16x16/actions/gear"));
+ action->setIcon(SmallIcon("network-wired"));
}
}
QAction *action = findChild<QAction *>(QString("NetworkAction-%1").arg(id.toInt()));
if(!action)
return;
-
+
action->deleteLater();
}
else net->requestDisconnect();
}
+void MainWin::on_actionDebugNetworkModel_triggered(bool) {
+ QTreeView *view = new QTreeView;
+ view->setAttribute(Qt::WA_DeleteOnClose);
+ view->setWindowTitle("Debug NetworkModel View");
+ view->setModel(Client::networkModel());
+ view->setColumnWidth(0, 250);
+ view->setColumnWidth(1, 250);
+ view->setColumnWidth(2, 80);
+ view->resize(610, 300);
+ view->show();
+}
+
+void MainWin::saveStateToSession(const QString &sessionId) {
+ return;
+ SessionSettings s(sessionId);
+
+ s.setValue("MainWinSize", size());
+ s.setValue("MainWinPos", pos());
+ s.setValue("MainWinState", saveState());
+}
+
+void MainWin::saveStateToSessionSettings(SessionSettings & s)
+{
+ s.setValue("MainWinSize", size());
+ s.setValue("MainWinPos", pos());
+ s.setValue("MainWinState", saveState());
+}
projects / quassel.git / blobdiff