X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=52699e93cc134a4bb7f18492731291fec8f5390b;hp=fb610e0623dd4fb566bd61ff69f4c1842378f7ab;hb=25eb89768427a8c62f0ea776d05407db3aec2f97;hpb=1736d7414b96efc1189e56f22bd0407989c3a7c9

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index fb610e06..52699e93 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -25,11 +25,7 @@
 #include "bufferviewconfig.h"
 #include "bufferviewfilter.h"
 #include "bufferviewmanager.h"
-#ifdef SPUTDEV
-# include "chatline.h"
-#else
-# include "chatline-old.h"
-#endif
+#include "channellistdlg.h"
 #include "client.h"
 #include "clientbacklogmanager.h"
 #include "coreconnectdlg.h"
@@ -41,6 +37,7 @@
 #include "signalproxy.h"
 #include "topicwidget.h"
 #include "inputwidget.h"
+#include "irclistmodel.h"
 #include "verticaldock.h"
 #include "uisettings.h"
 #include "qtuisettings.h"
@@ -77,12 +74,14 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent)
     offlineTrayIcon(":/icons/quassel-icon-offline.png"),
     trayIconActive(false),
     timer(new QTimer(this)),
+    channelListDlg(new ChannelListDlg(this)),
     settingsDlg(new SettingsDlg(this)),
     debugConsole(new DebugConsole(this))
 {
   ui.setupUi(this);
   setWindowTitle("Quassel IRC");
   setWindowIcon(offlineTrayIcon);
+  qApp->setWindowIcon(offlineTrayIcon);
   systray->setIcon(offlineTrayIcon);
   setWindowIconText("Quassel IRC");
 
@@ -131,6 +130,12 @@ void MainWin::init() {
   setupTopicWidget();
   setupChatMonitor();
   setupInputWidget();
+
+  QAction *toggleLockDocksAction = ui.menuViews->addAction(tr("Lock dock positions"));
+  toggleLockDocksAction->setCheckable(true);
+  connect(toggleLockDocksAction, SIGNAL(toggled(bool)), this, SLOT(lockVerticalDocks(bool)));
+  toggleLockDocksAction->setChecked(s.value("LockDocks", false).toBool());
+  
   setupStatusBar();
   setupSystray();
 
@@ -163,7 +168,7 @@ void MainWin::setupMenus() {
   connect(ui.actionQuit, SIGNAL(triggered()), QCoreApplication::instance(), SLOT(quit()));
   //connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList()));
   connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg()));
-  connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole()));
+  // 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()));
 
@@ -195,6 +200,8 @@ void MainWin::addBufferView(BufferViewConfig *config) {
   view->setFilteredModel(Client::bufferModel(), config);
   view->show();
 
+  connect(&view->showChannelList, SIGNAL(triggered()), this, SLOT(showChannelList()));
+  
   Client::bufferModel()->synchronizeView(view);
 
   dock->setWidget(view);
@@ -258,6 +265,14 @@ void MainWin::showManageViewsDlg() {
   dlg.exec();
 }
 
+void MainWin::lockVerticalDocks(bool lock) {
+  QList<VerticalDock *> docks = findChildren<VerticalDock *>();
+  foreach(VerticalDock *dock, docks) {
+    dock->showTitle(!lock);
+  }
+  QtUiSettings().setValue("LockDocks", lock);
+}
+
 void MainWin::setupNickWidget() {
   // create nick dock
   NickListDock *nickDock = new NickListDock(tr("Nicks"), this);
@@ -424,6 +439,7 @@ void MainWin::setConnectedState() {
   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")));
@@ -482,19 +498,11 @@ void MainWin::setDisconnectedState() {
   // nickListWidget->reset();
   statusBar()->showMessage(tr("Not connected to core."));
   setWindowIcon(offlineTrayIcon);
+  qApp->setWindowIcon(offlineTrayIcon);
   systray->setIcon(offlineTrayIcon);
   sslLabel->setPixmap(QPixmap());
 }
 
-AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {
-#ifdef SPUTDEV
-  //return new ChatLine(msg);
-  return 0;
-#else
-  return new ChatLineOld(msg);
-#endif
-}
-
 void MainWin::showCoreConnectionDlg(bool autoConnect) {
   coreConnectDlg = new CoreConnectDlg(this, autoConnect);
   connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int)));
@@ -507,6 +515,16 @@ void MainWin::coreConnectionDlgFinished(int /*code*/) {
   //exit(1);
 }
 
+void MainWin::showChannelList(NetworkId netId) {
+  if(!netId.isValid()) {
+    QAction *action = qobject_cast<QAction *>(sender());
+    if(action)
+      netId = action->data().value<NetworkId>();
+  }
+  channelListDlg->setNetwork(netId);
+  channelListDlg->show();
+}
+
 void MainWin::showSettingsDlg() {
   settingsDlg->show();
 }
@@ -531,7 +549,7 @@ void MainWin::closeEvent(QCloseEvent *event) {
 }
 
 void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
-  if (activationReason == QSystemTrayIcon::Trigger) {
+  if(activationReason == QSystemTrayIcon::Trigger) {
     toggleVisibility();
   }
 }
@@ -539,11 +557,12 @@ void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas
 void MainWin::toggleVisibility() {
   if(isHidden() /*|| !isActiveWindow()*/) {
     show();
-    if(isMinimized())
-      if (isMaximized())
+    if(isMinimized()) {
+      if(isMaximized())
         showMaximized();
       else
         showNormal();
+    }
 
     raise();
     activateWindow();
@@ -578,12 +597,13 @@ void MainWin::receiveMessage(const Message &msg) {
 
     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.text())).text;
+      QString text = QtUi::style()->styleString(Message::mircToInternal(msg.contents())).plainText;
       displayTrayIconMessage(title, text);
     }
-
+#endif
     if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) {
       QApplication::alert(this);
       setTrayIconActivity(true);