#include "bufferviewconfig.h"
#include "bufferviewfilter.h"
#include "bufferviewmanager.h"
-#include "chatline.h"
-#include "chatline-old.h"
+#include "channellistdlg.h"
#include "client.h"
#include "clientbacklogmanager.h"
+#include "coreinfodlg.h"
#include "coreconnectdlg.h"
#include "networkmodel.h"
#include "buffermodel.h"
#include "signalproxy.h"
#include "topicwidget.h"
#include "inputwidget.h"
+#include "irclistmodel.h"
#include "verticaldock.h"
#include "uisettings.h"
+#include "util.h"
#include "qtuisettings.h"
#include "jumpkeyhandler.h"
#include "selectionmodelsynchronizer.h"
#include "mappedselectionmodel.h"
+#include "settingspages/aliasessettingspage.h"
#include "settingspages/appearancesettingspage.h"
#include "settingspages/bufferviewsettingspage.h"
#include "settingspages/colorsettingspage.h"
#include "settingspages/highlightsettingspage.h"
#include "settingspages/identitiessettingspage.h"
#include "settingspages/networkssettingspage.h"
-
+#include "settingspages/notificationssettingspage.h"
#include "debugconsole.h"
#include "global.h"
MainWin::MainWin(QtUi *_gui, QWidget *parent)
: QMainWindow(parent),
gui(_gui),
+ coreLagLabel(new QLabel()),
sslLabel(new QLabel()),
+ _titleSetter(this),
systray(new QSystemTrayIcon(this)),
activeTrayIcon(":/icons/quassel-icon-active.png"),
onlineTrayIcon(":/icons/quassel-icon.png"),
offlineTrayIcon(":/icons/quassel-icon-offline.png"),
trayIconActive(false),
timer(new QTimer(this)),
+ channelListDlg(new ChannelListDlg(this)),
settingsDlg(new SettingsDlg(this)),
debugConsole(new DebugConsole(this))
{
+ UiSettings uiSettings;
+ loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
+
+ QString style = uiSettings.value("Style", QString("")).toString();
+ if(style != "") {
+ QApplication::setStyle(style);
+ }
+
ui.setupUi(this);
setWindowTitle("Quassel IRC");
setWindowIcon(offlineTrayIcon);
+ qApp->setWindowIcon(offlineTrayIcon);
systray->setIcon(offlineTrayIcon);
setWindowIconText("Quassel IRC");
if(style != "") {
QApplication::setStyle(style);
}
+
+#ifdef HAVE_DBUS
+ desktopNotifications = new org::freedesktop::Notifications(
+ "org.freedesktop.Notifications",
+ "/org/freedesktop/Notifications",
+ QDBusConnection::sessionBus(), this);
+ notificationId = 0;
+ connect(desktopNotifications, SIGNAL(NotificationClosed(uint, uint)), this, SLOT(desktopNotificationClosed(uint, uint)));
+ connect(desktopNotifications, SIGNAL(ActionInvoked(uint, const QString&)), this, SLOT(desktopNotificationInvoked(uint, const QString&)));
+#endif
}
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();
show();
// restore mainwin state
restoreState(s.value("MainWinState").toByteArray());
- disconnectedFromCore(); // Disable menus and stuff
+ // restore locked state of docks
+ ui.actionLockDockPositions->setChecked(s.value("LockDocks", false).toBool());
+
+
+ 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() {
void MainWin::setupMenus() {
connect(ui.actionConnectCore, SIGNAL(triggered()), this, SLOT(showCoreConnectionDlg()));
connect(ui.actionDisconnectCore, SIGNAL(triggered()), Client::instance(), SLOT(disconnectFromCore()));
+ connect(ui.actionCoreInfo, SIGNAL(triggered()), this, SLOT(showCoreInfoDlg()));
connect(ui.actionQuit, SIGNAL(triggered()), QCoreApplication::instance(), SLOT(quit()));
- //connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList()));
connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg()));
- connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole()));
+ // connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole()));
connect(ui.actionAboutQuassel, SIGNAL(triggered()), this, SLOT(showAboutDlg()));
connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt()));
-
- 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() {
- QAction *separator = ui.menuViews->addSeparator();
- separator->setData("__EOBV__");
addBufferView();
}
view->setFilteredModel(Client::bufferModel(), config);
view->show();
+ connect(&view->showChannelList, SIGNAL(triggered()), this, SLOT(showChannelList()));
+
Client::bufferModel()->synchronizeView(view);
dock->setWidget(view);
dock->show();
addDockWidget(Qt::LeftDockWidgetArea, dock);
-
- 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());
+ ui.menuBufferViews->addAction(dock->toggleViewAction());
_netViews.append(dock);
}
void MainWin::removeBufferView(int bufferViewConfigId) {
QVariant actionData;
BufferViewDock *dock;
- foreach(QAction *action, ui.menuViews->actions()) {
+ foreach(QAction *action, ui.menuBufferViews->actions()) {
actionData = action->data();
if(!actionData.isValid())
continue;
-
- if(actionData.toString() == "__EOBV__")
- break;
dock = qobject_cast<BufferViewDock *>(action->parent());
- if(dock && actionData.toInt() != bufferViewConfigId) {
+ if(dock && actionData.toInt() == bufferViewConfigId) {
removeAction(action);
dock->deleteLater();
}
//Category: Behaviour
settingsDlg->registerSettingsPage(new GeneralSettingsPage(settingsDlg));
settingsDlg->registerSettingsPage(new HighlightSettingsPage(settingsDlg));
+ settingsDlg->registerSettingsPage(new AliasesSettingsPage(settingsDlg));
+ settingsDlg->registerSettingsPage(new NotificationsSettingsPage(settingsDlg));
//Category: General
settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg));
settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
settingsDlg->registerSettingsPage(new BufferViewSettingsPage(settingsDlg));
}
-void MainWin::showNetworkDlg() {
+void MainWin::on_actionEditNetworks_triggered() {
SettingsPageDlg dlg(new NetworksSettingsPage(this), this);
dlg.exec();
}
-void MainWin::showManageViewsDlg() {
+void MainWin::on_actionManageViews_triggered() {
SettingsPageDlg dlg(new BufferViewSettingsPage(this), this);
dlg.exec();
}
+void MainWin::on_actionLockDockPositions_toggled(bool lock) {
+ QList<VerticalDock *> docks = findChildren<VerticalDock *>();
+ foreach(VerticalDock *dock, docks) {
+ dock->showTitle(!lock);
+ }
+ QtUiSettings().setValue("LockDocks", lock);
+}
+
void MainWin::setupNickWidget() {
// create nick dock
NickListDock *nickDock = new NickListDock(tr("Nicks"), this);
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());
}
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() {
}
void MainWin::setupStatusBar() {
+ // Core Lag:
+ updateLagIndicator(0);
+ statusBar()->addPermanentWidget(coreLagLabel);
+ connect(Client::signalProxy(), SIGNAL(lagUpdated(int)), this, SLOT(updateLagIndicator(int)));
+
+ // SSL indicator
connect(Client::instance(), SIGNAL(securedConnection()), this, SLOT(securedConnection()));
sslLabel->setPixmap(QPixmap());
statusBar()->addPermanentWidget(sslLabel);
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();
+}
- ui.menuViews->setEnabled(true);
+void MainWin::setConnectedState() {
//ui.menuCore->setEnabled(true);
ui.actionConnectCore->setEnabled(false);
ui.actionDisconnectCore->setEnabled(true);
- //ui.actionNetworkList->setEnabled(true);
+ ui.actionCoreInfo->setEnabled(true);
+ ui.menuViews->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")));
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::updateLagIndicator(int lag) {
+ coreLagLabel->setText(QString("Core Lag: %1 msec").arg(lag));
+}
+
+
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;
- QtUiSettings s;
- int accountId = Client::currentCoreAccount().toInt();
- s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId));
+ saveLayout();
QVariant actionData;
BufferViewDock *dock;
- foreach(QAction *action, ui.menuViews->actions()) {
+ foreach(QAction *action, ui.menuBufferViews->actions()) {
actionData = action->data();
if(!actionData.isValid())
continue;
-
- if(actionData.toString() == "__EOBV__")
- break;
dock = qobject_cast<BufferViewDock *>(action->parent());
if(dock && actionData.toInt() != -1) {
dock->deleteLater();
}
}
+ QtUiSettings s;
+ restoreState(s.value("MainWinState").toByteArray());
+ setDisconnectedState();
+}
- ui.menuViews->setEnabled(false);
+void MainWin::setDisconnectedState() {
//ui.menuCore->setEnabled(false);
+ ui.actionConnectCore->setEnabled(true);
ui.actionDisconnectCore->setEnabled(false);
- //ui.actionNetworkList->setEnabled(false);
+ ui.actionCoreInfo->setEnabled(false);
+ ui.menuViews->setEnabled(false);
ui.bufferWidget->hide();
- ui.actionConnectCore->setEnabled(true);
- // 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) {
- if(Global::SPUTDEV) return new ChatLine(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::showCoreInfoDlg() {
+ CoreInfoDlg dlg(this);
+ dlg.exec();
+}
+
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;
- if(uiSettings.value("DisplayPopupMessages", QVariant(true)).toBool()) {
+#ifndef SPUTDEV
+ bool displayBubble = uiSettings.value("NotificationBubble", QVariant(true)).toBool();
+ bool displayDesktop = uiSettings.value("NotificationDesktop", QVariant(true)).toBool();
+ if(displayBubble || displayDesktop) {
// FIXME don't invoke style engine for this!
- QString text = QtUi::style()->styleString(Message::mircToInternal(msg.text())).text;
- displayTrayIconMessage(title, text);
+ QString text = QtUi::style()->styleString(Message::mircToInternal(msg.contents())).plainText;
+ if(displayBubble) displayTrayIconMessage(title, text);
+# ifdef HAVE_DBUS
+ if(displayDesktop) sendDesktopNotification(title, text);
+# endif
}
-
+#endif
if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) {
QApplication::alert(this);
setTrayIconActivity(true);
return QMainWindow::event(event);
}
+#ifdef HAVE_DBUS
+
+/*
+Using the notification-daemon from Freedesktop's Galago project
+http://www.galago-project.org/specs/notification/0.9/x408.html#command-notify
+*/
+void MainWin::sendDesktopNotification(const QString &title, const QString &message) {
+ QStringList actions;
+ QMap<QString, QVariant> hints;
+ UiSettings uiSettings;
+
+ hints["x"] = uiSettings.value("NotificationDesktopHintX", QVariant(0)).toInt(); // Standard hint: x location for the popup to show up
+ hints["y"] = uiSettings.value("NotificationDesktopHintY", QVariant(0)).toInt(); // Standard hint: y location for the popup to show up
+
+ actions << "click" << "Click Me!";
+
+ QDBusReply<uint> reply = desktopNotifications->Notify(
+ "Quassel", // Application name
+ notificationId, // ID of previous notification to replace
+ "", // Icon to display
+ title, // Summary / Header of the message to display
+ QString("%1: %2:\n%3").arg(QTime::currentTime().toString()).arg(title).arg(message), // Body of the message to display
+ actions, // Actions from which the user may choose
+ hints, // Hints to the server displaying the message
+ uiSettings.value("NotificationDesktopTimeout", QVariant(5000)).toInt() // Timeout in milliseconds
+ );
+
+ if(!reply.isValid()) {
+ /* ERROR */
+ qDebug() << "Error on sending notification..." << reply;
+ return;
+ }
+
+ notificationId = reply.value();
+
+ qDebug() << "ID: " << notificationId << " Time: " << QTime::currentTime().toString();
+}
+
+
+void MainWin::desktopNotificationClosed(uint id, uint reason) {
+ qDebug() << "OID: " << notificationId << " ID: " << id << " Reason: " << reason << " Time: " << QTime::currentTime().toString();
+ notificationId = 0;
+}
+
+
+void MainWin::desktopNotificationInvoked(uint id, const QString & action) {
+ qDebug() << "OID: " << notificationId << " ID: " << id << " Action: " << action << " Time: " << QTime::currentTime().toString();
+}
+
+#else /* HAVE_DBUS */
+
+void MainWin::desktopNotificationClosed(uint, uint) {}
+void MainWin::desktopNotificationInvoked(uint, const QString &) {}
+
+#endif /* HAVE_DBUS */
+
void MainWin::displayTrayIconMessage(const QString &title, const QString &message) {
systray->showMessage(title, message);
}
}
}
-
void MainWin::clientNetworkCreated(NetworkId id) {
const Network *net = Client::network(id);
QAction *act = new QAction(net->networkName(), this);
+ act->setObjectName(QString("NetworkAction-%1").arg(id.toInt()));
act->setData(QVariant::fromValue<NetworkId>(id));
connect(net, SIGNAL(updatedRemotely()), this, SLOT(clientNetworkUpdated()));
connect(act, SIGNAL(triggered()), this, SLOT(connectOrDisconnectFromNet()));
- bool inserted = false;
- for(int i = 0; i < networkActions.count(); i++) {
- if(net->networkName().localeAwareCompare(networkActions[i]->text()) < 0) {
- networkActions.insert(i, act);
- inserted = true;
+
+ QAction *beforeAction = 0;
+ foreach(QAction *action, ui.menuNetworks->actions()) {
+ if(action->isSeparator()) {
+ beforeAction = action;
+ break;
+ }
+ if(net->networkName().localeAwareCompare(action->text()) < 0) {
+ beforeAction = action;
break;
}
}
- if(!inserted) networkActions.append(act);
- ui.menuNetworks->clear(); // why the f*** isn't there a QMenu::insertAction()???
- foreach(QAction *a, networkActions) ui.menuNetworks->addAction(a);
- ui.menuNetworks->addSeparator();
- ui.menuNetworks->addAction(actionEditNetworks);
+ Q_CHECK_PTR(beforeAction);
+ ui.menuNetworks->insertAction(beforeAction, act);
}
void MainWin::clientNetworkUpdated() {
const Network *net = qobject_cast<const Network *>(sender());
- if(!net) return;
- foreach(QAction *a, networkActions) {
- if(a->data().value<NetworkId>() == net->networkId()) {
- a->setText(net->networkName());
- if(net->connectionState() == Network::Initialized) {
- a->setIcon(QIcon(":/16x16/actions/network-connect"));
- //a->setEnabled(true);
- } else if(net->connectionState() == Network::Disconnected) {
- a->setIcon(QIcon(":/16x16/actions/network-disconnect"));
- //a->setEnabled(true);
- } else {
- a->setIcon(QIcon(":/16x16/actions/gear"));
- //a->setEnabled(false);
- }
- return;
- }
+ if(!net)
+ return;
+
+ QAction *action = findChild<QAction *>(QString("NetworkAction-%1").arg(net->networkId().toInt()));
+ if(!action)
+ return;
+
+ action->setText(net->networkName());
+
+ switch(net->connectionState()) {
+ case Network::Initialized:
+ action->setIcon(QIcon(":/16x16/actions/network-connect"));
+ break;
+ case Network::Disconnected:
+ action->setIcon(QIcon(":/16x16/actions/network-disconnect"));
+ break;
+ default:
+ action->setIcon(QIcon(":/16x16/actions/gear"));
}
}
void MainWin::clientNetworkRemoved(NetworkId id) {
- QList<QAction *>::iterator actionIter = networkActions.begin();;
- QAction *action;
- while(actionIter != networkActions.end()) {
- action = *actionIter;
- if(action->data().value<NetworkId>() == id) {
- action->deleteLater();
- actionIter = networkActions.erase(actionIter);
- } else
- actionIter++;
- }
+ QAction *action = findChild<QAction *>(QString("NetworkAction-%1").arg(id.toInt()));
+ if(!action)
+ return;
+
+ action->deleteLater();
}
void MainWin::connectOrDisconnectFromNet() {
projects / quassel.git / blobdiff