#include "settingsdlg.h"
#include "signalproxy.h"
#include "topicwidget.h"
+#include "inputwidget.h"
+#include "verticaldock.h"
#include "uisettings.h"
#include "selectionmodelsynchronizer.h"
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::bufferModel()->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
- Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, ui.bufferWidget, "currentBuffer");
- connect(Client::networkModel(), SIGNAL(bufferAboutToBeRemoved(BufferId)),
- ui.bufferWidget, SLOT(removeBuffer(BufferId)));
+ 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");
void MainWin::setupViews() {
BufferModel *model = Client::bufferModel();
- 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>());
+ 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);
ui.menuViews->addAction(dock->toggleViewAction());
netViews.append(dock);
+ return dock;
}
void MainWin::setupSettingsDlg() {
+#ifdef SPUTDEV
+ 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));
+ //settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg));
}
void MainWin::connectedToCore() {
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::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
+ if (activationReason == QSystemTrayIcon::Trigger) {
+ if (isHidden())
+ show();
+ else
+ hide();
+ }
+
+
+
+}