#include "mainwin.h"
#include "aboutdlg.h"
-#include "chatwidget.h"
#include "bufferview.h"
#include "bufferviewconfig.h"
#include "bufferviewfilter.h"
#include "bufferviewmanager.h"
#include "channellistdlg.h"
+#include "chatlinemodel.h"
+#include "chatmonitorfilter.h"
+#include "chatmonitorview.h"
+#include "chatview.h"
+#include "chatviewsearchbar.h"
#include "client.h"
#include "clientbacklogmanager.h"
+#include "coreinfodlg.h"
#include "coreconnectdlg.h"
+#include "msgprocessorstatuswidget.h"
+#include "qtuimessageprocessor.h"
+#include "qtuiapplication.h"
#include "networkmodel.h"
#include "buffermodel.h"
#include "nicklistwidget.h"
#include "uisettings.h"
#include "qtuisettings.h"
#include "jumpkeyhandler.h"
-
-#include "uisettings.h"
+#include "sessionsettings.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"
#include "qtuistyle.h"
-
-MainWin::MainWin(QtUi *_gui, QWidget *parent)
+MainWin::MainWin(QWidget *parent)
: QMainWindow(parent),
- gui(_gui),
+ coreLagLabel(new QLabel()),
sslLabel(new QLabel()),
+ msgProcessorStatusWidget(new MsgProcessorStatusWidget()),
+
_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))
+
+ timer(new QTimer(this))
{
+ UiSettings uiSettings;
+ QString style = uiSettings.value("Style", QString("")).toString();
+ if(style != "") {
+ QApplication::setStyle(style);
+ }
+
ui.setupUi(this);
setWindowTitle("Quassel IRC");
setWindowIcon(offlineTrayIcon);
installEventFilter(new JumpKeyHandler(this));
- UiSettings uiSettings;
- QString style = uiSettings.value("Style", QString("")).toString();
- 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
+ QtUiApplication* app = dynamic_cast<QtUiApplication*> qApp;
+ connect(app, SIGNAL(saveStateToSession(const QString&)), this, SLOT(saveStateToSession(const QString&)));
+ connect(app, SIGNAL(saveStateToSessionSettings(SessionSettings&)), this, SLOT(saveStateToSessionSettings(SessionSettings&)));
}
void MainWin::init() {
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();
setupStatusBar();
setupSystray();
- setupSettingsDlg();
-
// restore mainwin state
restoreState(s.value("MainWinState").toByteArray());
+ // 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());
+ ui.menuViews->addAction(ui.bufferWidget->searchBar()->toggleViewAction());
_titleSetter.setModel(Client::bufferModel());
_titleSetter.setSelectionModel(Client::bufferModel()->standardSelectionModel());
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.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->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) {
}
}
-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() {
+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);
}
void MainWin::setupChatMonitor() {
-#ifndef SPUTDEV
VerticalDock *dock = new VerticalDock(tr("Chat Monitor"), this);
dock->setObjectName("ChatMonitorDock");
- ChatWidget *chatWidget = new ChatWidget(0, this);
- chatWidget->show();
- dock->setWidget(chatWidget);
+ ChatMonitorFilter *filter = new ChatMonitorFilter(Client::messageModel(), this);
+ ChatMonitorView *chatView = new ChatMonitorView(filter, this);
+ chatView->show();
+ dock->setWidget(chatView);
dock->show();
- Buffer *buf = Client::monitorBuffer();
- if(!buf)
- return;
-
- 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);
}
void MainWin::setupStatusBar() {
+ // MessageProcessor progress
+ statusBar()->addPermanentWidget(msgProcessorStatusWidget);
+ connect(Client::messageProcessor(), SIGNAL(progressUpdated(int, int)), msgProcessorStatusWidget, SLOT(setProgress(int, int)));
+
+ // 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);
void MainWin::setupSystray() {
connect(timer, SIGNAL(timeout()), this, SLOT(makeTrayIconBlink()));
- connect(Client::instance(), SIGNAL(messageReceived(const Message &)), this, SLOT(receiveMessage(const Message &)));
+ connect(Client::messageModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+ this, SLOT(messagesInserted(const QModelIndex &, int, int)));
systrayMenu = new QMenu(this);
systrayMenu->addAction(ui.actionAboutQuassel);
}
}
-// 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()) {
- Client::backlogManager()->requestBacklog(id.bufferId(), 500, -1);
- }
+
+ Client::backlogManager()->requestInitialBacklog();
setConnectedState();
}
void MainWin::setConnectedState() {
- ui.menuViews->setEnabled(true);
//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);
if(accountId > 0) s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId));
}
+void MainWin::updateLagIndicator(int lag) {
+ coreLagLabel->setText(QString(tr("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")));
}
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) {
}
void MainWin::setDisconnectedState() {
- ui.menuViews->setEnabled(false);
//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);
}
void MainWin::showCoreConnectionDlg(bool autoConnect) {
- coreConnectDlg = new CoreConnectDlg(this, autoConnect);
- connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int)));
- coreConnectDlg->setModal(true);
- coreConnectDlg->show();
-}
-
-void MainWin::coreConnectionDlgFinished(int /*code*/) {
- coreConnectDlg->close();
- //exit(1);
+ CoreConnectDlg(autoConnect, this).exec();
}
void MainWin::showChannelList(NetworkId netId) {
+ ChannelListDlg *channelListDlg = new ChannelListDlg();
+
if(!netId.isValid()) {
QAction *action = qobject_cast<QAction *>(sender());
if(action)
netId = action->data().value<NetworkId>();
}
+
+ channelListDlg->setAttribute(Qt::WA_DeleteOnClose);
channelListDlg->setNetwork(netId);
channelListDlg->show();
}
-void MainWin::showSettingsDlg() {
- settingsDlg->show();
+void MainWin::showCoreInfoDlg() {
+ CoreInfoDlg(this).exec();
}
-void MainWin::showDebugConsole() {
- debugConsole->show();
+void MainWin::showSettingsDlg() {
+ SettingsDlg *dlg = new SettingsDlg();
+
+ //Category: Appearance
+ dlg->registerSettingsPage(new ColorSettingsPage(dlg));
+ dlg->registerSettingsPage(new FontsSettingsPage(dlg));
+ dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); //General
+ //Category: Behaviour
+ dlg->registerSettingsPage(new GeneralSettingsPage(dlg));
+ dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
+ dlg->registerSettingsPage(new AliasesSettingsPage(dlg));
+ dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
+ //Category: General
+ dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg));
+ dlg->registerSettingsPage(new NetworksSettingsPage(dlg));
+ dlg->registerSettingsPage(new BufferViewSettingsPage(dlg));
+
+ dlg->show();
}
void MainWin::showAboutDlg() {
- AboutDlg dlg(this);
- dlg.exec();
+ AboutDlg(this).exec();
}
void MainWin::closeEvent(QCloseEvent *event) {
}
}
-void MainWin::receiveMessage(const Message &msg) {
+void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) {
+ Q_UNUSED(parent);
+
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);
+ for(int i = start; i <= end; i++) {
+ QModelIndex idx = Client::messageModel()->index(i, ChatLineModel::ContentsColumn);
+ if(!idx.isValid()) {
+ qDebug() << "MainWin::messagesInserted(): Invalid model index!";
+ continue;
}
-#endif
- if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) {
- QApplication::alert(this);
- setTrayIconActivity(true);
+ Message::Flags flags = (Message::Flags)idx.data(ChatLineModel::FlagsRole).toInt();
+ if(flags.testFlag(Message::Backlog)) continue;
+ flags |= Message::Backlog; // we only want to trigger a highlight once!
+ Client::messageModel()->setData(idx, (int)flags, ChatLineModel::FlagsRole);
+
+ BufferId bufId = idx.data(ChatLineModel::BufferIdRole).value<BufferId>();
+ BufferInfo::Type bufType = Client::networkModel()->bufferType(bufId);
+
+ if(flags & Message::Highlight || bufType == BufferInfo::QueryBuffer) {
+ QString title = Client::networkModel()->networkName(bufId) + " - " + Client::networkModel()->bufferName(bufId);
+
+ // FIXME Don't instantiate this for every highlight...
+ UiSettings uiSettings;
+
+ bool displayBubble = uiSettings.value("NotificationBubble", QVariant(true)).toBool();
+ bool displayDesktop = uiSettings.value("NotificationDesktop", QVariant(true)).toBool();
+ if(displayBubble || displayDesktop) {
+ if(uiSettings.value("DisplayPopupMessages", QVariant(true)).toBool()) {
+ QString text = idx.data(ChatLineModel::DisplayRole).toString();
+ if(displayBubble) displayTrayIconMessage(title, text);
+# ifdef HAVE_DBUS
+ if(displayDesktop) sendDesktopNotification(title, text);
+# 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 */
+ // could also happen if no notification service runs, so... whatever :)
+ //qDebug() << "Error on sending notification..." << reply.error();
+ return;
+ }
+
+ notificationId = reply.value();
+
+ // qDebug() << "ID: " << notificationId << " Time: " << QTime::currentTime().toString();
+}
+
+
+void MainWin::desktopNotificationClosed(uint id, uint reason) {
+ Q_UNUSED(id); Q_UNUSED(reason);
+ // qDebug() << "OID: " << notificationId << " ID: " << id << " Reason: " << reason << " Time: " << QTime::currentTime().toString();
+ notificationId = 0;
+}
+
+
+void MainWin::desktopNotificationInvoked(uint id, const QString & action) {
+ Q_UNUSED(id); Q_UNUSED(action);
+ // qDebug() << "OID: " << notificationId << " ID: " << id << " Action: " << action << " Time: " << QTime::currentTime().toString();
+}
+
+#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() {
else net->requestDisconnect();
}
+
+
+void MainWin::on_actionDebugNetworkModel_triggered(bool) {
+ QTreeView *view = new QTreeView;
+ view->setAttribute(Qt::WA_DeleteOnClose);
+ view->setWindowTitle("Debug NetworkModel View");
+ view->setModel(Client::networkModel());
+ view->setColumnWidth(0, 250);
+ view->setColumnWidth(1, 250);
+ view->setColumnWidth(2, 80);
+ view->resize(610, 300);
+ view->show();
+}
+
+void MainWin::saveStateToSession(const QString &sessionId) {
+ return;
+ SessionSettings s(sessionId);
+
+ s.setValue("MainWinSize", size());
+ s.setValue("MainWinPos", pos());
+ s.setValue("MainWinState", saveState());
+}
+
+void MainWin::saveStateToSessionSettings(SessionSettings & s)
+{
+ s.setValue("MainWinSize", size());
+ s.setValue("MainWinPos", pos());
+ s.setValue("MainWinState", saveState());
+}