#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"
+#include "settingspages/highlightsettingspage.h"
#include "settingspages/identitiessettingspage.h"
#include "settingspages/networkssettingspage.h"
#include "debugconsole.h"
#include "global.h"
+#include "qtuistyle.h"
MainWin::MainWin(QtUi *_gui, QWidget *parent)
: QMainWindow(parent),
gui(_gui),
+ sslLabel(new QLabel()),
systray(new QSystemTrayIcon(this)),
activeTrayIcon(":/icons/quassel-icon-active.png"),
- inactiveTrayIcon(":/icons/quassel-icon.png"),
+ onlineTrayIcon(":/icons/quassel-icon.png"),
+ offlineTrayIcon(":/icons/quassel-icon-offline.png"),
trayIconActive(false),
timer(new QTimer(this)),
settingsDlg(new SettingsDlg(this)),
{
ui.setupUi(this);
setWindowTitle("Quassel IRC");
- setWindowIcon(inactiveTrayIcon);
+ setWindowIcon(offlineTrayIcon);
+ systray->setIcon(offlineTrayIcon);
setWindowIconText("Quassel IRC");
statusBar()->showMessage(tr("Waiting for core..."));
installEventFilter(new JumpKeyHandler(this));
+
+ UiSettings uiSettings;
+ QString style = uiSettings.value("Style", QString("")).toString();
+ if(style != "") {
+ QApplication::setStyle(style);
+ }
+
+ connect(Client::instance(), SIGNAL(securedConnection()), this, SLOT(securedConnection()));
+ sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/no-ssl")));
+ statusBar()->addPermanentWidget(sslLabel);
+
}
void MainWin::init() {
// attach the BufferWidget to the BufferModel and the default selection
ui.bufferWidget->setModel(Client::bufferModel());
ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
-
+
if(Global::SPUTDEV) {
//showSettingsDlg();
//showAboutDlg();
//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));
+ settingsDlg->registerSettingsPage(new HighlightSettingsPage(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());
connect(timer, SIGNAL(timeout()), this, SLOT(makeTrayIconBlink()));
connect(Client::instance(), SIGNAL(messageReceived(const Message &)), this, SLOT(receiveMessage(const Message &)));
- 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);
systrayMenu->addSeparator();
//ui.actionNetworkList->setEnabled(true);
ui.bufferWidget->show();
statusBar()->showMessage(tr("Connected to core."));
+ setWindowIcon(onlineTrayIcon);
+ systray->setIcon(onlineTrayIcon);
+}
+
+void MainWin::securedConnection() {
+ // todo: make status bar entry
+ qDebug() << "secured the connection";
+
+ sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/ssl")));
}
void MainWin::disconnectedFromCore() {
ui.actionConnectCore->setEnabled(true);
// nickListWidget->reset();
statusBar()->showMessage(tr("Not connected to core."));
+ setWindowIcon(offlineTrayIcon);
+ systray->setIcon(offlineTrayIcon);
+ sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/no-ssl")));
}
AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {
sender = sender.left(i);
title += QString(" - %1").arg(sender);
}
- QString text = QtUi::style()->styleString(Message::mircToInternal(msg.text())).text;
UiSettings uiSettings;
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;
displayTrayIconMessage(title, text);
}
timer->start(500);
} else {
timer->stop();
- systray->setIcon(inactiveTrayIcon);
+ systray->setIcon(onlineTrayIcon);
}
}
void MainWin::makeTrayIconBlink() {
if(trayIconActive) {
- systray->setIcon(inactiveTrayIcon);
+ systray->setIcon(onlineTrayIcon);
trayIconActive = false;
} else {
systray->setIcon(activeTrayIcon);