#include "qtuisettings.h"
#include "jumpkeyhandler.h"
+#include "uisettings.h"
+
#include "selectionmodelsynchronizer.h"
#include "mappedselectionmodel.h"
+#include "settingspages/appearancesettingspage.h"
+#include "settingspages/bufferviewsettingspage.h"
#include "settingspages/colorsettingspage.h"
#include "settingspages/fontssettingspage.h"
#include "settingspages/generalsettingspage.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),
statusBar()->showMessage(tr("Waiting for core..."));
installEventFilter(new JumpKeyHandler(this));
+
+ UiSettings uiSettings;
+ QString style = uiSettings.value("Style", QString("")).toString();
+ if(style != "") {
+ QApplication::setStyle(style);
+ }
}
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();
//Category: Appearance
settingsDlg->registerSettingsPage(new ColorSettingsPage(settingsDlg));
settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg));
+ settingsDlg->registerSettingsPage(new AppearanceSettingsPage(settingsDlg)); //General
//Category: Behaviour
settingsDlg->registerSettingsPage(new GeneralSettingsPage(settingsDlg));
//Category: General
settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
+ // settingsDlg->registerSettingsPage(new BufferViewSettingsPage(settingsDlg));
}
void MainWin::setupNickWidget() {
// create nick dock
- nickDock = new QDockWidget(tr("Nicks"), this);
+ NickListDock *nickDock = new NickListDock(tr("Nicks"), this);
nickDock->setObjectName("NickDock");
nickDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
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(nickListWidget->showNickListAction());
+ ui.menuViews->addAction(nickDock->toggleViewAction());
+ connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool)));
// attach the NickListWidget to the BufferModel and the default selection
nickListWidget->setModel(Client::bufferModel());
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();
if(!buf)
return;
- chatWidget->init(BufferId(0));
- QList<ChatLineOld *> lines;
- QList<AbstractUiMsg *> msgs = buf->contents();
- foreach(AbstractUiMsg *msg, msgs) {
- lines.append(dynamic_cast<ChatLineOld*>(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 *)));
connect(timer, SIGNAL(timeout()), this, SLOT(makeTrayIconBlink()));
connect(Client::instance(), SIGNAL(messageReceived(const Message &)), this, SLOT(receiveMessage(const Message &)));
- systray = new QSystemTrayIcon(this);
systray->setIcon(inactiveTrayIcon);
// systray->setToolTip("left click to minimize the quassel client to tray");
// systray->setToolTip(toolTip);
title += QString(" - %1").arg(sender);
}
QString text = QtUi::style()->styleString(Message::mircToInternal(msg.text())).text;
- displayTrayIconMessage(title, text);
- QApplication::alert(this);
- setTrayIconActivity(true);
+
+ UiSettings uiSettings;
+
+ if(uiSettings.value("DisplayPopupMessages", QVariant(true)).toBool()) {
+ displayTrayIconMessage(title, text);
+ }
+
+ if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) {
+ QApplication::alert(this);
+ setTrayIconActivity(true);
+ }
}
}