X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=fc183148fe1d78f6881abed3729eb0fcfe70e1f7;hp=22d3724c601a424e4ecaac7f30e2c1032335d862;hb=3dfc65182f8e847d815c3fc7350fa676a37de45a;hpb=1afbad3bc1ebcd6abab1c02d7fbbb08ac3c52e48 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 22d3724c..fc183148 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -20,6 +20,8 @@ #include "mainwin.h" #include "aboutdlg.h" +#include "action.h" +#include "actioncollection.h" #include "bufferview.h" #include "bufferviewconfig.h" #include "bufferviewfilter.h" @@ -27,11 +29,17 @@ #include "channellistdlg.h" #include "chatlinemodel.h" #include "chatmonitorfilter.h" +#include "chatmonitorview.h" #include "chatview.h" +#include "chatviewsearchbar.h" #include "client.h" #include "clientbacklogmanager.h" #include "coreinfodlg.h" #include "coreconnectdlg.h" +#include "iconloader.h" +#include "msgprocessorstatuswidget.h" +#include "qtuimessageprocessor.h" +#include "qtuiapplication.h" #include "networkmodel.h" #include "buffermodel.h" #include "nicklistwidget.h" @@ -43,9 +51,9 @@ #include "irclistmodel.h" #include "verticaldock.h" #include "uisettings.h" -#include "util.h" #include "qtuisettings.h" #include "jumpkeyhandler.h" +#include "sessionsettings.h" #include "selectionmodelsynchronizer.h" #include "mappedselectionmodel.h" @@ -61,34 +69,30 @@ #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"), + + activeTrayIcon(DesktopIcon("quassel_newmessage", IconLoader::SizeEnormous)), + onlineTrayIcon(DesktopIcon("quassel", IconLoader::SizeEnormous)), + offlineTrayIcon(DesktopIcon("quassel_disconnected", IconLoader::SizeEnormous)), trayIconActive(false), + timer(new QTimer(this)), - channelListDlg(new ChannelListDlg(this)), - settingsDlg(new SettingsDlg(this)), - debugConsole(new DebugConsole(this)) + _actionCollection(new ActionCollection(this)) { UiSettings uiSettings; - loadTranslation(uiSettings.value("Locale", QLocale::system()).value()); - QString style = uiSettings.value("Style", QString("")).toString(); if(style != "") { QApplication::setStyle(style); } - ui.setupUi(this); setWindowTitle("Quassel IRC"); setWindowIcon(offlineTrayIcon); @@ -96,6 +100,8 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent) systray->setIcon(offlineTrayIcon); setWindowIconText("Quassel IRC"); + QtUi::actionCollection()->addAssociatedWidget(this); + statusBar()->showMessage(tr("Waiting for core...")); installEventFilter(new JumpKeyHandler(this)); @@ -109,6 +115,9 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent) connect(desktopNotifications, SIGNAL(NotificationClosed(uint, uint)), this, SLOT(desktopNotificationClosed(uint, uint))); connect(desktopNotifications, SIGNAL(ActionInvoked(uint, const QString&)), this, SLOT(desktopNotificationInvoked(uint, const QString&))); #endif + QtUiApplication* app = qobject_cast qApp; + connect(app, SIGNAL(saveStateToSession(const QString&)), this, SLOT(saveStateToSession(const QString&))); + connect(app, SIGNAL(saveStateToSessionSettings(SessionSettings&)), this, SLOT(saveStateToSessionSettings(SessionSettings&))); } void MainWin::init() { @@ -118,8 +127,6 @@ 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))); @@ -138,6 +145,7 @@ void MainWin::init() { setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); // setup stuff... + setupActions(); setupMenus(); setupViews(); setupNickWidget(); @@ -147,21 +155,19 @@ void MainWin::init() { setupStatusBar(); setupSystray(); - setupSettingsDlg(); - // restore mainwin state restoreState(s.value("MainWinState").toByteArray()); // 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()); @@ -174,13 +180,25 @@ MainWin::~MainWin() { s.setValue("MainWinState", saveState()); } +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())); } @@ -234,22 +252,6 @@ void MainWin::removeBufferView(int bufferViewConfigId) { } } -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)); - settingsDlg->registerSettingsPage(new AliasesSettingsPage(settingsDlg)); - settingsDlg->registerSettingsPage(new NotificationsSettingsPage(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(); @@ -292,7 +294,7 @@ void MainWin::setupChatMonitor() { dock->setObjectName("ChatMonitorDock"); ChatMonitorFilter *filter = new ChatMonitorFilter(Client::messageModel(), this); - ChatView *chatView = new ChatView(filter, this); + ChatMonitorView *chatView = new ChatMonitorView(filter, this); chatView->show(); dock->setWidget(chatView); dock->show(); @@ -322,7 +324,6 @@ void MainWin::setupTopicWidget() { 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); @@ -335,6 +336,10 @@ void MainWin::setupTopicWidget() { } 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); @@ -403,23 +408,13 @@ void MainWin::changeEvent(QEvent *event) { } } -// 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(); } @@ -435,7 +430,7 @@ void MainWin::setConnectedState() { qApp->setWindowIcon(onlineTrayIcon); systray->setIcon(onlineTrayIcon); if(sslLabel->width() == 0) - sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/no-ssl"))); + sslLabel->setPixmap(SmallIcon("security-low")); } void MainWin::loadLayout() { @@ -451,13 +446,13 @@ void MainWin::saveLayout() { } void MainWin::updateLagIndicator(int lag) { - coreLagLabel->setText(QString("Core Lag: %1 msec").arg(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() { @@ -496,43 +491,49 @@ void MainWin::setDisconnectedState() { } 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(sender()); if(action) netId = action->data().value(); } + + 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) { @@ -580,6 +581,7 @@ void MainWin::toggleVisibility() { void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) { Q_UNUSED(parent); + if(QApplication::activeWindow() != 0) return; @@ -590,6 +592,10 @@ void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) { continue; } 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(); BufferInfo::Type bufType = Client::networkModel()->bufferType(bufId); @@ -738,13 +744,13 @@ void MainWin::clientNetworkUpdated() { 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")); } } @@ -778,3 +784,19 @@ void MainWin::on_actionDebugNetworkModel_triggered(bool) { 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()); +}