X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=2c20680cab913727009e6b24f95ce9138fdc82a8;hp=cdbe71b960d3a62ff77f65ea88e2d68d9f9def4f;hb=d1c517f3be0e4457f363f74a474a8a47bdd4a5cf;hpb=e7696b65e76e50137b8bab0ec3e43ce66a94f190 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index cdbe71b9..2c20680c 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -29,8 +29,8 @@ #include "networkmodel.h" #include "buffermodel.h" #include "nicklistwidget.h" -#include "serverlist.h" #include "settingsdlg.h" +#include "settingspagedlg.h" #include "signalproxy.h" #include "topicwidget.h" #include "inputwidget.h" @@ -49,12 +49,10 @@ 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"); statusBar()->showMessage(tr("Waiting for core...")); - serverListDlg = new ServerListDlg(this); settingsDlg = new SettingsDlg(this); debugConsole = new DebugConsole(this); } @@ -64,55 +62,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))); - ui.bufferWidget->init(); + 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 @@ -120,17 +95,11 @@ void MainWin::init() { disconnectedFromCore(); // Disable menus and stuff showCoreConnectionDlg(true); // autoconnect if appropriate - //ui.actionConnectCore->activate(QAction::Trigger); - if(serverListDlg->showOnStartup()) { - showServerList(); - } - // attach the BufferWidget to the PropertyMapper ui.bufferWidget->setModel(Client::bufferModel()); ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); - #ifdef SPUTDEV showSettingsDlg(); #endif @@ -138,32 +107,20 @@ 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())); connect(ui.actionDisconnectCore, SIGNAL(triggered()), Client::instance(), SLOT(disconnectFromCore())); - connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList())); - connect(ui.actionEditIdentities, SIGNAL(triggered()), serverListDlg, SLOT(editIdentities())); + //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); + ui.menuNetworks->addAction(actionEditNetworks); + connect(actionEditNetworks, SIGNAL(triggered()), this, SLOT(showNetworkDlg())); } void MainWin::setupViews() { @@ -202,8 +159,9 @@ void MainWin::setupSettingsDlg() { settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg)); settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg)); -#ifdef SPUTDEV settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg)); + +#ifdef SPUTDEV connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit())); // FIXME #endif } @@ -231,11 +189,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(); @@ -280,6 +238,30 @@ 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); + + 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(); + #ifndef Q_WS_MAC + connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )), + this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason ))); + #endif +} + void MainWin::connectedToCore() { foreach(BufferInfo id, Client::allBufferInfos()) { emit requestBacklog(id, 1000, -1); @@ -289,7 +271,7 @@ void MainWin::connectedToCore() { ui.menuCore->setEnabled(true); ui.actionConnectCore->setEnabled(false); ui.actionDisconnectCore->setEnabled(true); - ui.actionNetworkList->setEnabled(true); + //ui.actionNetworkList->setEnabled(true); ui.bufferWidget->show(); statusBar()->showMessage(tr("Connected to core.")); } @@ -298,7 +280,7 @@ void MainWin::disconnectedFromCore() { ui.menuViews->setEnabled(false); ui.menuCore->setEnabled(false); ui.actionDisconnectCore->setEnabled(false); - ui.actionNetworkList->setEnabled(false); + //ui.actionNetworkList->setEnabled(false); ui.bufferWidget->hide(); ui.actionConnectCore->setEnabled(true); nickListWidget->reset(); @@ -313,9 +295,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*/) { @@ -323,15 +303,6 @@ void MainWin::coreConnectionDlgFinished(int /*code*/) { //exit(1); } - -void MainWin::showServerList() { -// if(!serverListDlg) { -// serverListDlg = new ServerListDlg(this); -// } - serverListDlg->show(); - serverListDlg->raise(); -} - void MainWin::showSettingsDlg() { settingsDlg->show(); } @@ -355,15 +326,146 @@ void MainWin::closeEvent(QCloseEvent *event) void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) { if (activationReason == QSystemTrayIcon::Trigger) { - if (isHidden()) + if(isHidden()) { show(); - else + if(isMinimized()) { + if(isMaximized()) { + showMaximized(); + } else { + showNormal(); + } + } + raise(); + activateWindow(); + } else { hide(); + } + } +} + +void MainWin::showNetworkDlg() { + SettingsPageDlg dlg(new NetworksSettingsPage(this), this); + dlg.exec(); +} + +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) { + QList::iterator actionIter = networkActions.begin();; + QAction *action; + while(actionIter != networkActions.end()) { + action = *actionIter; + if(action->data().value() == id) { + action->deleteLater(); + actionIter = networkActions.erase(actionIter); + } else + actionIter++; + } +} + +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(); +} + +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(event->modifiers() == bindModifier) { + event->accept(); + return bindKey(event->key()); + } + + if(event->modifiers() == jumpModifier) { + event->accept(); + return jumpKey(event->key()); } + + event->ignore(); } -void MainWin::disconnectFromNet() { - int i = QInputDialog::getInteger(this, tr("Disconnect from Network"), tr("Enter network id:")); - emit disconnectFromNetwork(NetworkId(i)); +void MainWin::bindKey(int key) { + if(key < Qt::Key_0 || Qt::Key_9 < key) + return; + + QModelIndex bufferIdx = Client::bufferModel()->standardSelectionModel()->currentIndex(); + NetworkId netId = bufferIdx.data(NetworkModel::NetworkIdRole).value(); + const Network *net = Client::network(netId); + if(!net) + return; + + QString bufferName = bufferIdx.sibling(bufferIdx.row(), 0).data().toString(); + BufferId bufferId = bufferIdx.data(NetworkModel::BufferIdRole).value(); + + _keyboardJump[key] = bufferId; + CoreAccountSettings().setJumpKeyMap(_keyboardJump); + statusBar()->showMessage(tr("Bound Buffer %1::%2 to Key %3").arg(net->networkName()).arg(bufferName).arg(key - Qt::Key_0), 10000); } +void MainWin::jumpKey(int key) { + if(key < Qt::Key_0 || Qt::Key_9 < key) + return; + + if(_keyboardJump.isEmpty()) + _keyboardJump = CoreAccountSettings().jumpKeyMap(); + + if(!_keyboardJump.contains(key)) + return; + + QModelIndex source_bufferIdx = Client::networkModel()->bufferIndex(_keyboardJump[key]); + QModelIndex bufferIdx = Client::bufferModel()->mapFromSource(source_bufferIdx); + + if(bufferIdx.isValid()) + Client::bufferModel()->standardSelectionModel()->setCurrentIndex(bufferIdx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); + +}