From a76d5716fff14a3f21e6c62542e10646981c1067 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Fri, 1 Feb 2008 21:01:37 +0000 Subject: [PATCH] Added a fancy menu to connect to and disconnect from your networks directly. Accessible as File -> Networks. --- src/client/client.cpp | 1 + src/icons/icons.qrc | 8 +-- src/qtui/mainwin.cpp | 146 ++++++++++++++++++++++++++--------------- src/qtui/mainwin.h | 13 +++- src/qtui/ui/mainwin.ui | 20 ++++-- 5 files changed, 122 insertions(+), 66 deletions(-) diff --git a/src/client/client.cpp b/src/client/client.cpp index 4b9ca515..9e3fc9a2 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -304,6 +304,7 @@ void Client::disconnectFromCore() { QHash::iterator netIter = _networks.begin(); while(netIter != _networks.end()) { Network *net = netIter.value(); + emit networkRemoved(net->networkId()); disconnect(net, SIGNAL(destroyed()), this, 0); netIter = _networks.erase(netIter); net->deleteLater(); diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index a92e0a77..187c37d8 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -25,7 +25,7 @@ oxygen/16x16/actions/color-picker.png oxygen/16x16/actions/configure-shortcuts.png oxygen/16x16/actions/configure-toolbars.png - oxygen/16x16/actions/configure.png + oxygen/16x16/actions/configure.png oxygen/16x16/actions/contact-new.png oxygen/16x16/actions/datashow.png oxygen/16x16/actions/datashowchart.png @@ -191,8 +191,8 @@ oxygen/16x16/actions/media-seek-forward.png oxygen/16x16/actions/media-skip-backward.png oxygen/16x16/actions/media-skip-forward.png - oxygen/16x16/actions/network-connect.png - oxygen/16x16/actions/network-disconnect.png + oxygen/16x16/actions/network-connect.png + oxygen/16x16/actions/network-disconnect.png oxygen/16x16/actions/news-subscribe.png oxygen/16x16/actions/news-unsubscribe.png oxygen/16x16/actions/object-rotate-left.png @@ -318,7 +318,7 @@ oxygen/22x22/actions/color-picker.png oxygen/22x22/actions/configure-shortcuts.png oxygen/22x22/actions/configure-toolbars.png - oxygen/22x22/actions/configure.png + oxygen/22x22/actions/configure.png oxygen/22x22/actions/contact-new.png oxygen/22x22/actions/datashow.png oxygen/22x22/actions/datashowchart.png diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 82880815..c0b61108 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -48,7 +48,6 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) { ui.setupUi(this); setWindowTitle("Quassel IRC"); - //setWindowTitle(QString::fromUtf8("Κυασελ Εγαρζη")); setWindowIcon(QIcon(":icons/quassel-icon.png")); setWindowIconText("Quassel IRC"); @@ -62,55 +61,32 @@ void MainWin::init() { resize(s.value("MainWinSize").toSize()); Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant))); - Client::signalProxy()->attachSignal(this, SIGNAL(disconnectFromNetwork(NetworkId))); + + connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientNetworkCreated(NetworkId))); + connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), this, SLOT(clientNetworkRemoved(NetworkId))); ui.bufferWidget->init(); show(); - //QVariantMap connInfo; - //connInfo["User"] = "Default"; - //connInfo["Password"] = "password"; - //connectToCore(connInfo); - statusBar()->showMessage(tr("Not connected to core.")); - systray = new QSystemTrayIcon(this); - systray->setIcon(QIcon(":/icons/quassel-icon.png")); - - QString toolTip("left click to minimize the quassel client to tray"); - systray->setToolTip(toolTip); - - QMenu *systrayMenu = new QMenu(); - systrayMenu->addAction(ui.actionAboutQuassel); - systrayMenu->addSeparator(); - systrayMenu->addAction(ui.actionConnectCore); - systrayMenu->addAction(ui.actionDisconnectCore); - systrayMenu->addSeparator(); - systrayMenu->addAction(ui.actionQuit); - - systray->setContextMenu(systrayMenu); - - systray->show(); - connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )), - this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason ))); - // DOCK OPTIONS setDockNestingEnabled(true); setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); - setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea); setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); - // setup the docks etc... + // setup stuff... setupMenus(); setupViews(); setupNickWidget(); setupChatMonitor(); setupInputWidget(); setupTopicWidget(); - + setupSystray(); + setupSettingsDlg(); // restore mainwin state @@ -118,13 +94,11 @@ void MainWin::init() { disconnectedFromCore(); // Disable menus and stuff showCoreConnectionDlg(true); // autoconnect if appropriate - //ui.actionConnectCore->activate(QAction::Trigger); // attach the BufferWidget to the PropertyMapper ui.bufferWidget->setModel(Client::bufferModel()); ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); - #ifdef SPUTDEV showSettingsDlg(); #endif @@ -132,21 +106,8 @@ void MainWin::init() { } MainWin::~MainWin() { - //typedef QHash BufHash; - //foreach(BufHash h, buffers.values()) { - // foreach(Buffer *b, h.values()) { - // delete b; - // } - //} - //foreach(Buffer *buf, buffers.values()) delete buf; -} - -/* This is implemented in settingspages.cpp */ -/* -void MainWin::setupSettingsDlg() { } -*/ void MainWin::setupMenus() { connect(ui.actionConnectCore, SIGNAL(triggered()), this, SLOT(showCoreConnectionDlg())); @@ -154,9 +115,11 @@ void MainWin::setupMenus() { //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.actionDisconnectNet, SIGNAL(triggered()), this, SLOT(disconnectFromNet())); connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt())); + actionEditNetworks = new QAction(QIcon(":/22x22/actions/configure"), tr("Edit &Networks..."), this); + actionEditNetworks->setEnabled(false); // FIXME + ui.menuNetworks->addAction(actionEditNetworks); } void MainWin::setupViews() { @@ -225,11 +188,11 @@ void MainWin::setupChatMonitor() { chatWidget->show(); dock->setWidget(chatWidget); dock->show(); - + Buffer *buf = Client::monitorBuffer(); if(!buf) return; - + chatWidget->init(BufferId(0)); QList lines; QList msgs = buf->contents(); @@ -274,6 +237,28 @@ void MainWin::setupTopicWidget() { ui.menuViews->addAction(dock->toggleViewAction()); } +void MainWin::setupSystray() { + systray = new QSystemTrayIcon(this); + systray->setIcon(QIcon(":/icons/quassel-icon.png")); + + QString toolTip("left click to minimize the quassel client to tray"); + systray->setToolTip(toolTip); + + QMenu *systrayMenu = new QMenu(this); + systrayMenu->addAction(ui.actionAboutQuassel); + systrayMenu->addSeparator(); + systrayMenu->addAction(ui.actionConnectCore); + systrayMenu->addAction(ui.actionDisconnectCore); + systrayMenu->addSeparator(); + systrayMenu->addAction(ui.actionQuit); + + systray->setContextMenu(systrayMenu); + + systray->show(); + connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )), + this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason ))); +} + void MainWin::connectedToCore() { foreach(BufferInfo id, Client::allBufferInfos()) { emit requestBacklog(id, 1000, -1); @@ -307,9 +292,7 @@ void MainWin::showCoreConnectionDlg(bool autoConnect) { coreConnectDlg = new CoreConnectDlg(this, autoConnect); connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int))); coreConnectDlg->setModal(true); - //if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect()) - coreConnectDlg->show(); // avoid flicker and show dlg only if we do remote connect, which needs a progress bar - //if(autoConnect) coreConnectDlg->doAutoConnect(); + coreConnectDlg->show(); } void MainWin::coreConnectionDlgFinished(int /*code*/) { @@ -347,8 +330,63 @@ void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas } } -void MainWin::disconnectFromNet() { - int i = QInputDialog::getInteger(this, tr("Disconnect from Network"), tr("Enter network id:")); - emit disconnectFromNetwork(NetworkId(i)); +void MainWin::clientNetworkCreated(NetworkId id) { + const Network *net = Client::network(id); + QAction *act = new QAction(net->networkName(), this); + act->setData(QVariant::fromValue(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; + 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); + } +void MainWin::clientNetworkUpdated() { + const Network *net = qobject_cast(sender()); + if(!net) return; + foreach(QAction *a, networkActions) { + if(a->data().value() == 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; + } + } +} + +void MainWin::clientNetworkRemoved(NetworkId id) { + foreach(QAction *a, networkActions) { + if(a->data().value() == id) { + a->deleteLater(); + break; + } + } +} + +void MainWin::connectOrDisconnectFromNet() { + QAction *act = qobject_cast(sender()); + if(!act) return; + const Network *net = Client::network(act->data().value()); + if(!net) return; + if(net->connectionState() == Network::Disconnected) net->requestConnect(); + else net->requestDisconnect(); +} diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 3a3be26e..d194a6fe 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -62,15 +62,18 @@ class MainWin : public QMainWindow { void showSettingsDlg(); void showDebugConsole(); + void showCoreConnectionDlg(bool autoConnect = false); void coreConnectionDlgFinished(int result); - void disconnectFromNet(); + void clientNetworkCreated(NetworkId); + void clientNetworkRemoved(NetworkId); + void clientNetworkUpdated(); + void connectOrDisconnectFromNet(); signals: void connectToCore(const QVariantMap &connInfo); void disconnectFromCore(); - void disconnectFromNetwork(NetworkId); void requestBacklog(BufferInfo, QVariant, QVariant); private: @@ -83,7 +86,8 @@ class MainWin : public QMainWindow { void setupChatMonitor(); void setupInputWidget(); void setupTopicWidget(); - + void setupSystray(); + void setupSettingsDlg(); void enableMenus(); @@ -100,6 +104,9 @@ class MainWin : public QMainWindow { QDockWidget *nickDock; NickListWidget *nickListWidget; + QAction *actionEditNetworks; + QList networkActions; + DebugConsole *debugConsole; friend class QtUi; }; diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui index a5ecfa4e..56203011 100644 --- a/src/qtui/ui/mainwin.ui +++ b/src/qtui/ui/mainwin.ui @@ -53,14 +53,16 @@ Connection + + + &Networks + + + - - - - - + @@ -261,6 +263,14 @@ Disconnect from Network... + + + false + + + &Edit Networks... + + -- 2.20.1