* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-//#define SPUTDEV
-
#include "mainwin.h"
+#include "aboutdlg.h"
#include "chatwidget.h"
#include "bufferview.h"
-#include "chatline-old.h"
+#include "bufferviewconfig.h"
+#include "bufferviewfilter.h"
+#include "bufferviewmanager.h"
+#include "channellistdlg.h"
#include "client.h"
+#include "clientbacklogmanager.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 "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"
-MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) {
+#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"),
+ 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))
+{
ui.setupUi(this);
setWindowTitle("Quassel IRC");
- setWindowIcon(QIcon(":icons/quassel-icon.png"));
+ setWindowIcon(offlineTrayIcon);
+ qApp->setWindowIcon(offlineTrayIcon);
+ systray->setIcon(offlineTrayIcon);
setWindowIconText("Quassel IRC");
statusBar()->showMessage(tr("Waiting for core..."));
- settingsDlg = new SettingsDlg(this);
- debugConsole = new DebugConsole(this);
+
+ installEventFilter(new JumpKeyHandler(this));
+
+ UiSettings uiSettings;
+ QString style = uiSettings.value("Style", QString("")).toString();
+ if(style != "") {
+ QApplication::setStyle(style);
+ }
}
void MainWin::init() {
- UiSettings s;
- resize(s.value("MainWinSize").toSize());
+ QtUiSettings s;
+ if(s.value("MainWinSize").isValid())
+ resize(s.value("MainWinSize").toSize());
+ else
+ resize(QSize(800, 500));
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();
setupMenus();
setupViews();
setupNickWidget();
+ setupTopicWidget();
setupChatMonitor();
setupInputWidget();
- setupTopicWidget();
+ setupStatusBar();
setupSystray();
setupSettingsDlg();
// 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 PropertyMapper
+ // attach the BufferWidget to the BufferModel and the default selection
ui.bufferWidget->setModel(Client::bufferModel());
ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
-#ifdef SPUTDEV
- showSettingsDlg();
-#endif
-
+ _titleSetter.setModel(Client::bufferModel());
+ _titleSetter.setSelectionModel(Client::bufferModel()->standardSelectionModel());
}
MainWin::~MainWin() {
-
+ QtUiSettings s;
+ s.setValue("MainWinSize", size());
+ s.setValue("MainWinPos", pos());
+ s.setValue("MainWinState", saveState());
}
void MainWin::setupMenus() {
connect(ui.actionConnectCore, SIGNAL(triggered()), this, SLOT(showCoreConnectionDlg()));
connect(ui.actionDisconnectCore, SIGNAL(triggered()), Client::instance(), SLOT(disconnectFromCore()));
- //connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList()));
+ connect(ui.actionQuit, SIGNAL(triggered()), QCoreApplication::instance(), SLOT(quit()));
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()));
}
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>());
+ 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);
+
+ connect(&view->showChannelList, SIGNAL(triggered()), this, SLOT(showChannelList()));
+
Client::bufferModel()->synchronizeView(view);
+
dock->setWidget(view);
dock->show();
addDockWidget(Qt::LeftDockWidgetArea, dock);
- ui.menuViews->addAction(dock->toggleViewAction());
+ ui.menuBufferViews->addAction(dock->toggleViewAction());
- netViews.append(dock);
- return dock;
+ _netViews.append(dock);
}
-void MainWin::setupSettingsDlg() {
+void MainWin::removeBufferView(int bufferViewConfigId) {
+ QVariant actionData;
+ BufferViewDock *dock;
+ foreach(QAction *action, ui.menuBufferViews->actions()) {
+ actionData = action->data();
+ if(!actionData.isValid())
+ continue;
+
+ 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));
+}
-#ifdef SPUTDEV
- connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit())); // FIXME
-#endif
+void MainWin::on_actionEditNetworks_triggered() {
+ SettingsPageDlg dlg(new NetworksSettingsPage(this), this);
+ dlg.exec();
+}
+
+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
- nickDock = new QDockWidget(tr("Nicks"), this);
+ NickListDock *nickDock = new NickListDock(tr("Nicks"), this);
nickDock->setObjectName("NickDock");
nickDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
addDockWidget(Qt::RightDockWidgetArea, nickDock);
ui.menuViews->addAction(nickDock->toggleViewAction());
+ // See NickListDock::NickListDock();
+ // connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool)));
- Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");
+ // attach the NickListWidget to the BufferModel and the default selection
+ nickListWidget->setModel(Client::bufferModel());
+ nickListWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
}
void MainWin::setupChatMonitor() {
+#ifndef SPUTDEV
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<ChatLine *> lines;
- QList<AbstractUiMsg *> msgs = buf->contents();
- foreach(AbstractUiMsg *msg, msgs) {
- lines.append(dynamic_cast<ChatLine*>(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 *)));
addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical);
ui.menuViews->addAction(dock->toggleViewAction());
+#endif /* SPUTDEV */
}
void MainWin::setupInputWidget() {
VerticalDock *dock = new VerticalDock(tr("Topic"), this);
dock->setObjectName("TopicDock");
TopicWidget *topicwidget = new TopicWidget(dock);
+ connect(topicwidget, SIGNAL(topicChanged(const QString &)), this, SLOT(changeTopic(const QString &)));
+
dock->setWidget(topicwidget);
- Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic");
+ topicwidget->setModel(Client::bufferModel());
+ topicwidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
addDockWidget(Qt::TopDockWidgetArea, dock);
ui.menuViews->addAction(dock->toggleViewAction());
}
-void MainWin::setupSystray() {
- systray = new QSystemTrayIcon(this);
- systray->setIcon(QIcon(":/icons/quassel-icon.png"));
+void MainWin::setupStatusBar() {
+ connect(Client::instance(), SIGNAL(securedConnection()), this, SLOT(securedConnection()));
+ sslLabel->setPixmap(QPixmap());
+ statusBar()->addPermanentWidget(sslLabel);
- QString toolTip("left click to minimize the quassel client to tray");
- systray->setToolTip(toolTip);
+ 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 &)));
- QMenu *systrayMenu = new QMenu(this);
+ systrayMenu = new QMenu(this);
systrayMenu->addAction(ui.actionAboutQuassel);
systrayMenu->addSeparator();
systrayMenu->addAction(ui.actionConnectCore);
systray->setContextMenu(systrayMenu);
- systray->show();
+ UiSettings s;
+ if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) {
+ systray->show();
+ }
+
+#ifndef Q_WS_MAC
connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )),
this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason )));
+#endif
+
+}
+
+void MainWin::changeEvent(QEvent *event) {
+ if(event->type() == QEvent::WindowStateChange) {
+ if(windowState() & Qt::WindowMinimized) {
+ UiSettings s;
+ if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) {
+ toggleVisibility();
+ event->ignore();
+ }
+ }
+ }
+}
+
+// FIXME this should be made prettier...
+void MainWin::changeTopic(const QString &topic) {
+ BufferId id = ui.bufferWidget->currentBuffer();
+ if(!id.isValid()) return;
+ Buffer *buffer = Client::buffer(id);
+ if(buffer) Client::userInput(buffer->bufferInfo(), QString("/topic %1").arg(topic));
}
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()) {
- emit requestBacklog(id, 1000, -1);
+ Client::backlogManager()->requestBacklog(id.bufferId(), 500, -1);
}
+ setConnectedState();
+}
+void MainWin::setConnectedState() {
ui.menuViews->setEnabled(true);
- ui.menuCore->setEnabled(true);
+ //ui.menuCore->setEnabled(true);
ui.actionConnectCore->setEnabled(false);
ui.actionDisconnectCore->setEnabled(true);
- //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
+ 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.menuBufferViews->actions()) {
+ actionData = action->data();
+ if(!actionData.isValid())
+ continue;
+
+ 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.menuCore->setEnabled(false);
ui.actionDisconnectCore->setEnabled(false);
- //ui.actionNetworkList->setEnabled(false);
ui.bufferWidget->hide();
ui.actionConnectCore->setEnabled(true);
- nickListWidget->reset();
statusBar()->showMessage(tr("Not connected to core."));
-}
-
-AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {
- return new ChatLine(msg);
+ setWindowIcon(offlineTrayIcon);
+ qApp->setWindowIcon(offlineTrayIcon);
+ systray->setIcon(offlineTrayIcon);
+ sslLabel->setPixmap(QPixmap());
}
void MainWin::showCoreConnectionDlg(bool autoConnect) {
//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();
}
debugConsole->show();
}
-void MainWin::closeEvent(QCloseEvent *event)
-{
- //if (userReallyWantsToQuit()) {
- UiSettings s;
- s.setValue("MainWinSize", size());
- s.setValue("MainWinPos", pos());
- s.setValue("MainWinState", saveState());
+void MainWin::showAboutDlg() {
+ AboutDlg dlg(this);
+ dlg.exec();
+}
+
+void MainWin::closeEvent(QCloseEvent *event) {
+ UiSettings s;
+ if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
+ toggleVisibility();
+ event->ignore();
+ } else {
event->accept();
- //} else {
- //event->ignore();
- //}
+ }
}
void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
- if (activationReason == QSystemTrayIcon::Trigger) {
- if (isHidden())
- show();
- else
+ if(activationReason == QSystemTrayIcon::Trigger) {
+ toggleVisibility();
+ }
+}
+
+void MainWin::toggleVisibility() {
+ if(isHidden() /*|| !isActiveWindow()*/) {
+ show();
+ if(isMinimized()) {
+ if(isMaximized())
+ showMaximized();
+ else
+ showNormal();
+ }
+
+ raise();
+ activateWindow();
+ // setFocus(); //Qt::ActiveWindowFocusReason
+
+ } else {
+ if(systray->isSystemTrayAvailable ()) {
+ clearFocus();
hide();
+ if(!systray->isVisible()) {
+ systray->show();
+ }
+ } else {
+ lower();
+ }
}
}
-void MainWin::showNetworkDlg() {
- SettingsPageDlg dlg(new NetworksSettingsPage(this), this);
- dlg.exec();
+void MainWin::receiveMessage(const Message &msg) {
+ if(QApplication::activeWindow() != 0)
+ return;
+
+ if(msg.flags() & Message::Highlight || msg.bufferInfo().type() == BufferInfo::QueryBuffer) {
+ QString title = msg.bufferInfo().bufferName();;
+ if(msg.bufferInfo().type() != BufferInfo::QueryBuffer) {
+ QString sender = msg.sender();
+ int i = sender.indexOf("!");
+ if(i != -1)
+ sender = sender.left(i);
+ title += QString(" - %1").arg(sender);
+ }
+
+ 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);
+ }
+ }
+}
+
+bool MainWin::event(QEvent *event) {
+ if(event->type() == QEvent::WindowActivate)
+ setTrayIconActivity(false);
+ return QMainWindow::event(event);
+}
+
+void MainWin::displayTrayIconMessage(const QString &title, const QString &message) {
+ systray->showMessage(title, message);
+}
+
+void MainWin::setTrayIconActivity(bool active) {
+ if(active) {
+ if(!timer->isActive())
+ timer->start(500);
+ } else {
+ timer->stop();
+ systray->setIcon(onlineTrayIcon);
+ }
+}
+
+void MainWin::makeTrayIconBlink() {
+ if(trayIconActive) {
+ systray->setIcon(onlineTrayIcon);
+ trayIconActive = false;
+ } else {
+ systray->setIcon(activeTrayIcon);
+ trayIconActive = true;
+ }
}
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() {
else net->requestDisconnect();
}
-void MainWin::keyPressEvent(QKeyEvent *event) {
-#ifdef Q_WS_MAC
- int bindModifier = Qt::ControlModifier | Qt::AltModifier;
- int jumpModifier = Qt::ControlModifier;
-#else
- int bindModifier = Qt::ControlModifier;
- int jumpModifier = Qt::AltModifier;
-#endif
-
- if(Qt::Key_0 <= event->key() && event->key() <= Qt::Key_9) {
- if(event->modifiers() == bindModifier) {
- QModelIndex bufferIdx = Client::bufferModel()->standardSelectionModel()->currentIndex();
- NetworkId netId = bufferIdx.data(NetworkModel::NetworkIdRole).value<NetworkId>();
- const Network *net = Client::network(netId);
- if(!net)
- return;
- QString bufferName = bufferIdx.sibling(bufferIdx.row(), 0).data().toString();
-
- _keyboardJump[event->key()] = bufferIdx;
- statusBar()->showMessage(tr("Bound Buffer %1::%2 to Key %3").arg(net->networkName()).arg(bufferName).arg(event->key() - Qt::Key_0), 10000);
- event->accept();
- }
-
- else if(event->modifiers() == jumpModifier && _keyboardJump.contains(event->key())) {
- Client::bufferModel()->standardSelectionModel()->setCurrentIndex(_keyboardJump[event->key()], QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
- event->accept();
- }
-
- else {
- event->ignore();
- }
- }
- event->ignore();
-}