* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+//#define SPUTDEV
#include "mainwin.h"
#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"
#include "settingspages/fontssettingspage.h"
#include "settingspages/identitiessettingspage.h"
+#include "settingspages/networkssettingspage.h"
#include "debugconsole.h"
void MainWin::init() {
Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)));
+ Client::signalProxy()->attachSignal(this, SIGNAL(disconnectFromNetwork(NetworkId)));
ui.bufferWidget->init();
show();
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();
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
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.actionDisconnectNet, SIGNAL(triggered()), this, SLOT(disconnectFromNet()));
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<uint>());
- addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList<uint>());
- addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList<uint>());
- addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList<uint>());
- addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList<uint>());
-
+ 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>());
+
ui.menuViews->addSeparator();
}
-void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList<uint> &nets) {
+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);
- //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));
+#ifdef SPUTDEV
+ settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
+ connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit())); // FIXME
#endif
}
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);
}
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::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
+ if (activationReason == QSystemTrayIcon::Trigger) {
+ if (isHidden())
+ show();
+ else
+ hide();
+ }
}
-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::disconnectFromNet() {
+ int i = QInputDialog::getInteger(this, tr("Disconnect from Network"), tr("Enter network id:"));
+ emit disconnectFromNetwork(NetworkId(i));
}
+
projects / quassel.git / blobdiff