# include <KMenuBar>
# include <KShortcutsDialog>
# include <KStatusBar>
+# include <KToolBar>
+# include <KWindowSystem>
#endif
#ifdef Q_WS_X11
#include "awaylogview.h"
#include "action.h"
#include "actioncollection.h"
+#include "bufferhotlistfilter.h"
#include "buffermodel.h"
#include "bufferview.h"
#include "bufferviewoverlay.h"
#include "chatmonitorview.h"
#include "chatview.h"
#include "client.h"
-#include "clientsyncer.h"
#include "clientbacklogmanager.h"
#include "clientbufferviewconfig.h"
#include "clientbufferviewmanager.h"
-#include "coreinfodlg.h"
+#include "clientignorelistmanager.h"
+#include "coreconfigwizard.h"
#include "coreconnectdlg.h"
+#include "coreconnection.h"
+#include "coreconnectionstatuswidget.h"
+#include "coreinfodlg.h"
#include "contextmenuactionprovider.h"
#include "debugbufferviewoverlay.h"
#include "debuglogwidget.h"
#include "debugmessagemodelfilter.h"
+#include "flatproxymodel.h"
#include "iconloader.h"
#include "inputwidget.h"
-#include "inputline.h"
#include "irclistmodel.h"
#include "ircconnectionwizard.h"
#include "jumpkeyhandler.h"
+#include "legacysystemtray.h"
#include "msgprocessorstatuswidget.h"
#include "nicklistwidget.h"
#include "qtuiapplication.h"
#include "qtuimessageprocessor.h"
#include "qtuisettings.h"
+#include "qtuistyle.h"
#include "settingsdlg.h"
#include "settingspagedlg.h"
-#include "systemtray.h"
#include "toolbaractionprovider.h"
#include "topicwidget.h"
#include "verticaldock.h"
# include "knotificationbackend.h"
#endif /* HAVE_KDE */
+#ifdef HAVE_SSL
+# include "sslinfodlg.h"
+#endif
+
+#ifdef HAVE_INDICATEQT
+ #include "indicatornotificationbackend.h"
+#endif
+
#include "settingspages/aliasessettingspage.h"
#include "settingspages/appearancesettingspage.h"
#include "settingspages/backlogsettingspage.h"
#include "settingspages/bufferviewsettingspage.h"
#include "settingspages/chatmonitorsettingspage.h"
-#include "settingspages/colorsettingspage.h"
-#include "settingspages/generalsettingspage.h"
+#include "settingspages/chatviewsettingspage.h"
+#include "settingspages/connectionsettingspage.h"
+#include "settingspages/coreaccountsettingspage.h"
+#include "settingspages/coreconnectionsettingspage.h"
#include "settingspages/highlightsettingspage.h"
#include "settingspages/identitiessettingspage.h"
+#include "settingspages/ignorelistsettingspage.h"
+#include "settingspages/inputwidgetsettingspage.h"
+#include "settingspages/itemviewsettingspage.h"
#include "settingspages/networkssettingspage.h"
#include "settingspages/notificationssettingspage.h"
+#include "settingspages/topicwidgetsettingspage.h"
MainWin::MainWin(QWidget *parent)
#ifdef HAVE_KDE
#else
: QMainWindow(parent),
#endif
- coreLagLabel(new QLabel()),
- sslLabel(new QLabel()),
- msgProcessorStatusWidget(new MsgProcessorStatusWidget()),
+ _msgProcessorStatusWidget(new MsgProcessorStatusWidget(this)),
+ _coreConnectionStatusWidget(new CoreConnectionStatusWidget(Client::coreConnection(), this)),
_titleSetter(this),
- _awayLog(0)
+ _awayLog(0),
+ _layoutLoaded(false)
{
#ifdef Q_WS_WIN
dwTickCount = 0;
updateIcon();
installEventFilter(new JumpKeyHandler(this));
-
- QtUiApplication* app = qobject_cast<QtUiApplication*> qApp;
- connect(app, SIGNAL(saveStateToSession(const QString&)), SLOT(saveStateToSession(const QString&)));
- connect(app, SIGNAL(saveStateToSessionSettings(SessionSettings&)), SLOT(saveStateToSessionSettings(SessionSettings&)));
- connect(app, SIGNAL(aboutToQuit()), SLOT(aboutToQuit()));
}
void MainWin::init() {
- connect(QApplication::instance(), SIGNAL(aboutToQuit()), SLOT(saveLayout()));
connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), SLOT(clientNetworkCreated(NetworkId)));
connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), SLOT(clientNetworkRemoved(NetworkId)));
connect(Client::messageModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
SLOT(messagesInserted(const QModelIndex &, int, int)));
connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showChannelList(NetworkId)), SLOT(showChannelList(NetworkId)));
+ connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showIgnoreList(QString)), SLOT(showIgnoreList(QString)));
+
+ connect(Client::coreConnection(), SIGNAL(startCoreSetup(QVariantList)), SLOT(showCoreConfigWizard(QVariantList)));
+ connect(Client::coreConnection(), SIGNAL(connectionErrorPopup(QString)), SLOT(handleCoreConnectionError(QString)));
+ connect(Client::coreConnection(), SIGNAL(userAuthenticationRequired(CoreAccount *, bool *, QString)), SLOT(userAuthenticationRequired(CoreAccount *, bool *, QString)));
+ connect(Client::coreConnection(), SIGNAL(handleNoSslInClient(bool*)), SLOT(handleNoSslInClient(bool *)));
+ connect(Client::coreConnection(), SIGNAL(handleNoSslInCore(bool*)), SLOT(handleNoSslInCore(bool *)));
+#ifdef HAVE_SSL
+ connect(Client::coreConnection(), SIGNAL(handleSslErrors(const QSslSocket *, bool *, bool *)), SLOT(handleSslErrors(const QSslSocket *, bool *, bool *)));
+#endif
// Setup Dock Areas
setDockNestingEnabled(true);
setupBufferWidget();
setupMenus();
setupTopicWidget();
- setupChatMonitor();
setupNickWidget();
setupInputWidget();
+ setupChatMonitor();
setupStatusBar();
setupToolBars();
setupSystray();
setupTitleSetter();
+ setupHotList();
#ifndef HAVE_KDE
QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this));
+# ifndef QT_NO_SYSTEMTRAYICON
QtUi::registerNotificationBackend(new SystrayNotificationBackend(this));
+# endif
# ifdef HAVE_PHONON
QtUi::registerNotificationBackend(new PhononNotificationBackend(this));
# endif
QtUi::registerNotificationBackend(new KNotificationBackend(this));
#endif /* HAVE_KDE */
+#ifdef HAVE_INDICATEQT
+ QtUi::registerNotificationBackend(new IndicatorNotificationBackend(this));
+#endif
+
+ connect(bufferWidget(), SIGNAL(currentChanged(BufferId)), SLOT(currentBufferChanged(BufferId)));
+
setDisconnectedState(); // Disable menus and stuff
+#ifdef HAVE_KDE
+ setAutoSaveSettings();
+#endif
+
// restore mainwin state
QtUiSettings s;
restoreStateFromSettings(s);
// restore locked state of docks
QtUi::actionCollection("General")->action("LockLayout")->setChecked(s.value("LockLayout", false).toBool());
- if(Quassel::runMode() != Quassel::Monolithic) {
- showCoreConnectionDlg(true); // autoconnect if appropriate
- } else {
- startInternalCore();
+ CoreConnection *conn = Client::coreConnection();
+ if(!conn->connectToCore()) {
+ // No autoconnect selected (or no accounts)
+ showCoreConnectionDlg();
}
}
}
-void MainWin::aboutToQuit() {
+void MainWin::quit() {
QtUiSettings s;
saveStateToSettings(s);
+ saveLayout();
+ QApplication::quit();
}
void MainWin::saveStateToSettings(UiSettings &s) {
s.setValue("MainWinState", saveState());
s.setValue("MainWinGeometry", saveGeometry());
s.setValue("MainWinMinimized", isMinimized());
- s.setValue("MainWinHidden", _isHidden);
+ s.setValue("MainWinMaximized", isMaximized());
+ s.setValue("MainWinHidden", !isVisible());
+
+#ifdef HAVE_KDE
+ saveAutoSaveSettings();
+#endif
}
void MainWin::restoreStateFromSettings(UiSettings &s) {
+ _normalSize = s.value("MainWinSize", size()).toSize();
+ _normalPos = s.value("MainWinPos", pos()).toPoint();
+ bool maximized = s.value("MainWinMaximized", false).toBool();
+
+#ifndef HAVE_KDE
restoreGeometry(s.value("MainWinGeometry").toByteArray());
- if(isMaximized()) {
+
+ if(maximized) {
// restoreGeometry() fails if the windows was maximized, so we resize and position explicitly
- resize(s.value("MainWinSize", QSize(800, 500)).toSize());
- move(s.value("MainWinPos").toPoint());
+ resize(_normalSize);
+ move(_normalPos);
}
restoreState(s.value("MainWinState").toByteArray());
- _isHidden = false;
+#else
+ move(_normalPos);
+#endif
+
if(s.value("MainWinHidden").toBool())
hideToTray();
else if(s.value("MainWinMinimized").toBool())
showMinimized();
+ else if(maximized)
+ showMaximized();
else
show();
}
coll->addAction("ConfigureNetworks", new Action(SmallIcon("configure"), tr("Configure &Networks..."), coll,
this, SLOT(on_actionConfigureNetworks_triggered())));
coll->addAction("Quit", new Action(SmallIcon("application-exit"), tr("&Quit"), coll,
- qApp, SLOT(quit()), tr("Ctrl+Q")));
+ this, SLOT(quit()), tr("Ctrl+Q")));
// View
- coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Buffer Views..."), coll,
+ coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Chat Lists..."), coll,
this, SLOT(on_actionConfigureViews_triggered())));
QAction *lockAct = coll->addAction("LockLayout", new Action(tr("&Lock Layout"), coll));
connect(lockAct, SIGNAL(toggled(bool)), SLOT(on_actionLockLayout_toggled(bool)));
coll->addAction("ToggleSearchBar", new Action(SmallIcon("edit-find"), tr("Show &Search Bar"), coll,
- 0, 0, QKeySequence::Find))->setCheckable(true);
+ 0, 0, QKeySequence::Find))->setCheckable(true);
coll->addAction("ShowAwayLog", new Action(tr("Show Away Log"), coll,
- this, SLOT(showAwayLog())));
+ this, SLOT(showAwayLog())));
+ coll->addAction("ToggleMenuBar", new Action(SmallIcon("show-menu"), tr("Show &Menubar"), coll,
+ 0, 0, tr("Ctrl+M")))->setCheckable(true);
+
coll->addAction("ToggleStatusBar", new Action(tr("Show Status &Bar"), coll,
- 0, 0))->setCheckable(true);
+ 0, 0))->setCheckable(true);
// Settings
coll->addAction("ConfigureQuassel", new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
this, SLOT(on_actionDebugBufferViewOverlay_triggered())));
coll->addAction("DebugMessageModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &MessageModel"), coll,
this, SLOT(on_actionDebugMessageModel_triggered())));
+ coll->addAction("DebugHotList", new Action(SmallIcon("tools-report-bug"), tr("Debug &HotList"), coll,
+ this, SLOT(on_actionDebugHotList_triggered())));
coll->addAction("DebugLog", new Action(SmallIcon("tools-report-bug"), tr("Debug &Log"), coll,
this, SLOT(on_actionDebugLog_triggered())));
+ coll->addAction("ReloadStyle", new Action(SmallIcon("view-refresh"), tr("Reload Stylesheet"), coll,
+ QtUi::style(), SLOT(reload()), QKeySequence::Refresh));
+
+ // Navigation
+ coll->addAction("JumpHotBuffer", new Action(tr("Jump to hot chat"), coll,
+ this, SLOT(on_jumpHotBuffer_triggered()), QKeySequence(Qt::META + Qt::Key_A)));
}
void MainWin::setupMenus() {
_fileMenu->addAction(coll->action("Quit"));
_viewMenu = menuBar()->addMenu(tr("&View"));
- _bufferViewsMenu = _viewMenu->addMenu(tr("&Buffer Views"));
+ _bufferViewsMenu = _viewMenu->addMenu(tr("&Chat Lists"));
_bufferViewsMenu->addAction(coll->action("ConfigureBufferViews"));
_toolbarMenu = _viewMenu->addMenu(tr("&Toolbars"));
_viewMenu->addSeparator();
+
+ _viewMenu->addAction(coll->action("ToggleMenuBar"));
+ _viewMenu->addAction(coll->action("ToggleStatusBar"));
_viewMenu->addAction(coll->action("ToggleSearchBar"));
coreAction = coll->action("ShowAwayLog");
flagRemoteCoreOnly(coreAction);
_viewMenu->addAction(coreAction);
- _viewMenu->addAction(coll->action("ToggleStatusBar"));
_viewMenu->addSeparator();
_viewMenu->addAction(coll->action("LockLayout"));
_settingsMenu = menuBar()->addMenu(tr("&Settings"));
#ifdef HAVE_KDE
- _settingsMenu->addAction(KStandardAction::keyBindings(this, SLOT(showShortcutsDlg()), this));
_settingsMenu->addAction(KStandardAction::configureNotifications(this, SLOT(showNotificationsDlg()), this));
+ _settingsMenu->addAction(KStandardAction::keyBindings(this, SLOT(showShortcutsDlg()), this));
#endif
_settingsMenu->addAction(coll->action("ConfigureQuassel"));
_helpDebugMenu->addAction(coll->action("DebugNetworkModel"));
_helpDebugMenu->addAction(coll->action("DebugBufferViewOverlay"));
_helpDebugMenu->addAction(coll->action("DebugMessageModel"));
+ _helpDebugMenu->addAction(coll->action("DebugHotList"));
_helpDebugMenu->addAction(coll->action("DebugLog"));
+ _helpDebugMenu->addSeparator();
+ _helpDebugMenu->addAction(coll->action("ReloadStyle"));
+
+ // Toggle visibility
+ QAction *showMenuBar = QtUi::actionCollection("General")->action("ToggleMenuBar");
+
+ QtUiSettings uiSettings;
+ bool enabled = uiSettings.value("ShowMenuBar", QVariant(true)).toBool();
+ showMenuBar->setChecked(enabled);
+ enabled ? menuBar()->show() : menuBar()->hide();
+
+ connect(showMenuBar, SIGNAL(toggled(bool)), menuBar(), SLOT(setVisible(bool)));
+ connect(showMenuBar, SIGNAL(toggled(bool)), this, SLOT(saveMenuBarStatus(bool)));
}
void MainWin::setupBufferWidget() {
//create the view and initialize it's filter
BufferView *view = new BufferView(dock);
view->setFilteredModel(Client::bufferModel(), config);
- view->installEventFilter(_inputWidget->inputLine()); // for key presses
- view->show();
+ view->installEventFilter(_inputWidget); // for key presses
Client::bufferModel()->synchronizeView(view);
dock->setWidget(view);
- dock->show();
+ dock->setVisible(_layoutLoaded); // don't show before state has been restored
addDockWidget(Qt::LeftDockWidgetArea, dock);
_bufferViewsMenu->addAction(dock->toggleViewAction());
dock = qobject_cast<BufferViewDock *>(action->parent());
if(dock && actionData.toInt() == bufferViewConfigId) {
removeAction(action);
+ _bufferViews.removeAll(dock);
+ Client::bufferViewOverlay()->removeView(dock->bufferViewId());
dock->deleteLater();
}
}
Q_ASSERT(action);
BufferViewDock *dock = qobject_cast<BufferViewDock *>(action->parent());
Q_ASSERT(dock);
+
+ // Make sure we don't toggle backlog fetch for a view we've already removed
+ if(!_bufferViews.contains(dock))
+ return;
+
if(enabled) {
Client::bufferViewOverlay()->addView(dock->bufferViewId());
BufferViewConfig *config = dock->config();
dock->setObjectName("ChatMonitorDock");
ChatMonitorFilter *filter = new ChatMonitorFilter(Client::messageModel(), this);
- ChatMonitorView *chatView = new ChatMonitorView(filter, this);
- chatView->show();
- dock->setWidget(chatView);
+ _chatMonitorView = new ChatMonitorView(filter, this);
+ _chatMonitorView->setFocusProxy(_inputWidget);
+ _chatMonitorView->show();
+ dock->setWidget(_chatMonitorView);
dock->hide();
addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical);
_bufferWidget->setFocusProxy(_inputWidget);
_inputWidget->inputLine()->installEventFilter(_bufferWidget);
+
+ connect(_topicWidget, SIGNAL(switchedPlain()), _bufferWidget, SLOT(setFocus()));
}
void MainWin::setupTopicWidget() {
VerticalDock *dock = new VerticalDock(tr("Topic"), this);
dock->setObjectName("TopicDock");
- TopicWidget *topicwidget = new TopicWidget(dock);
+ _topicWidget = new TopicWidget(dock);
- dock->setWidget(topicwidget);
+ dock->setWidget(_topicWidget);
- topicwidget->setModel(Client::bufferModel());
- topicwidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
+ _topicWidget->setModel(Client::bufferModel());
+ _topicWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical);
void MainWin::setupStatusBar() {
// MessageProcessor progress
- statusBar()->addPermanentWidget(msgProcessorStatusWidget);
-
- // Core Lag:
- updateLagIndicator();
- statusBar()->addPermanentWidget(coreLagLabel);
- coreLagLabel->hide();
- connect(Client::signalProxy(), SIGNAL(lagUpdated(int)), this, SLOT(updateLagIndicator(int)));
+ statusBar()->addPermanentWidget(_msgProcessorStatusWidget);
- // SSL indicator
- sslLabel->setPixmap(QPixmap());
- statusBar()->addPermanentWidget(sslLabel);
- sslLabel->hide();
+ // Connection state
+ _coreConnectionStatusWidget->update();
+ statusBar()->addPermanentWidget(_coreConnectionStatusWidget);
QAction *showStatusbar = QtUi::actionCollection("General")->action("ToggleStatusBar");
connect(showStatusbar, SIGNAL(toggled(bool)), statusBar(), SLOT(setVisible(bool)));
connect(showStatusbar, SIGNAL(toggled(bool)), this, SLOT(saveStatusBarStatus(bool)));
+
+ connect(Client::coreConnection(), SIGNAL(connectionMsg(QString)), statusBar(), SLOT(showMessage(QString)));
+}
+
+void MainWin::setupHotList() {
+ FlatProxyModel *flatProxy = new FlatProxyModel(this);
+ flatProxy->setSourceModel(Client::bufferModel());
+ _bufferHotList = new BufferHotListFilter(flatProxy);
+}
+
+void MainWin::saveMenuBarStatus(bool enabled) {
+ QtUiSettings uiSettings;
+ uiSettings.setValue("ShowMenuBar", enabled);
}
void MainWin::saveStatusBarStatus(bool enabled) {
}
void MainWin::setupSystray() {
- _systemTray = new SystemTray(this);
+#ifndef QT_NO_SYSTEMTRAYICON
+ _systemTray = new LegacySystemTray(this);
+#else
+ _systemTray = new SystemTray(this); // dummy
+#endif
+ _systemTray->init();
}
void MainWin::setupToolBars() {
#ifdef Q_WS_MAC
setUnifiedTitleAndToolBarOnMac(true);
#endif
- _mainToolBar = addToolBar(tr("Main Toolbar"));
+
+#ifdef HAVE_KDE
+ _mainToolBar = new KToolBar("MainToolBar", this, Qt::TopToolBarArea, false, true, true);
+#else
+ _mainToolBar = new QToolBar(this);
_mainToolBar->setObjectName("MainToolBar");
+#endif
+ _mainToolBar->setWindowTitle(tr("Main Toolbar"));
+ addToolBar(_mainToolBar);
QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar);
_toolbarMenu->addAction(_mainToolBar->toggleViewAction());
-
- //_nickToolBar = addToolBar("User");
- //_nickToolBar->setObjectName("NickToolBar");
- //QtUi::toolBarActionProvider()->addActions(_nickToolBar, ToolBarActionProvider::NickToolBar);
-
-#ifdef HAVE_KDE
- _mainToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
- //_nickToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-#endif
}
void MainWin::connectedToCore() {
action->setVisible(!Client::internalCore());
}
- disconnect(Client::backlogManager(), SIGNAL(updateProgress(int, int)), msgProcessorStatusWidget, SLOT(setProgress(int, int)));
+ disconnect(Client::backlogManager(), SIGNAL(updateProgress(int, int)), _msgProcessorStatusWidget, SLOT(setProgress(int, int)));
disconnect(Client::backlogManager(), SIGNAL(messagesRequested(const QString &)), this, SLOT(showStatusBarMessage(const QString &)));
disconnect(Client::backlogManager(), SIGNAL(messagesProcessed(const QString &)), this, SLOT(showStatusBarMessage(const QString &)));
if(!Client::internalCore()) {
- connect(Client::backlogManager(), SIGNAL(updateProgress(int, int)), msgProcessorStatusWidget, SLOT(setProgress(int, int)));
+ connect(Client::backlogManager(), SIGNAL(updateProgress(int, int)), _msgProcessorStatusWidget, SLOT(setProgress(int, int)));
connect(Client::backlogManager(), SIGNAL(messagesRequested(const QString &)), this, SLOT(showStatusBarMessage(const QString &)));
connect(Client::backlogManager(), SIGNAL(messagesProcessed(const QString &)), this, SLOT(showStatusBarMessage(const QString &)));
}
else
statusBar()->clearMessage();
- if(Client::signalProxy()->isSecure()) {
- sslLabel->setPixmap(SmallIcon("security-high"));
- } else {
- sslLabel->setPixmap(SmallIcon("security-low"));
- }
-
- sslLabel->setVisible(!Client::internalCore());
- coreLagLabel->setVisible(!Client::internalCore());
+ _coreConnectionStatusWidget->setVisible(!Client::internalCore());
updateIcon();
+#ifndef QT_NO_SYSTEMTRAYICON
systemTray()->setState(SystemTray::Active);
+#endif
if(Client::networkIds().isEmpty()) {
IrcConnectionWizard *wizard = new IrcConnectionWizard(this, Qt::Sheet);
void MainWin::loadLayout() {
QtUiSettings s;
- int accountId = Client::currentCoreAccount().toInt();
- restoreState(s.value(QString("MainWinState-%1").arg(accountId)).toByteArray(), accountId);
+ int accountId = Client::currentCoreAccount().accountId().toInt();
+ QByteArray state = s.value(QString("MainWinState-%1").arg(accountId)).toByteArray();
+ if(state.isEmpty()) {
+ // Make sure that the default bufferview is shown
+ if(_bufferViews.count())
+ _bufferViews.at(0)->show();
+ return;
+ }
+
+ restoreState(state, accountId);
+ _layoutLoaded = true;
}
void MainWin::saveLayout() {
QtUiSettings s;
- int accountId = Client::currentCoreAccount().toInt();
+ int accountId = Client::currentCoreAccount().accountId().toInt();
if(accountId > 0) s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId));
}
-void MainWin::updateLagIndicator(int lag) {
- QString text = tr("Core Lag: %1");
- if(lag == -1)
- text = text.arg('-');
- else
- text = text.arg("%1 msec").arg(lag);
- coreLagLabel->setText(text);
-}
-
void MainWin::disconnectedFromCore() {
// save core specific layout and remove bufferviews;
saveLayout();
+ _layoutLoaded = false;
+
QVariant actionData;
BufferViewDock *dock;
foreach(QAction *action, _bufferViewsMenu->actions()) {
dock = qobject_cast<BufferViewDock *>(action->parent());
if(dock && actionData.toInt() != -1) {
removeAction(action);
+ _bufferViews.removeAll(dock);
+ Client::bufferViewOverlay()->removeView(dock->bufferViewId());
dock->deleteLater();
}
}
+
QtUiSettings s;
restoreState(s.value("MainWinState").toByteArray());
setDisconnectedState();
coll->action("CoreInfo")->setEnabled(false);
//_viewMenu->setEnabled(false);
statusBar()->showMessage(tr("Not connected to core."));
- sslLabel->setPixmap(QPixmap());
- sslLabel->hide();
- updateLagIndicator();
- coreLagLabel->hide();
- if(msgProcessorStatusWidget)
- msgProcessorStatusWidget->setProgress(0, 0);
+ if(_msgProcessorStatusWidget)
+ _msgProcessorStatusWidget->setProgress(0, 0);
updateIcon();
- systemTray()->setState(SystemTray::Inactive);
+ systemTray()->setState(SystemTray::Passive);
+}
+
+void MainWin::userAuthenticationRequired(CoreAccount *account, bool *valid, const QString &errorMessage) {
+ Q_UNUSED(errorMessage)
+ CoreConnectAuthDlg dlg(account, this);
+ *valid = (dlg.exec() == QDialog::Accepted);
+}
+
+void MainWin::handleNoSslInClient(bool *accepted) {
+ QMessageBox box(QMessageBox::Warning, tr("Unencrypted Connection"), tr("<b>Your client does not support SSL encryption</b>"),
+ QMessageBox::Ignore|QMessageBox::Cancel, this);
+ box.setInformativeText(tr("Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."));
+ box.setDefaultButton(QMessageBox::Ignore);
+ *accepted = box.exec() == QMessageBox::Ignore;
+}
+
+void MainWin::handleNoSslInCore(bool *accepted) {
+ QMessageBox box(QMessageBox::Warning, tr("Unencrypted Connection"), tr("<b>Your core does not support SSL encryption</b>"),
+ QMessageBox::Ignore|QMessageBox::Cancel, this);
+ box.setInformativeText(tr("Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."));
+ box.setDefaultButton(QMessageBox::Ignore);
+ *accepted = box.exec() == QMessageBox::Ignore;
+
+}
+
+#ifdef HAVE_SSL
+
+void MainWin::handleSslErrors(const QSslSocket *socket, bool *accepted, bool *permanently) {
+ QString errorString = "<ul>";
+ foreach(const QSslError error, socket->sslErrors())
+ errorString += QString("<li>%1</li>").arg(error.errorString());
+ errorString += "</ul>";
+
+ QMessageBox box(QMessageBox::Warning,
+ tr("Untrusted Security Certificate"),
+ tr("<b>The SSL certificate provided by the core at %1 is untrusted for the following reasons:</b>").arg(socket->peerName()),
+ QMessageBox::Cancel, this);
+ box.setInformativeText(errorString);
+ box.addButton(tr("Continue"), QMessageBox::AcceptRole);
+ box.setDefaultButton(box.addButton(tr("Show Certificate"), QMessageBox::HelpRole));
+
+ QMessageBox::ButtonRole role;
+ do {
+ box.exec();
+ role = box.buttonRole(box.clickedButton());
+ if(role == QMessageBox::HelpRole) {
+ SslInfoDlg dlg(socket, this);
+ dlg.exec();
+ }
+ } while(role == QMessageBox::HelpRole);
+
+ *accepted = role == QMessageBox::AcceptRole;
+ if(*accepted) {
+ QMessageBox box2(QMessageBox::Warning,
+ tr("Untrusted Security Certificate"),
+ tr("Would you like to accept this certificate forever without being prompted?"),
+ 0, this);
+ box2.setDefaultButton(box2.addButton(tr("Current Session Only"), QMessageBox::NoRole));
+ box2.addButton(tr("Forever"), QMessageBox::YesRole);
+ box2.exec();
+ *permanently = box2.buttonRole(box2.clickedButton()) == QMessageBox::YesRole;
+ }
}
-void MainWin::startInternalCore() {
- ClientSyncer *syncer = new ClientSyncer();
- Client::registerClientSyncer(syncer);
- connect(syncer, SIGNAL(syncFinished()), syncer, SLOT(deleteLater()), Qt::QueuedConnection);
- syncer->useInternalCore();
+#endif /* HAVE_SSL */
+
+void MainWin::handleCoreConnectionError(const QString &error) {
+ QMessageBox::critical(this, tr("Core Connection Error"), error, QMessageBox::Ok);
}
-void MainWin::showCoreConnectionDlg(bool autoConnect) {
- CoreConnectDlg(autoConnect, this).exec();
+void MainWin::showCoreConnectionDlg() {
+ CoreConnectDlg dlg(this);
+ if(dlg.exec() == QDialog::Accepted) {
+ AccountId accId = dlg.selectedAccount();
+ if(accId.isValid())
+ Client::coreConnection()->connectToCore(accId);
+ }
+}
+
+void MainWin::showCoreConfigWizard(const QVariantList &backends) {
+ CoreConfigWizard *wizard = new CoreConfigWizard(Client::coreConnection(), backends, this);
+
+ wizard->show();
}
void MainWin::showChannelList(NetworkId netId) {
channelListDlg->show();
}
+void MainWin::showIgnoreList(QString newRule) {
+ SettingsPageDlg dlg(new IgnoreListSettingsPage(this), this);
+ // prepare config dialog for new rule
+ if(!newRule.isEmpty())
+ qobject_cast<IgnoreListSettingsPage *>(dlg.currentPage())->editIgnoreRule(newRule);
+ dlg.exec();
+}
+
void MainWin::showCoreInfoDlg() {
CoreInfoDlg(this).exec();
}
void MainWin::showSettingsDlg() {
SettingsDlg *dlg = new SettingsDlg();
- //Category: Appearance
- dlg->registerSettingsPage(new AppearanceSettingsPage(dlg)); //General
- dlg->registerSettingsPage(new ColorSettingsPage(dlg));
+ //Category: Interface
+ dlg->registerSettingsPage(new AppearanceSettingsPage(dlg));
+ dlg->registerSettingsPage(new ChatViewSettingsPage(dlg));
+ dlg->registerSettingsPage(new ChatMonitorSettingsPage(dlg));
+ dlg->registerSettingsPage(new ItemViewSettingsPage(dlg));
+ dlg->registerSettingsPage(new BufferViewSettingsPage(dlg));
+ dlg->registerSettingsPage(new InputWidgetSettingsPage(dlg));
+ dlg->registerSettingsPage(new TopicWidgetSettingsPage(dlg));
dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
- dlg->registerSettingsPage(new BufferViewSettingsPage(dlg));
- dlg->registerSettingsPage(new ChatMonitorSettingsPage(dlg));
- //Category: Misc
- dlg->registerSettingsPage(new GeneralSettingsPage(dlg));
+ //Category: IRC
+ dlg->registerSettingsPage(new ConnectionSettingsPage(dlg));
dlg->registerSettingsPage(new IdentitiesSettingsPage(dlg));
dlg->registerSettingsPage(new NetworksSettingsPage(dlg));
dlg->registerSettingsPage(new AliasesSettingsPage(dlg));
+ dlg->registerSettingsPage(new IgnoreListSettingsPage(dlg));
+
+ // Category: Remote Cores
+ if(Quassel::runMode() != Quassel::Monolithic) {
+ dlg->registerSettingsPage(new CoreAccountSettingsPage(dlg));
+ dlg->registerSettingsPage(new CoreConnectionSettingsPage(dlg));
+ }
dlg->show();
}
/********************************************************************************************************/
bool MainWin::event(QEvent *event) {
- if(event->type() == QEvent::WindowActivate)
- QtUi::closeNotifications();
+ if(event->type() == QEvent::WindowActivate) {
+ BufferId buffer = Client::bufferModel()->currentBuffer();
+ if(buffer.isValid())
+ QtUi::closeNotifications(buffer);
+ }
return QMainWindow::event(event);
}
if(!(windowState() & Qt::WindowMaximized))
_normalPos = event->pos();
- event->ignore();
+ QMainWindow::moveEvent(event);
}
void MainWin::resizeEvent(QResizeEvent *event) {
if(!(windowState() & Qt::WindowMaximized))
_normalSize = event->size();
- event->ignore();
+ QMainWindow::resizeEvent(event);
}
void MainWin::closeEvent(QCloseEvent *event) {
+#ifndef QT_NO_SYSTEMTRAYICON
QtUiSettings s;
QtUiApplication* app = qobject_cast<QtUiApplication*> qApp;
Q_ASSERT(app);
- if(!app->aboutToQuit() && s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
- toggleMinimizedToTray();
+ if(!app->isAboutToQuit() && s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
+ hideToTray();
event->ignore();
} else {
event->accept();
- QApplication::quit();
+ quit();
}
+#else
+ event->accept();
+ quit();
+#endif
}
void MainWin::changeEvent(QEvent *event) {
- if(event->type() == QEvent::WindowStateChange) {
- if(windowState() & Qt::WindowMinimized) {
- QtUiSettings s;
- if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) {
- hideToTray();
- event->accept();
- return;
- }
- }
- }
-
#ifdef Q_WS_WIN
- else if(event->type() == QEvent::ActivationChange)
+ if(event->type() == QEvent::ActivationChange)
dwTickCount = GetTickCount(); // needed for toggleMinimizedToTray()
#endif
- event->ignore();
+ QMainWindow::changeEvent(event);
}
void MainWin::hideToTray() {
return;
}
hide();
- systemTray()->setIconVisible();
- _isHidden = true;
+ systemTray()->setVisible();
}
void MainWin::toggleMinimizedToTray() {
}
void MainWin::forceActivated() {
+#ifdef HAVE_KDE
+ show();
+ KWindowSystem::forceActiveWindow(winId());
+#else
+
#ifdef Q_WS_X11
// Bypass focus stealing prevention
QX11Info::setAppUserTime(QX11Info::appTime());
setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
}
- move(frameGeometry().topLeft()); // avoid placement policies
+ // this does not actually work on all platforms... and causes more evil than good
+ // move(frameGeometry().topLeft()); // avoid placement policies
show();
raise();
activateWindow();
- _isHidden = false;
+#endif /* HAVE_KDE */
}
void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) {
Message::Flags flags = (Message::Flags)idx.data(ChatLineModel::FlagsRole).toInt();
if(flags.testFlag(Message::Backlog) || flags.testFlag(Message::Self))
continue;
- flags |= Message::Backlog; // we only want to trigger a highlight once!
- Client::messageModel()->setData(idx, (int)flags, ChatLineModel::FlagsRole);
BufferId bufId = idx.data(ChatLineModel::BufferIdRole).value<BufferId>();
BufferInfo::Type bufType = Client::networkModel()->bufferType(bufId);
- if(hasFocus && bufId == _bufferWidget->currentBuffer())
+ if(hasFocus && bufId == Client::bufferModel()->currentBuffer())
continue;
- if(flags & Message::Highlight || bufType == BufferInfo::QueryBuffer) {
+ if((flags & Message::Highlight || bufType == BufferInfo::QueryBuffer)
+ && !(Client::ignoreListManager() && Client::ignoreListManager()->match(idx.data(MessageModel::MessageRole).value<Message>(),
+ Client::networkModel()->networkName(bufId))))
+ {
QModelIndex senderIdx = Client::messageModel()->index(i, ChatLineModel::SenderColumn);
QString sender = senderIdx.data(ChatLineModel::EditRole).toString();
QString contents = idx.data(ChatLineModel::DisplayRole).toString();
}
}
+void MainWin::currentBufferChanged(BufferId buffer) {
+ if(buffer.isValid())
+ QtUi::closeNotifications(buffer);
+}
+
void MainWin::clientNetworkCreated(NetworkId id) {
const Network *net = Client::network(id);
QAction *act = new QAction(net->networkName(), this);
else net->requestDisconnect();
}
+void MainWin::on_jumpHotBuffer_triggered() {
+ if(!_bufferHotList->rowCount())
+ return;
+
+ QModelIndex topIndex = _bufferHotList->index(0, 0);
+ BufferId bufferId = _bufferHotList->data(topIndex, NetworkModel::BufferIdRole).value<BufferId>();
+ Client::bufferModel()->switchToBuffer(bufferId);
+}
+
void MainWin::on_actionDebugNetworkModel_triggered() {
QTreeView *view = new QTreeView;
view->setAttribute(Qt::WA_DeleteOnClose);
view->show();
}
+void MainWin::on_actionDebugHotList_triggered() {
+ QTreeView *view = new QTreeView;
+ view->setAttribute(Qt::WA_DeleteOnClose);
+ view->setModel(_bufferHotList);
+ view->show();
+}
+
void MainWin::on_actionDebugBufferViewOverlay_triggered() {
DebugBufferViewOverlay *overlay = new DebugBufferViewOverlay(0);
overlay->setAttribute(Qt::WA_DeleteOnClose);
logWidget->show();
}
-// FIXME
-void MainWin::saveStateToSession(const QString &sessionId) {
- return;
- SessionSettings s(sessionId);
-
- s.setValue("MainWinSize", size());
- s.setValue("MainWinPos", pos());
- s.setValue("MainWinState", saveState());
-}
-
-// FIXME
-void MainWin::saveStateToSessionSettings(SessionSettings & s)
-{
- s.setValue("MainWinSize", size());
- s.setValue("MainWinPos", pos());
- s.setValue("MainWinState", saveState());
-}
-
void MainWin::showStatusBarMessage(const QString &message) {
statusBar()->showMessage(message, 10000);
}
projects / quassel.git / blobdiff