#include "bufferviewconfig.h"
#include "bufferviewfilter.h"
#include "bufferviewmanager.h"
-#ifdef SPUTDEV
-# include "chatline.h"
-#else
-# include "chatline-old.h"
-#endif
+#include "channellistdlg.h"
#include "client.h"
#include "clientbacklogmanager.h"
#include "coreconnectdlg.h"
#include "signalproxy.h"
#include "topicwidget.h"
#include "inputwidget.h"
+#include "irclistmodel.h"
#include "verticaldock.h"
#include "uisettings.h"
#include "qtuisettings.h"
offlineTrayIcon(":/icons/quassel-icon-offline.png"),
trayIconActive(false),
timer(new QTimer(this)),
+ channelListDlg(new ChannelListDlg(this)),
settingsDlg(new SettingsDlg(this)),
debugConsole(new DebugConsole(this))
{
connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientNetworkCreated(NetworkId)));
connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), this, SLOT(clientNetworkRemoved(NetworkId)));
- //ui.bufferWidget->init();
show();
// restore mainwin state
restoreState(s.value("MainWinState").toByteArray());
+ // restore locked state of docks
+ ui.actionLockDockPositions->setChecked(s.value("LockDocks", false).toBool());
+
+
setDisconnectedState(); // Disable menus and stuff
showCoreConnectionDlg(true); // autoconnect if appropriate
connect(ui.actionConnectCore, SIGNAL(triggered()), this, SLOT(showCoreConnectionDlg()));
connect(ui.actionDisconnectCore, SIGNAL(triggered()), Client::instance(), SLOT(disconnectFromCore()));
connect(ui.actionQuit, SIGNAL(triggered()), QCoreApplication::instance(), SLOT(quit()));
- //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.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole()));
connect(ui.actionAboutQuassel, SIGNAL(triggered()), this, SLOT(showAboutDlg()));
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()));
- connect(ui.actionManageViews, SIGNAL(triggered()), this, SLOT(showManageViewsDlg()));
}
void MainWin::setupViews() {
- QAction *separator = ui.menuViews->addSeparator();
- separator->setData("__EOBV__");
addBufferView();
}
view->setFilteredModel(Client::bufferModel(), config);
view->show();
+ connect(&view->showChannelList, SIGNAL(triggered()), this, SLOT(showChannelList()));
+
Client::bufferModel()->synchronizeView(view);
dock->setWidget(view);
dock->show();
addDockWidget(Qt::LeftDockWidgetArea, dock);
-
- QAction *endOfBufferViews = 0;
- foreach(QAction *action, ui.menuViews->actions()) {
- if(action->data().toString() == "__EOBV__") {
- endOfBufferViews = action;
- break;
- }
- }
- Q_CHECK_PTR(endOfBufferViews);
- ui.menuViews->insertAction(endOfBufferViews, dock->toggleViewAction());
+ ui.menuBufferViews->addAction(dock->toggleViewAction());
_netViews.append(dock);
}
void MainWin::removeBufferView(int bufferViewConfigId) {
QVariant actionData;
BufferViewDock *dock;
- foreach(QAction *action, ui.menuViews->actions()) {
+ foreach(QAction *action, ui.menuBufferViews->actions()) {
actionData = action->data();
if(!actionData.isValid())
continue;
-
- if(actionData.toString() == "__EOBV__")
- break;
dock = qobject_cast<BufferViewDock *>(action->parent());
if(dock && actionData.toInt() == bufferViewConfigId) {
settingsDlg->registerSettingsPage(new BufferViewSettingsPage(settingsDlg));
}
-void MainWin::showNetworkDlg() {
+void MainWin::on_actionEditNetworks_triggered() {
SettingsPageDlg dlg(new NetworksSettingsPage(this), this);
dlg.exec();
}
-void MainWin::showManageViewsDlg() {
+void MainWin::on_actionManageViews_triggered() {
SettingsPageDlg dlg(new BufferViewSettingsPage(this), this);
dlg.exec();
}
+void MainWin::on_actionLockDockPositions_toggled(bool lock) {
+ QList<VerticalDock *> docks = findChildren<VerticalDock *>();
+ foreach(VerticalDock *dock, docks) {
+ dock->showTitle(!lock);
+ }
+ QtUiSettings().setValue("LockDocks", lock);
+}
+
void MainWin::setupNickWidget() {
// create nick dock
NickListDock *nickDock = new NickListDock(tr("Nicks"), this);
//ui.menuCore->setEnabled(true);
ui.actionConnectCore->setEnabled(false);
ui.actionDisconnectCore->setEnabled(true);
- //ui.actionNetworkList->setEnabled(true);
ui.bufferWidget->show();
statusBar()->showMessage(tr("Connected to core."));
setWindowIcon(onlineTrayIcon);
void MainWin::securedConnection() {
// todo: make status bar entry
- qDebug() << "secured the connection";
-
sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/ssl")));
}
saveLayout();
QVariant actionData;
BufferViewDock *dock;
- foreach(QAction *action, ui.menuViews->actions()) {
+ foreach(QAction *action, ui.menuBufferViews->actions()) {
actionData = action->data();
if(!actionData.isValid())
continue;
-
- if(actionData.toString() == "__EOBV__")
- break;
dock = qobject_cast<BufferViewDock *>(action->parent());
if(dock && actionData.toInt() != -1) {
ui.menuViews->setEnabled(false);
//ui.menuCore->setEnabled(false);
ui.actionDisconnectCore->setEnabled(false);
- //ui.actionNetworkList->setEnabled(false);
ui.bufferWidget->hide();
ui.actionConnectCore->setEnabled(true);
- // nickListWidget->reset();
statusBar()->showMessage(tr("Not connected to core."));
setWindowIcon(offlineTrayIcon);
qApp->setWindowIcon(offlineTrayIcon);
//exit(1);
}
+void MainWin::showChannelList(NetworkId netId) {
+ if(!netId.isValid()) {
+ QAction *action = qobject_cast<QAction *>(sender());
+ if(action)
+ netId = action->data().value<NetworkId>();
+ }
+ channelListDlg->setNetwork(netId);
+ channelListDlg->show();
+}
+
void MainWin::showSettingsDlg() {
settingsDlg->show();
}
}
void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
- if (activationReason == QSystemTrayIcon::Trigger) {
+ if(activationReason == QSystemTrayIcon::Trigger) {
toggleVisibility();
}
}
void MainWin::toggleVisibility() {
if(isHidden() /*|| !isActiveWindow()*/) {
show();
- if(isMinimized())
- if (isMaximized())
+ if(isMinimized()) {
+ if(isMaximized())
showMaximized();
else
showNormal();
+ }
raise();
activateWindow();
UiSettings uiSettings;
+#ifndef SPUTDEV
if(uiSettings.value("DisplayPopupMessages", QVariant(true)).toBool()) {
// FIXME don't invoke style engine for this!
- QString text = QtUi::style()->styleString(Message::mircToInternal(msg.text())).text;
+ QString text = QtUi::style()->styleString(Message::mircToInternal(msg.contents())).plainText;
displayTrayIconMessage(title, text);
}
-
+#endif
if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) {
QApplication::alert(this);
setTrayIconActivity(true);
}
}
-
-
void MainWin::clientNetworkCreated(NetworkId id) {
const Network *net = Client::network(id);
QAction *act = new QAction(net->networkName(), this);
+ act->setObjectName(QString("NetworkAction-%1").arg(id.toInt()));
act->setData(QVariant::fromValue<NetworkId>(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;
+
+ QAction *beforeAction = 0;
+ foreach(QAction *action, ui.menuNetworks->actions()) {
+ if(action->isSeparator()) {
+ beforeAction = action;
+ break;
+ }
+ if(net->networkName().localeAwareCompare(action->text()) < 0) {
+ beforeAction = action;
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);
+ Q_CHECK_PTR(beforeAction);
+ ui.menuNetworks->insertAction(beforeAction, act);
}
void MainWin::clientNetworkUpdated() {
const Network *net = qobject_cast<const Network *>(sender());
- if(!net) return;
- foreach(QAction *a, networkActions) {
- if(a->data().value<NetworkId>() == 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;
- }
+ if(!net)
+ return;
+
+ QAction *action = findChild<QAction *>(QString("NetworkAction-%1").arg(net->networkId().toInt()));
+ if(!action)
+ return;
+
+ action->setText(net->networkName());
+
+ switch(net->connectionState()) {
+ case Network::Initialized:
+ action->setIcon(QIcon(":/16x16/actions/network-connect"));
+ break;
+ case Network::Disconnected:
+ action->setIcon(QIcon(":/16x16/actions/network-disconnect"));
+ break;
+ default:
+ action->setIcon(QIcon(":/16x16/actions/gear"));
}
}
void MainWin::clientNetworkRemoved(NetworkId id) {
- QList<QAction *>::iterator actionIter = networkActions.begin();;
- QAction *action;
- while(actionIter != networkActions.end()) {
- action = *actionIter;
- if(action->data().value<NetworkId>() == id) {
- action->deleteLater();
- actionIter = networkActions.erase(actionIter);
- } else
- actionIter++;
- }
+ QAction *action = findChild<QAction *>(QString("NetworkAction-%1").arg(id.toInt()));
+ if(!action)
+ return;
+
+ action->deleteLater();
}
void MainWin::connectOrDisconnectFromNet() {