#include "aboutdlg.h"
#include "chatwidget.h"
#include "bufferview.h"
-#include "chatline.h"
-#include "chatline-old.h"
+#include "bufferviewconfig.h"
+#include "bufferviewfilter.h"
+#include "bufferviewmanager.h"
#include "client.h"
#include "clientbacklogmanager.h"
#include "coreconnectdlg.h"
#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()),
+ _titleSetter(this),
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);
+ qApp->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);
+ }
}
void MainWin::init() {
Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)));
+ connect(QApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(saveLayout()));
+
connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientNetworkCreated(NetworkId)));
connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), this, SLOT(clientNetworkRemoved(NetworkId)));
//ui.bufferWidget->init();
setupTopicWidget();
setupChatMonitor();
setupInputWidget();
+ setupStatusBar();
setupSystray();
setupSettingsDlg();
// restore mainwin state
restoreState(s.value("MainWinState").toByteArray());
- disconnectedFromCore(); // Disable menus and stuff
+ setDisconnectedState(); // Disable menus and stuff
showCoreConnectionDlg(true); // autoconnect if appropriate
// 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();
- //showNetworkDlg();
- //exit(1);
- }
+ _titleSetter.setModel(Client::bufferModel());
+ _titleSetter.setSelectionModel(Client::bufferModel()->standardSelectionModel());
}
MainWin::~MainWin() {
actionEditNetworks = new QAction(QIcon(":/22x22/actions/configure"), tr("Edit &Networks..."), this);
ui.menuNetworks->addAction(actionEditNetworks);
connect(actionEditNetworks, SIGNAL(triggered()), this, SLOT(showNetworkDlg()));
+ connect(ui.actionManageViews, SIGNAL(triggered()), this, SLOT(showManageViewsDlg()));
}
void MainWin::setupViews() {
- BufferModel *model = Client::bufferModel();
-
- addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList<NetworkId>());
- addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList<NetworkId>());
- addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList<NetworkId>());
- addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList<NetworkId>());
- addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList<NetworkId>());
+ QAction *separator = ui.menuViews->addSeparator();
+ separator->setData("__EOBV__");
+ addBufferView();
+}
- ui.menuViews->addSeparator();
+void MainWin::addBufferView(int bufferViewConfigId) {
+ addBufferView(Client::bufferViewManager()->bufferViewConfig(bufferViewConfigId));
}
-QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList<NetworkId> &nets) {
- QDockWidget *dock = new QDockWidget(viewname, this);
- dock->setObjectName(QString("ViewDock-" + viewname)); // should be unique for mainwindow state!
- dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
+void MainWin::addBufferView(BufferViewConfig *config) {
+ BufferViewDock *dock;
+ if(config)
+ dock = new BufferViewDock(config, this);
+ else
+ dock = new BufferViewDock(this);
//create the view and initialize it's filter
BufferView *view = new BufferView(dock);
+ view->setFilteredModel(Client::bufferModel(), config);
view->show();
- view->setFilteredModel(model, mode, nets);
+
Client::bufferModel()->synchronizeView(view);
+
dock->setWidget(view);
dock->show();
addDockWidget(Qt::LeftDockWidgetArea, dock);
- ui.menuViews->addAction(dock->toggleViewAction());
+ QAction *endOfBufferViews = 0;
+ foreach(QAction *action, ui.menuViews->actions()) {
+ if(action->data().toString() == "__EOBV__") {
+ endOfBufferViews = action;
+ break;
+ }
+ }
+ Q_CHECK_PTR(endOfBufferViews);
+ ui.menuViews->insertAction(endOfBufferViews, dock->toggleViewAction());
- netViews.append(dock);
- return dock;
+ _netViews.append(dock);
+}
+
+void MainWin::removeBufferView(int bufferViewConfigId) {
+ QVariant actionData;
+ BufferViewDock *dock;
+ foreach(QAction *action, ui.menuViews->actions()) {
+ actionData = action->data();
+ if(!actionData.isValid())
+ continue;
+
+ if(actionData.toString() == "__EOBV__")
+ break;
+
+ dock = qobject_cast<BufferViewDock *>(action->parent());
+ if(dock && actionData.toInt() == bufferViewConfigId) {
+ removeAction(action);
+ dock->deleteLater();
+ }
+ }
}
void MainWin::setupSettingsDlg() {
//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::showNetworkDlg() {
+ SettingsPageDlg dlg(new NetworksSettingsPage(this), this);
+ dlg.exec();
+}
+
+void MainWin::showManageViewsDlg() {
+ SettingsPageDlg dlg(new BufferViewSettingsPage(this), this);
+ dlg.exec();
}
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());
+ // 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());
}
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() {
ui.menuViews->addAction(dock->toggleViewAction());
}
+void MainWin::setupStatusBar() {
+ connect(Client::instance(), SIGNAL(securedConnection()), this, SLOT(securedConnection()));
+ sslLabel->setPixmap(QPixmap());
+ statusBar()->addPermanentWidget(sslLabel);
+
+ ui.menuViews->addSeparator();
+ QAction *showStatusbar = ui.menuViews->addAction(tr("Statusbar"));
+ showStatusbar->setCheckable(true);
+
+ UiSettings uiSettings;
+
+ bool enabled = uiSettings.value("ShowStatusBar", QVariant(true)).toBool();
+ showStatusbar->setChecked(enabled);
+ enabled ? statusBar()->show() : statusBar()->hide();
+
+ connect(showStatusbar, SIGNAL(toggled(bool)), statusBar(), SLOT(setVisible(bool)));
+ connect(showStatusbar, SIGNAL(toggled(bool)), this, SLOT(saveStatusBarStatus(bool)));
+}
+
+void MainWin::saveStatusBarStatus(bool enabled) {
+ UiSettings uiSettings;
+ uiSettings.setValue("ShowStatusBar", enabled);
+}
+
void MainWin::setupSystray() {
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();
}
void MainWin::connectedToCore() {
+ Q_CHECK_PTR(Client::bufferViewManager());
+ connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigAdded(int)), this, SLOT(addBufferView(int)));
+ connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigDeleted(int)), this, SLOT(removeBufferView(int)));
+ connect(Client::bufferViewManager(), SIGNAL(initDone()), this, SLOT(loadLayout()));
+
foreach(BufferInfo id, Client::allBufferInfos()) {
Client::backlogManager()->requestBacklog(id.bufferId(), 500, -1);
}
+ setConnectedState();
+}
+void MainWin::setConnectedState() {
ui.menuViews->setEnabled(true);
//ui.menuCore->setEnabled(true);
ui.actionConnectCore->setEnabled(false);
//ui.actionNetworkList->setEnabled(true);
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")));
+}
+
+void MainWin::loadLayout() {
+ QtUiSettings s;
+ int accountId = Client::currentCoreAccount().toInt();
+ restoreState(s.value(QString("MainWinState-%1").arg(accountId)).toByteArray(), accountId);
+}
+
+void MainWin::saveLayout() {
+ QtUiSettings s;
+ int accountId = Client::currentCoreAccount().toInt();
+ if(accountId > 0) s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId));
+}
+
+void MainWin::securedConnection() {
+ // todo: make status bar entry
+ qDebug() << "secured the connection";
+
+ sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/ssl")));
}
void MainWin::disconnectedFromCore() {
+ // save core specific layout and remove bufferviews;
+ saveLayout();
+ QVariant actionData;
+ BufferViewDock *dock;
+ foreach(QAction *action, ui.menuViews->actions()) {
+ actionData = action->data();
+ if(!actionData.isValid())
+ continue;
+
+ if(actionData.toString() == "__EOBV__")
+ break;
+
+ dock = qobject_cast<BufferViewDock *>(action->parent());
+ if(dock && actionData.toInt() != -1) {
+ removeAction(action);
+ dock->deleteLater();
+ }
+ }
+ QtUiSettings s;
+ restoreState(s.value("MainWinState").toByteArray());
+ setDisconnectedState();
+}
+
+void MainWin::setDisconnectedState() {
ui.menuViews->setEnabled(false);
//ui.menuCore->setEnabled(false);
ui.actionDisconnectCore->setEnabled(false);
ui.actionConnectCore->setEnabled(true);
// nickListWidget->reset();
statusBar()->showMessage(tr("Not connected to core."));
-}
-
-AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {
- if(Global::SPUTDEV) return new ChatLine(msg);
- return new ChatLineOld(msg);
+ setWindowIcon(offlineTrayIcon);
+ qApp->setWindowIcon(offlineTrayIcon);
+ systray->setIcon(offlineTrayIcon);
+ sslLabel->setPixmap(QPixmap());
}
void MainWin::showCoreConnectionDlg(bool autoConnect) {
}
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();
sender = sender.left(i);
title += QString(" - %1").arg(sender);
}
- QString text = QtUi::style()->styleString(Message::mircToInternal(msg.text())).text;
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.contents())).plainText;
displayTrayIconMessage(title, text);
}
-
+#endif
if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) {
QApplication::alert(this);
setTrayIconActivity(true);
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);
}
-void MainWin::showNetworkDlg() {
- SettingsPageDlg dlg(new NetworksSettingsPage(this), this);
- dlg.exec();
-}
void MainWin::clientNetworkCreated(NetworkId id) {
const Network *net = Client::network(id);
projects / quassel.git / blobdiff