#include "bufferviewconfig.h"
#include "bufferviewfilter.h"
#include "bufferviewmanager.h"
-#include "chatline-old.h"
+#include "channellistdlg.h"
#include "client.h"
#include "clientbacklogmanager.h"
#include "coreconnectdlg.h"
#include "signalproxy.h"
#include "topicwidget.h"
#include "inputwidget.h"
+#include "irclistmodel.h"
#include "verticaldock.h"
#include "uisettings.h"
#include "qtuisettings.h"
offlineTrayIcon(":/icons/quassel-icon-offline.png"),
trayIconActive(false),
timer(new QTimer(this)),
+ channelListDlg(new ChannelListDlg(this)),
settingsDlg(new SettingsDlg(this)),
debugConsole(new DebugConsole(this))
{
view->setFilteredModel(Client::bufferModel(), config);
view->show();
+ connect(&view->showChannelList, SIGNAL(triggered()), this, SLOT(showChannelList()));
+
Client::bufferModel()->synchronizeView(view);
dock->setWidget(view);
}
void MainWin::setupChatMonitor() {
+#ifndef SPUTDEV
VerticalDock *dock = new VerticalDock(tr("Chat Monitor"), this);
dock->setObjectName("ChatMonitorDock");
addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical);
ui.menuViews->addAction(dock->toggleViewAction());
+#endif /* SPUTDEV */
}
void MainWin::setupInputWidget() {
sslLabel->setPixmap(QPixmap());
}
-AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {
- return new ChatLineOld(msg);
-}
-
void MainWin::showCoreConnectionDlg(bool autoConnect) {
coreConnectDlg = new CoreConnectDlg(this, autoConnect);
connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int)));
//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();
}
}
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);