X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=4b1c38f732eb2b78e479c1032d718c8c6453c086;hp=d700b642b06bdeca5edef2c744a5928eb41fbc82;hb=d83a607c35c063d0cfae9ac12a09afdb8431d9ba;hpb=923ab935b9e2936d2512ef9344811e9bb2f436f3 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index d700b642..4b1c38f7 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -17,15 +17,15 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -//#define SPUTDEV - #include "mainwin.h" #include "aboutdlg.h" #include "chatwidget.h" #include "bufferview.h" +#include "chatline.h" #include "chatline-old.h" #include "client.h" +#include "clientbacklogmanager.h" #include "coreconnectdlg.h" #include "networkmodel.h" #include "buffermodel.h" @@ -51,16 +51,22 @@ #include "debugconsole.h" +#include "global.h" MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui), + systray(new QSystemTrayIcon(this)), + activeTrayIcon(":/icons/quassel-icon-active.png"), + inactiveTrayIcon(":/icons/quassel-icon.png"), + trayIconActive(false), + timer(new QTimer(this)), settingsDlg(new SettingsDlg(this)), debugConsole(new DebugConsole(this)) { ui.setupUi(this); setWindowTitle("Quassel IRC"); - setWindowIcon(QIcon(":icons/quassel-icon.png")); + setWindowIcon(inactiveTrayIcon); setWindowIconText("Quassel IRC"); statusBar()->showMessage(tr("Waiting for core...")); @@ -79,8 +85,8 @@ void MainWin::init() { connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientNetworkCreated(NetworkId))); connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), this, SLOT(clientNetworkRemoved(NetworkId))); - ui.bufferWidget->init(); - + //ui.bufferWidget->init(); + show(); statusBar()->showMessage(tr("Not connected to core.")); @@ -102,7 +108,6 @@ void MainWin::init() { setupInputWidget(); setupSystray(); - setupSettingsDlg(); // restore mainwin state @@ -111,16 +116,16 @@ void MainWin::init() { disconnectedFromCore(); // Disable menus and stuff showCoreConnectionDlg(true); // autoconnect if appropriate - // attach the BufferWidget to the PropertyMapper + // attach the BufferWidget to the BufferModel and the default selection ui.bufferWidget->setModel(Client::bufferModel()); ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); - -#ifdef SPUTDEV - //showSettingsDlg(); - //showAboutDlg(); - showNetworkDlg(); - exit(1); -#endif + + if(Global::SPUTDEV) { + //showSettingsDlg(); + //showAboutDlg(); + //showNetworkDlg(); + //exit(1); + } } @@ -188,11 +193,6 @@ void MainWin::setupSettingsDlg() { //Category: General settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg)); settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg)); - - -#ifdef SPUTDEV - connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit())); // FIXME -#endif } void MainWin::setupNickWidget() { @@ -204,18 +204,22 @@ void MainWin::setupNickWidget() { nickListWidget = new NickListWidget(nickDock); nickDock->setWidget(nickListWidget); + nickListWidget->setShowDockAction(nickDock->toggleViewAction()); + connect(nickDock->toggleViewAction(), SIGNAL(toggled(bool)), nickListWidget, SLOT(changedVisibility(bool))); addDockWidget(Qt::RightDockWidgetArea, nickDock); - ui.menuViews->addAction(nickDock->toggleViewAction()); + ui.menuViews->addAction(nickListWidget->showNickListAction()); - Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer"); + // attach the NickListWidget to the BufferModel and the default selection + nickListWidget->setModel(Client::bufferModel()); + nickListWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); } void MainWin::setupChatMonitor() { VerticalDock *dock = new VerticalDock(tr("Chat Monitor"), this); dock->setObjectName("ChatMonitorDock"); - ChatWidget *chatWidget = new ChatWidget(this); + ChatWidget *chatWidget = new ChatWidget(0, this); chatWidget->show(); dock->setWidget(chatWidget); dock->show(); @@ -224,13 +228,7 @@ void MainWin::setupChatMonitor() { if(!buf) return; - chatWidget->init(BufferId(0)); - QList lines; - QList msgs = buf->contents(); - foreach(AbstractUiMsg *msg, msgs) { - lines.append(dynamic_cast(msg)); - } - chatWidget->setContents(lines); + chatWidget->setContents(buf->contents()); connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatWidget, SLOT(appendMsg(AbstractUiMsg *))); connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), chatWidget, SLOT(prependMsg(AbstractUiMsg *))); @@ -263,7 +261,8 @@ void MainWin::setupTopicWidget() { dock->setWidget(topicwidget); - Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic"); + topicwidget->setModel(Client::bufferModel()); + topicwidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); addDockWidget(Qt::TopDockWidgetArea, dock); @@ -271,8 +270,10 @@ void MainWin::setupTopicWidget() { } void MainWin::setupSystray() { - systray = new QSystemTrayIcon(this); - systray->setIcon(QIcon(":/icons/quassel-icon.png")); + connect(timer, SIGNAL(timeout()), this, SLOT(makeTrayIconBlink())); + connect(Client::instance(), SIGNAL(messageReceived(const Message &)), this, SLOT(receiveMessage(const Message &))); + + systray->setIcon(inactiveTrayIcon); // systray->setToolTip("left click to minimize the quassel client to tray"); // systray->setToolTip(toolTip); @@ -290,11 +291,11 @@ void MainWin::setupSystray() { if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) { systray->show(); } - - #ifndef Q_WS_MAC + +#ifndef Q_WS_MAC connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )), this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason ))); - #endif +#endif } @@ -320,7 +321,7 @@ void MainWin::changeTopic(const QString &topic) { void MainWin::connectedToCore() { foreach(BufferInfo id, Client::allBufferInfos()) { - emit requestBacklog(id, 1000, -1); + Client::backlogManager()->requestBacklog(id.bufferId(), 500, -1); } ui.menuViews->setEnabled(true); @@ -339,12 +340,13 @@ void MainWin::disconnectedFromCore() { //ui.actionNetworkList->setEnabled(false); ui.bufferWidget->hide(); ui.actionConnectCore->setEnabled(true); - nickListWidget->reset(); + // nickListWidget->reset(); statusBar()->showMessage(tr("Not connected to core.")); } AbstractUiMsg *MainWin::layoutMsg(const Message &msg) { - return new ChatLine(msg); + if(Global::SPUTDEV) return new ChatLine(msg); + return new ChatLineOld(msg); } void MainWin::showCoreConnectionDlg(bool autoConnect) { @@ -398,8 +400,9 @@ void MainWin::toggleVisibility() { showNormal(); raise(); - setFocus(Qt::ActiveWindowFocusReason); - // activateWindow(); + activateWindow(); + // setFocus(); //Qt::ActiveWindowFocusReason + } else { if(systray->isSystemTrayAvailable ()) { clearFocus(); @@ -413,6 +416,57 @@ void MainWin::toggleVisibility() { } } +void MainWin::receiveMessage(const Message &msg) { + 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); + } + QString text = QtUi::style()->styleString(Message::mircToInternal(msg.text())).text; + displayTrayIconMessage(title, text); + QApplication::alert(this); + setTrayIconActivity(true); + } +} + +bool MainWin::event(QEvent *event) { + if(event->type() == QEvent::WindowActivate) + setTrayIconActivity(false); + 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(inactiveTrayIcon); + } +} + +void MainWin::makeTrayIconBlink() { + if(trayIconActive) { + systray->setIcon(inactiveTrayIcon); + trayIconActive = false; + } else { + systray->setIcon(activeTrayIcon); + trayIconActive = true; + } +} + + void MainWin::showNetworkDlg() { SettingsPageDlg dlg(new NetworksSettingsPage(this), this); dlg.exec();