#include "clientbufferviewconfig.h"
#include "clientbufferviewmanager.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 "irclistmodel.h"
#include "ircconnectionwizard.h"
#include "jumpkeyhandler.h"
+#include "legacysystemtray.h"
#include "msgprocessorstatuswidget.h"
#include "nicklistwidget.h"
#include "qtuiapplication.h"
#include "qtuistyle.h"
#include "settingsdlg.h"
#include "settingspagedlg.h"
-#include "systemtray.h"
+#include "statusnotifieritem.h"
#include "toolbaractionprovider.h"
#include "topicwidget.h"
#include "verticaldock.h"
#ifndef HAVE_KDE
-# ifdef HAVE_DBUS
-# include "desktopnotificationbackend.h"
-# endif
# ifdef HAVE_PHONON
# include "phononnotificationbackend.h"
# endif
# include "knotificationbackend.h"
#endif /* HAVE_KDE */
+#ifdef HAVE_SSL
+# include "sslinfodlg.h"
+#endif
+
#ifdef HAVE_INDICATEQT
#include "indicatornotificationbackend.h"
#endif
#include "settingspages/chatviewsettingspage.h"
#include "settingspages/connectionsettingspage.h"
#include "settingspages/coreaccountsettingspage.h"
-#include "settingspages/generalsettingspage.h"
+#include "settingspages/coreconnectionsettingspage.h"
#include "settingspages/highlightsettingspage.h"
#include "settingspages/identitiessettingspage.h"
#include "settingspages/ignorelistsettingspage.h"
#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),
_layoutLoaded(false)
{
-#ifdef Q_WS_WIN
- dwTickCount = 0;
-#endif
+ setAttribute(Qt::WA_DeleteOnClose, false); // we delete the mainwin manually
QtUiSettings uiSettings;
QString style = uiSettings.value("Style", QString()).toString();
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);
setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
setupBufferWidget();
setupMenus();
setupTopicWidget();
- setupChatMonitor();
setupNickWidget();
setupInputWidget();
+ setupChatMonitor();
setupStatusBar();
setupToolBars();
setupSystray();
setupHotList();
#ifndef HAVE_KDE
- QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this));
- QtUi::registerNotificationBackend(new SystrayNotificationBackend(this));
# ifdef HAVE_PHONON
QtUi::registerNotificationBackend(new PhononNotificationBackend(this));
# endif
-# ifdef HAVE_DBUS
- QtUi::registerNotificationBackend(new DesktopNotificationBackend(this));
+# ifndef QT_NO_SYSTEMTRAYICON
+ QtUi::registerNotificationBackend(new SystrayNotificationBackend(this));
# endif
+ QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this));
+
#else /* HAVE_KDE */
QtUi::registerNotificationBackend(new KNotificationBackend(this));
#endif /* HAVE_KDE */
// 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();
}
- Client::coreConnection()->start();
}
MainWin::~MainWin() {
move(_normalPos);
#endif
- if(s.value("MainWinHidden").toBool())
- hideToTray();
+ if(s.value("MainWinHidden").toBool() && QtUi::haveSystemTray())
+ QtUi::hideMainWidget();
else if(s.value("MainWinMinimized").toBool())
showMinimized();
else if(maximized)
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");
}
void MainWin::setupSystray() {
- _systemTray = new SystemTray(this);
+#ifdef HAVE_DBUS
+ _systemTray = new StatusNotifierItem(this);
+#elif !defined QT_NO_SYSTEMTRAYICON
+ _systemTray = new LegacySystemTray(this);
+#else
+ _systemTray = new SystemTray(this); // dummy
+#endif
+ _systemTray->init();
}
void MainWin::setupToolBars() {
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();
systemTray()->setState(SystemTray::Active);
void MainWin::saveLayout() {
QtUiSettings s;
- 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);
+ int accountId = _bufferViews.count()? Client::currentCoreAccount().accountId().toInt() : 0; // only save if we still have a layout!
+ if(accountId > 0)
+ s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId));
}
void MainWin::disconnectedFromCore() {
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);
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;
+ }
+}
+
+#endif /* HAVE_SSL */
+
+void MainWin::handleCoreConnectionError(const QString &error) {
+ QMessageBox::critical(this, tr("Core Connection Error"), error, QMessageBox::Ok);
}
-void MainWin::startInternalCore() {
+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) {
//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();
QtUiSettings s;
QtUiApplication* app = qobject_cast<QtUiApplication*> qApp;
Q_ASSERT(app);
- if(!app->isAboutToQuit() && s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
- hideToTray();
+ if(!app->isAboutToQuit() && QtUi::haveSystemTray() && s.value("MinimizeOnClose").toBool()) {
+ QtUi::hideMainWidget();
event->ignore();
} else {
event->accept();
}
}
-void MainWin::changeEvent(QEvent *event) {
-#ifdef Q_WS_WIN
- if(event->type() == QEvent::ActivationChange)
- dwTickCount = GetTickCount(); // needed for toggleMinimizedToTray()
-#endif
-
- QMainWindow::changeEvent(event);
-}
-
-void MainWin::hideToTray() {
- if(!systemTray()->isSystemTrayAvailable()) {
- qWarning() << Q_FUNC_INFO << "was called with no SystemTray available!";
- return;
- }
- hide();
- systemTray()->setIconVisible();
-}
-
-void MainWin::toggleMinimizedToTray() {
-#ifdef Q_WS_WIN
- // the problem is that we lose focus when the systray icon is activated
- // and we don't know the former active window
- // therefore we watch for activation event and use our stopwatch :)
- // courtesy: KSystemTrayIcon
- if(GetTickCount() - dwTickCount >= 300)
- // we weren't active in the last 300ms -> activate
- forceActivated();
- else
- hideToTray();
-
-#else
-
- if(!isVisible() || isMinimized())
- // restore
- forceActivated();
- else
- hideToTray();
-
-#endif
-}
-
-void MainWin::forceActivated() {
-#ifdef HAVE_KDE
- show();
- KWindowSystem::forceActiveWindow(winId());
-#else
-
-#ifdef Q_WS_X11
- // Bypass focus stealing prevention
- QX11Info::setAppUserTime(QX11Info::appTime());
-#endif
-
- if(windowState() & Qt::WindowMinimized) {
- // restore
- setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
- }
-
- // this does not actually work on all platforms... and causes more evil than good
- // move(frameGeometry().topLeft()); // avoid placement policies
- show();
- raise();
- activateWindow();
-#endif /* HAVE_KDE */
-}
-
void MainWin::messagesInserted(const QModelIndex &parent, int start, int end) {
Q_UNUSED(parent);
projects / quassel.git / blobdiff