X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=4b1c38f732eb2b78e479c1032d718c8c6453c086;hp=e1763041edab57cace6cb54d0dd214d21d7d9ee3;hb=d83a607c35c063d0cfae9ac12a09afdb8431d9ba;hpb=ba9d9d766830eab8cc238c60a69f67c8b527aa7e

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index e1763041..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"
@@ -43,22 +43,30 @@
 #include "selectionmodelsynchronizer.h"
 #include "mappedselectionmodel.h"
 
+#include "settingspages/colorsettingspage.h"
 #include "settingspages/fontssettingspage.h"
+#include "settingspages/generalsettingspage.h"
 #include "settingspages/identitiessettingspage.h"
 #include "settingspages/networkssettingspage.h"
-#include "settingspages/generalsettingspage.h"
+
 
 #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..."));
@@ -68,14 +76,17 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent)
 
 void MainWin::init() {
   QtUiSettings s;
-  resize(s.value("MainWinSize").toSize());
+  if(s.value("MainWinSize").isValid())
+    resize(s.value("MainWinSize").toSize());
+  else
+    resize(QSize(800, 500));
 
   Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)));
 
   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."));
@@ -92,12 +103,11 @@ void MainWin::init() {
   setupMenus();
   setupViews();
   setupNickWidget();
+  setupTopicWidget();
   setupChatMonitor();
   setupInputWidget();
-  setupTopicWidget();
   setupSystray();
 
-  
   setupSettingsDlg();
 
   // restore mainwin state
@@ -106,14 +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();
-#endif
+  
+  if(Global::SPUTDEV) {
+    //showSettingsDlg();
+    //showAboutDlg();
+    //showNetworkDlg();
+    //exit(1);
+  }
 
 }
 
@@ -165,6 +177,7 @@ QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel
   dock->show();
 
   addDockWidget(Qt::LeftDockWidgetArea, dock);
+
   ui.menuViews->addAction(dock->toggleViewAction());
 
   netViews.append(dock);
@@ -172,15 +185,14 @@ QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel
 }
 
 void MainWin::setupSettingsDlg() {
-
+  //Category: Appearance
+  settingsDlg->registerSettingsPage(new ColorSettingsPage(settingsDlg));
   settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
+  //Category: Behaviour
+  settingsDlg->registerSettingsPage(new GeneralSettingsPage(settingsDlg));
+  //Category: General
   settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
   settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
-  settingsDlg->registerSettingsPage(new GeneralSettingsPage(settingsDlg));
-  
-#ifdef SPUTDEV
-  connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit()));  // FIXME
-#endif
 }
 
 void MainWin::setupNickWidget() {
@@ -192,17 +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());
 
-  Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");
+  ui.menuViews->addAction(nickListWidget->showNickListAction());
+
+  // 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();
@@ -211,13 +228,7 @@ void MainWin::setupChatMonitor() {
   if(!buf)
     return;
 
-  chatWidget->init(BufferId(0));
-  QList<ChatLine *> lines;
-  QList<AbstractUiMsg *> msgs = buf->contents();
-  foreach(AbstractUiMsg *msg, msgs) {
-    lines.append(dynamic_cast<ChatLine*>(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 *)));
 
@@ -246,9 +257,12 @@ 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);
 
-  Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
+  topicwidget->setModel(Client::bufferModel());
+  topicwidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
 
   addDockWidget(Qt::TopDockWidgetArea, dock);
 
@@ -256,11 +270,12 @@ 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 &)));
 
-  QString toolTip("left click to minimize the quassel client to tray");
-  systray->setToolTip(toolTip);
+  systray->setIcon(inactiveTrayIcon);
+//  systray->setToolTip("left click to minimize the quassel client to tray");
+//  systray->setToolTip(toolTip);
 
   systrayMenu = new QMenu(this);
   systrayMenu->addAction(ui.actionAboutQuassel);
@@ -272,36 +287,45 @@ void MainWin::setupSystray() {
 
   systray->setContextMenu(systrayMenu);
 
-  QtUiSettings s;
-  if(s.value("UseSystemTrayIcon").toBool()) {
+  UiSettings s;
+  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
 
 }
 
 void MainWin::changeEvent(QEvent *event) {
   if(event->type() == QEvent::WindowStateChange) {
     if(windowState() & Qt::WindowMinimized) {
-      QtUiSettings s;
+      UiSettings s;
       if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) {
         toggleVisibility();
+        event->ignore();
       }
     }
   }
 }
 
+// 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() {
   foreach(BufferInfo id, Client::allBufferInfos()) {
-    emit requestBacklog(id, 1000, -1);
+    Client::backlogManager()->requestBacklog(id.bufferId(), 500, -1);
   }
 
   ui.menuViews->setEnabled(true);
-  ui.menuCore->setEnabled(true);
+  //ui.menuCore->setEnabled(true);
   ui.actionConnectCore->setEnabled(false);
   ui.actionDisconnectCore->setEnabled(true);
   //ui.actionNetworkList->setEnabled(true);
@@ -311,17 +335,18 @@ void MainWin::connectedToCore() {
 
 void MainWin::disconnectedFromCore() {
   ui.menuViews->setEnabled(false);
-  ui.menuCore->setEnabled(false);
+  //ui.menuCore->setEnabled(false);
   ui.actionDisconnectCore->setEnabled(false);
   //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) {
@@ -350,7 +375,7 @@ void MainWin::showAboutDlg() {
 }
 
 void MainWin::closeEvent(QCloseEvent *event) {
-  QtUiSettings s;
+  UiSettings s;
   if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
     toggleVisibility();
     event->ignore();
@@ -366,22 +391,82 @@ void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas
 }
 
 void MainWin::toggleVisibility() {
-  if(isHidden()) {
+  if(isHidden() /*|| !isActiveWindow()*/) {
     show();
-    if(isMinimized()) {
-      if(isMaximized()) {
+    if(isMinimized())
+      if (isMaximized())
         showMaximized();
-      } else {
+      else
         showNormal();
-      }
-    }
+
     raise();
     activateWindow();
+    // setFocus(); //Qt::ActiveWindowFocusReason
+
   } else {
-   hide();
+    if(systray->isSystemTrayAvailable ()) {
+      clearFocus();
+      hide();
+      if(!systray->isVisible()) {
+        systray->show();
+      }
+    } else {
+      lower();
+    }
+  }
+}
+
+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();
@@ -416,13 +501,13 @@ void MainWin::clientNetworkUpdated() {
       a->setText(net->networkName());
       if(net->connectionState() == Network::Initialized) {
         a->setIcon(QIcon(":/16x16/actions/network-connect"));
-        a->setEnabled(true);
+        //a->setEnabled(true);
       } else if(net->connectionState() == Network::Disconnected) {
         a->setIcon(QIcon(":/16x16/actions/network-disconnect"));
-        a->setEnabled(true);
+        //a->setEnabled(true);
       } else {
         a->setIcon(QIcon(":/16x16/actions/gear"));
-        a->setEnabled(false);
+        //a->setEnabled(false);
       }
       return;
     }