#include "bufferviewconfig.h"
#include "bufferviewfilter.h"
#include "bufferviewmanager.h"
-#ifdef SPUTDEV
-# include "chatline.h"
-#else
-# include "chatline-old.h"
-#endif
#include "client.h"
#include "clientbacklogmanager.h"
#include "coreconnectdlg.h"
ui.setupUi(this);
setWindowTitle("Quassel IRC");
setWindowIcon(offlineTrayIcon);
+ qApp->setWindowIcon(offlineTrayIcon);
systray->setIcon(offlineTrayIcon);
setWindowIconText("Quassel IRC");
addDockWidget(Qt::RightDockWidgetArea, nickDock);
ui.menuViews->addAction(nickDock->toggleViewAction());
- connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool)));
+ // See NickListDock::NickListDock();
+ // connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool)));
// attach the NickListWidget to the BufferModel and the default selection
nickListWidget->setModel(Client::bufferModel());
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")));
// 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);
-#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)));
}
void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
- if (activationReason == QSystemTrayIcon::Trigger) {
+ if(activationReason == QSystemTrayIcon::Trigger) {
toggleVisibility();
}
}
void MainWin::toggleVisibility() {
if(isHidden() /*|| !isActiveWindow()*/) {
show();
- if(isMinimized())
- if (isMaximized())
+ if(isMinimized()) {
+ if(isMaximized())
showMaximized();
else
showNormal();
+ }
raise();
activateWindow();
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);