X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=518b2b8451c59cbc2ec6b66c806ad33d748f1262;hb=9d4fbba1e7390f7cbc60aed962bf9d36ac111263;hp=d7c3bbac304f5657c811bc82d60452f1c66eff1a;hpb=21d8d7f0a79eeeb541664aa80ce481fdbfc41f09;p=quassel.git diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index d7c3bbac..518b2b84 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -17,6 +17,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +//#define SPUTDEV #include "mainwin.h" @@ -25,11 +26,14 @@ #include "client.h" #include "coreconnectdlg.h" #include "networkmodel.h" +#include "buffermodel.h" #include "nicklistwidget.h" #include "serverlist.h" #include "settingsdlg.h" #include "signalproxy.h" #include "topicwidget.h" +#include "inputwidget.h" +#include "verticaldock.h" #include "uisettings.h" #include "selectionmodelsynchronizer.h" @@ -37,6 +41,7 @@ #include "settingspages/fontssettingspage.h" #include "settingspages/identitiessettingspage.h" +#include "settingspages/networkssettingspage.h" #include "debugconsole.h" @@ -67,7 +72,23 @@ void MainWin::init() { 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 ))); //setupSettingsDlg(); @@ -98,31 +119,50 @@ void MainWin::init() { showServerList(); } + // DOCK OPTIONS setDockNestingEnabled(true); - - - // new Topic Stuff... should be probably refactored out into a separate method - + setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea); setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); + // new Topic Stuff... should be probably refactored out into a separate method + VerticalDock *topicDock = new VerticalDock(tr("Topic"), this); + topicDock->setObjectName("TopicDock"); + TopicWidget *topicwidget = new TopicWidget(topicDock); + topicDock->setWidget(topicwidget); - QDockWidget *dock = new QDockWidget(tr("Topic Dock"), this); - dock->setObjectName("TopicDock"); - dock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); + Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic"); - TopicWidget *topicwidget = new TopicWidget(dock); - dock->setWidget(topicwidget); + addDockWidget(Qt::TopDockWidgetArea, topicDock); - Client::networkModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic"); + ui.menuViews->addAction(topicDock->toggleViewAction()); - addDockWidget(Qt::TopDockWidgetArea, dock); + // NEW INPUT WIDGET -- damn init() needs a cleanup + VerticalDock *inputDock = new VerticalDock(tr("Inputline"), this); + inputDock->setObjectName("InputDock"); + InputWidget *inputWidget = new InputWidget(inputDock); + inputDock->setWidget(inputWidget); - ui.menuViews->addAction(dock->toggleViewAction()); + addDockWidget(Qt::BottomDockWidgetArea, inputDock); + + ui.menuViews->addAction(inputDock->toggleViewAction()); + + inputWidget->setModel(Client::bufferModel()); + inputWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); + ui.bufferWidget->setFocusProxy(inputWidget); + + // attach the BufferWidget to the PropertyMapper + ui.bufferWidget->setModel(Client::bufferModel()); + ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); + + // attach the NickList to the PropertyMapper + Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer"); + + #ifdef SPUTDEV showSettingsDlg(); #endif @@ -153,47 +193,49 @@ void MainWin::setupMenus() { connect(ui.actionEditIdentities, SIGNAL(triggered()), serverListDlg, SLOT(editIdentities())); connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg())); connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole())); - //ui.actionSettingsDlg->setEnabled(false); connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt())); } void MainWin::setupViews() { - - NetworkModel *model = Client::networkModel(); - connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *))); - - addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList()); - addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList()); - addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList()); - addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList()); - addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList()); - + BufferModel *model = Client::bufferModel(); + + addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList()); + addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList()); + addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList()); + addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList()); + addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList()); + ui.menuViews->addSeparator(); } -void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList &nets) { +QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList &nets) { QDockWidget *dock = new QDockWidget(viewname, this); dock->setObjectName(QString("ViewDock-" + viewname)); // should be unique for mainwindow state! dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea); - //dock->setContentsMargins(4,4,4,4); //create the view and initialize it's filter BufferView *view = new BufferView(dock); + view->show(); view->setFilteredModel(model, mode, nets); - Client::networkModel()->synchronizeView(view); + Client::bufferModel()->synchronizeView(view); dock->setWidget(view); + dock->show(); addDockWidget(Qt::LeftDockWidgetArea, dock); ui.menuViews->addAction(dock->toggleViewAction()); netViews.append(dock); + return dock; } void MainWin::setupSettingsDlg() { - settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg)); #ifdef SPUTDEV - settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg)); + connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit())); // FIXME #endif + + settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg)); + settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg)); + //settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg)); } void MainWin::connectedToCore() { @@ -229,14 +271,14 @@ 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()) + //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(); + //if(autoConnect) coreConnectDlg->doAutoConnect(); } void MainWin::coreConnectionDlgFinished(int /*code*/) { - coreConnectDlg->close(); + //exit(1); } @@ -259,29 +301,24 @@ void MainWin::showDebugConsole() { void MainWin::closeEvent(QCloseEvent *event) { //if (userReallyWantsToQuit()) { - ui.bufferWidget->saveState(); UiSettings s; s.setValue("MainWinSize", size()); s.setValue("MainWinPos", pos()); s.setValue("MainWinState", saveState()); - delete systray; event->accept(); //} else { //event->ignore(); //} } -void MainWin::showBuffer(BufferInfo id) { - showBuffer(Client::buffer(id)); -} - -void MainWin::showBuffer(Buffer *b) { - currentBuffer = b->bufferInfo().groupId(); - //emit bufferSelected(b); - //qApp->processEvents(); - ui.bufferWidget->setBuffer(b); - nickListWidget->setBuffer(b); - //if(b->bufferType() == Buffer::ChannelType) nickDock->show(); - //else nickDock->hide(); - //emit bufferSelected(b); +void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) { + if (activationReason == QSystemTrayIcon::Trigger) { + if (isHidden()) + show(); + else + hide(); + } + + + }