#include <QToolBar>
#include <QInputDialog>
-#ifdef HAVE_KDE4
-# include <KHelpMenu>
-# include <KMenuBar>
-# include <KShortcutsDialog>
-# include <KStatusBar>
-# include <KToggleFullScreenAction>
-# include <KToolBar>
-#endif
-
#ifdef HAVE_KF5
# include <KConfigWidgets/KStandardAction>
# include <KXmlGui/KHelpMenu>
#include "coreinfodlg.h"
#include "contextmenuactionprovider.h"
#include "debugbufferviewoverlay.h"
-#include "debuglogwidget.h"
+#include "debuglogdlg.h"
#include "debugmessagemodelfilter.h"
#include "flatproxymodel.h"
#include "icon.h"
#include "qtuisettings.h"
#include "qtuistyle.h"
#include "receivefiledlg.h"
+#include "resourcetreedlg.h"
#include "settingsdlg.h"
#include "settingspagedlg.h"
#include "statusnotifieritem.h"
# ifdef HAVE_QTMULTIMEDIA
# include "qtmultimedianotificationbackend.h"
# endif
-# ifdef HAVE_PHONON
-# include "phononnotificationbackend.h"
-# endif
# include "systraynotificationbackend.h"
# include "taskbarnotificationbackend.h"
#else /* HAVE_KDE */
# include "sslinfodlg.h"
#endif
-#ifdef HAVE_INDICATEQT
- #include "indicatornotificationbackend.h"
-#endif
-
#ifdef HAVE_NOTIFICATION_CENTER
#include "osxnotificationbackend.h"
#endif
#endif
_msgProcessorStatusWidget(new MsgProcessorStatusWidget(this)),
_coreConnectionStatusWidget(new CoreConnectionStatusWidget(Client::coreConnection(), this)),
- _titleSetter(this),
- _awayLog(0),
- _layoutLoaded(false),
- _activeBufferViewIndex(-1),
- _aboutToQuit(false)
+ _titleSetter(this)
{
setAttribute(Qt::WA_DeleteOnClose, false); // we delete the mainwin manually
void MainWin::init()
{
- 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(Client::instance(), &Client::networkCreated, this, &MainWin::clientNetworkCreated);
+ connect(Client::instance(), &Client::networkRemoved, this, &MainWin::clientNetworkRemoved);
+ connect(Client::messageModel(), &QAbstractItemModel::rowsInserted,
+ this, &MainWin::messagesInserted);
connect(GraphicalUi::contextMenuActionProvider(),
- SIGNAL(showChannelList(NetworkId,QString,bool)),
- SLOT(showChannelList(NetworkId,QString,bool)));
+ &NetworkModelController::showChannelList,
+ this, &MainWin::showChannelList);
connect(Client::instance(),
- SIGNAL(showChannelList(NetworkId,QString,bool)),
- SLOT(showChannelList(NetworkId,QString,bool)));
- connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showNetworkConfig(NetworkId)), SLOT(showNetworkConfig(NetworkId)));
- connect(GraphicalUi::contextMenuActionProvider(), SIGNAL(showIgnoreList(QString)), SLOT(showIgnoreList(QString)));
- connect(Client::instance(), SIGNAL(showIgnoreList(QString)), SLOT(showIgnoreList(QString)));
- connect(Client::instance(), SIGNAL(dbUpgradeInProgress(bool)), SLOT(showMigrationWarning(bool)));
- connect(Client::instance(), SIGNAL(exitRequested(QString)), SLOT(onExitRequested(QString)));
-
- connect(Client::coreConnection(), SIGNAL(startCoreSetup(QVariantList, QVariantList)), SLOT(showCoreConfigWizard(QVariantList, 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 *)));
+ &Client::showChannelList,
+ this, &MainWin::showChannelList);
+ connect(GraphicalUi::contextMenuActionProvider(), &NetworkModelController::showNetworkConfig, this, &MainWin::showNetworkConfig);
+ connect(GraphicalUi::contextMenuActionProvider(), &NetworkModelController::showIgnoreList, this, &MainWin::showIgnoreList);
+ connect(Client::instance(), &Client::showIgnoreList, this, &MainWin::showIgnoreList);
+ connect(Client::instance(), &Client::dbUpgradeInProgress, this, &MainWin::showMigrationWarning);
+ connect(Client::instance(), &Client::exitRequested, this, &MainWin::onExitRequested);
+
+ connect(Client::coreConnection(), &CoreConnection::startCoreSetup, this, &MainWin::showCoreConfigWizard);
+ connect(Client::coreConnection(), &CoreConnection::connectionErrorPopup, this, &MainWin::handleCoreConnectionError);
+ connect(Client::coreConnection(), &CoreConnection::userAuthenticationRequired, this, &MainWin::userAuthenticationRequired);
+ connect(Client::coreConnection(), &CoreConnection::handleNoSslInClient, this, &MainWin::handleNoSslInClient);
+ connect(Client::coreConnection(), &CoreConnection::handleNoSslInCore, this, &MainWin::handleNoSslInCore);
#ifdef HAVE_SSL
- connect(Client::coreConnection(), SIGNAL(handleSslErrors(const QSslSocket *, bool *, bool *)), SLOT(handleSslErrors(const QSslSocket *, bool *, bool *)));
+ connect(Client::coreConnection(), &CoreConnection::handleSslErrors, this, &MainWin::handleSslErrors);
#endif
// Setup Dock Areas
#ifndef HAVE_KDE
# ifdef HAVE_QTMULTIMEDIA
QtUi::registerNotificationBackend(new QtMultimediaNotificationBackend(this));
-# endif
-# ifdef HAVE_PHONON
- QtUi::registerNotificationBackend(new PhononNotificationBackend(this));
# endif
QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this));
#else /* HAVE_KDE */
QtUi::registerNotificationBackend(new SystrayNotificationBackend(this));
#endif
-#ifdef HAVE_INDICATEQT
- QtUi::registerNotificationBackend(new IndicatorNotificationBackend(this));
-#endif
-
#ifdef HAVE_NOTIFICATION_CENTER
QtUi::registerNotificationBackend(new OSXNotificationBackend(this));
#endif
// we assume that at this point, all configurable actions are defined!
QtUi::loadShortcuts();
- connect(bufferWidget(), SIGNAL(currentChanged(BufferId)), SLOT(currentBufferChanged(BufferId)));
+ connect(bufferWidget(), selectOverload<BufferId>(&AbstractBufferContainer::currentChanged), this, &MainWin::currentBufferChanged);
setDisconnectedState(); // Disable menus and stuff
// restore locked state of docks
QtUi::actionCollection("General")->action("LockLayout")->setChecked(s.value("LockLayout", false).toBool());
- QTimer::singleShot(0, this, SLOT(doAutoConnect()));
-}
-
-
-MainWin::~MainWin()
-{
-}
-
+ Quassel::registerQuitHandler([this]() {
+ QtUiSettings s;
+ saveStateToSettings(s);
+ saveLayout();
+ // Close all open dialogs and the MainWin, so we can safely kill the Client instance afterwards
+ // Note: This does not quit the application, as quitOnLastWindowClosed is set to false.
+ // We rely on another quit handler to be registered that actually quits the application.
+ qApp->closeAllWindows();
+ });
-void MainWin::quit()
-{
- QtUiSettings s;
- saveStateToSettings(s);
- saveLayout();
- QApplication::quit();
+ QTimer::singleShot(0, this, &MainWin::doAutoConnect);
}
//
// See https://doc.qt.io/qt-5/qkeysequence.html
coll->addAction("Quit", new Action(icon::get("application-exit"), tr("&Quit"), coll,
- this, SLOT(quit()), Qt::CTRL + Qt::Key_Q));
+ Quassel::instance(), SLOT(quit()), Qt::CTRL + Qt::Key_Q));
// View
coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Chat Lists..."), coll,
QAction *lockAct = coll->addAction("LockLayout", new Action(tr("&Lock Layout"), coll));
lockAct->setCheckable(true);
- connect(lockAct, SIGNAL(toggled(bool)), SLOT(on_actionLockLayout_toggled(bool)));
+ connect(lockAct, &QAction::toggled, this, &MainWin::on_actionLockLayout_toggled);
coll->addAction("ToggleSearchBar", new Action(icon::get("edit-find"), tr("Show &Search Bar"), coll,
- 0, 0, QKeySequence::Find))->setCheckable(true);
+ nullptr, nullptr, QKeySequence::Find))->setCheckable(true);
coll->addAction("ShowAwayLog", new Action(tr("Show Away Log"), coll,
this, SLOT(showAwayLog())));
coll->addAction("ToggleMenuBar", new Action(icon::get("show-menu"), tr("Show &Menubar"), coll,
- 0, 0))->setCheckable(true);
+ nullptr, nullptr))->setCheckable(true);
coll->addAction("ToggleStatusBar", new Action(tr("Show Status &Bar"), coll,
- 0, 0))->setCheckable(true);
+ nullptr, nullptr))->setCheckable(true);
#ifdef HAVE_KDE
_fullScreenAction = KStandardAction::fullScreen(this, SLOT(onFullScreenToggled()), this, coll);
this, SLOT(on_actionDebugHotList_triggered())));
coll->addAction("DebugLog", new Action(icon::get("tools-report-bug"), tr("Debug &Log"), coll,
this, SLOT(on_actionDebugLog_triggered())));
+ coll->addAction("ShowResourceTree", new Action(icon::get("tools-report-bug"), tr("Show &Resource Tree"), coll,
+ this, SLOT(on_actionShowResourceTree_triggered())));
coll->addAction("ReloadStyle", new Action(icon::get("view-refresh"), tr("Reload Stylesheet"), coll,
QtUi::style(), SLOT(reload()), QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_R)));
_helpDebugMenu->addAction(coll->action("DebugMessageModel"));
_helpDebugMenu->addAction(coll->action("DebugHotList"));
_helpDebugMenu->addAction(coll->action("DebugLog"));
+ _helpDebugMenu->addAction(coll->action("ShowResourceTree"));
_helpDebugMenu->addSeparator();
_helpDebugMenu->addAction(coll->action("ReloadStyle"));
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)));
+ connect(showMenuBar, &QAction::toggled, menuBar(), &QMenuBar::setVisible);
+ connect(showMenuBar, &QAction::toggled, this, &MainWin::saveMenuBarStatus);
}
return;
config->setLocked(QtUiSettings().value("LockLayout", false).toBool());
- BufferViewDock *dock = new BufferViewDock(config, this);
+ auto *dock = new BufferViewDock(config, this);
//create the view and initialize it's filter
- BufferView *view = new BufferView(dock);
+ auto *view = new BufferView(dock);
view->setFilteredModel(Client::bufferModel(), config);
view->installEventFilter(_inputWidget); // for key presses
addDockWidget(Qt::LeftDockWidgetArea, dock);
_bufferViewsMenu->addAction(dock->toggleViewAction());
- connect(dock->toggleViewAction(), SIGNAL(toggled(bool)), this, SLOT(bufferViewToggled(bool)));
- connect(dock, SIGNAL(visibilityChanged(bool)), SLOT(bufferViewVisibilityChanged(bool)));
+ connect(dock->toggleViewAction(), &QAction::toggled, this, &MainWin::bufferViewToggled);
+ connect(dock, &QDockWidget::visibilityChanged, this, &MainWin::bufferViewVisibilityChanged);
_bufferViews.append(dock);
if (!activeBufferView())
// since this isn't our fault and we can't do anything about it, we suppress the resulting calls
return;
}
- QAction *action = qobject_cast<QAction *>(sender());
+ auto *action = qobject_cast<QAction *>(sender());
Q_ASSERT(action);
- BufferViewDock *dock = qobject_cast<BufferViewDock *>(action->parent());
+ auto *dock = qobject_cast<BufferViewDock *>(action->parent());
Q_ASSERT(dock);
// Make sure we don't toggle backlog fetch for a view we've already removed
void MainWin::bufferViewVisibilityChanged(bool visible)
{
Q_UNUSED(visible);
- BufferViewDock *dock = qobject_cast<BufferViewDock *>(sender());
+ auto *dock = qobject_cast<BufferViewDock *>(sender());
Q_ASSERT(dock);
if ((!dock->isHidden() && !activeBufferView()) || (dock->isHidden() && dock->isActive()))
nextBufferView();
// "All Buffers" is always the first dock created
if (_bufferViews.count() > 0)
return _bufferViews[0]->bufferView();
- return 0;
+ return nullptr;
}
BufferView *MainWin::activeBufferView() const
{
if (_activeBufferViewIndex < 0 || _activeBufferViewIndex >= _bufferViews.count())
- return 0;
+ return nullptr;
BufferViewDock *dock = _bufferViews.at(_activeBufferViewIndex);
- return dock->isActive() ? dock->bufferView() : 0;
+ return dock->isActive() ? dock->bufferView() : nullptr;
}
void MainWin::showPasswordChangeDlg()
{
if(Client::isCoreFeatureEnabled(Quassel::Feature::PasswordChange)) {
- auto dlg = new PasswordChangeDlg(this);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- dlg->exec();
+ PasswordChangeDlg{}.exec();
}
else {
- auto box = new QMessageBox(QMessageBox::Warning, tr("Feature Not Supported"),
- tr("<b>Your Quassel Core does not support this feature</b>"),
- QMessageBox::Ok, this);
- box->setInformativeText(tr("You need a Quassel Core v0.12.0 or newer in order to be able to remotely change your password."));
- box->setAttribute(Qt::WA_DeleteOnClose);
- box->exec();
+ QMessageBox box(QMessageBox::Warning, tr("Feature Not Supported"),
+ tr("<b>Your Quassel Core does not support this feature</b>"),
+ QMessageBox::Ok);
+ box.setInformativeText(tr("You need a Quassel Core v0.12.0 or newer in order to be able to remotely change your password."));
+ box.exec();
}
}
void MainWin::onExitRequested(const QString &reason)
{
if (!reason.isEmpty()) {
- auto box = new QMessageBox(QMessageBox::Critical,
- tr("Fatal error"),
- "<b>" + tr("Quassel encountered a fatal error and is terminated.") + "</b>",
- QMessageBox::Ok, this);
- box->setInformativeText("<p>" + tr("Reason:<em>") + " " + reason + "</em>");
- box->setAttribute(Qt::WA_DeleteOnClose);
- box->exec();
+ QMessageBox box(QMessageBox::Critical,
+ tr("Fatal error"),
+ "<b>" + tr("Quassel encountered a fatal error and is terminated.") + "</b>",
+ QMessageBox::Ok);
+ box.setInformativeText("<p>" + tr("Reason:<em>") + " " + reason + "</em>");
+ box.exec();
}
}
void MainWin::showNotificationsDlg()
{
- auto dlg = new SettingsPageDlg(new NotificationsSettingsPage(this), this);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- dlg->exec();
+ SettingsPageDlg{new NotificationsSettingsPage{}}.exec();
}
void MainWin::on_actionConfigureNetworks_triggered()
{
- auto dlg = new SettingsPageDlg(new NetworksSettingsPage(this), this);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- dlg->exec();
+ SettingsPageDlg{new NetworksSettingsPage{}}.exec();
}
void MainWin::on_actionConfigureViews_triggered()
{
- auto dlg = new SettingsPageDlg(new BufferViewSettingsPage(this), this);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- dlg->exec();
+ SettingsPageDlg{new BufferViewSettingsPage{}}.exec();
}
nickDock->toggleViewAction()->setText(tr("Show Nick List"));
// See NickListDock::NickListDock();
- // connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool)));
+ // connect(nickDock->toggleViewAction(), &NickListDock::triggered, nickListWidget, &QWidget::showWidget);
// attach the NickListWidget to the BufferModel and the default selection
_nickListWidget->setModel(Client::bufferModel());
VerticalDock *dock = new VerticalDock(tr("Chat Monitor"), this);
dock->setObjectName("ChatMonitorDock");
- ChatMonitorFilter *filter = new ChatMonitorFilter(Client::messageModel(), this);
+ auto *filter = new ChatMonitorFilter(Client::messageModel(), this);
_chatMonitorView = new ChatMonitorView(filter, this);
_chatMonitorView->show();
dock->setWidget(_chatMonitorView);
_inputWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
_inputWidget->inputLine()->installEventFilter(_bufferWidget);
-
- connect(_topicWidget, SIGNAL(switchedPlain()), _bufferWidget, SLOT(setFocus()));
}
_topicWidget->setModel(Client::bufferModel());
_topicWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
+ connect(_topicWidget, &TopicWidget::switchedPlain, _bufferWidget, selectOverload<>(&QWidget::setFocus));
+
addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical);
_viewMenu->addAction(dock->toggleViewAction());
showStatusbar->setChecked(enabled);
enabled ? statusBar()->show() : statusBar()->hide();
- connect(showStatusbar, SIGNAL(toggled(bool)), statusBar(), SLOT(setVisible(bool)));
- connect(showStatusbar, SIGNAL(toggled(bool)), this, SLOT(saveStatusBarStatus(bool)));
+ connect(showStatusbar, &QAction::toggled, statusBar(), &QWidget::setVisible);
+ connect(showStatusbar, &QAction::toggled, this, &MainWin::saveStatusBarStatus);
- connect(Client::coreConnection(), SIGNAL(connectionMsg(QString)), statusBar(), SLOT(showMessage(QString)));
+ connect(Client::coreConnection(), &CoreConnection::connectionMsg, statusBar(), [statusBar = statusBar()](auto &&message) {
+ statusBar->showMessage(message);
+ });
}
void MainWin::setupHotList()
{
- FlatProxyModel *flatProxy = new FlatProxyModel(this);
+ auto *flatProxy = new FlatProxyModel(this);
flatProxy->setSourceModel(Client::bufferModel());
_bufferHotList = new BufferHotListFilter(flatProxy);
}
void MainWin::setupToolBars()
{
- connect(_bufferWidget, SIGNAL(currentChanged(QModelIndex)),
- QtUi::toolBarActionProvider(), SLOT(currentBufferChanged(QModelIndex)));
- connect(_nickListWidget, SIGNAL(nickSelectionChanged(QModelIndexList)),
- QtUi::toolBarActionProvider(), SLOT(nickSelectionChanged(QModelIndexList)));
+ connect(_bufferWidget, selectOverload<const QModelIndex&>(&AbstractBufferContainer::currentChanged),
+ QtUi::toolBarActionProvider(), &ToolBarActionProvider::onCurrentBufferChanged);
+ connect(_nickListWidget, &NickListWidget::nickSelectionChanged,
+ QtUi::toolBarActionProvider(), &ToolBarActionProvider::onNickSelectionChanged);
#ifdef Q_OS_MAC
setUnifiedTitleAndToolBarOnMac(true);
bool visible = uiSettings.value("ShowMainToolBar", QVariant(true)).toBool();
_mainToolBar->setVisible(visible);
- connect(_mainToolBar, SIGNAL(visibilityChanged(bool)), this, SLOT(saveMainToolBarStatus(bool)));
+ connect(_mainToolBar, &QToolBar::visibilityChanged, this, &MainWin::saveMainToolBarStatus);
#endif
}
void MainWin::connectedToCore()
{
Q_CHECK_PTR(Client::bufferViewManager());
- connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigAdded(int)), this, SLOT(addBufferView(int)));
- connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigDeleted(int)), this, SLOT(removeBufferView(int)));
- connect(Client::bufferViewManager(), SIGNAL(initDone()), this, SLOT(loadLayout()));
+ connect(Client::bufferViewManager(), &BufferViewManager::bufferViewConfigAdded, this, selectOverload<int>(&MainWin::addBufferView));
+ connect(Client::bufferViewManager(), &BufferViewManager::bufferViewConfigDeleted, this, &MainWin::removeBufferView);
+ connect(Client::bufferViewManager(), &SyncableObject::initDone, this, &MainWin::loadLayout);
if (Client::transferManager()) {
- connect(Client::transferManager(), SIGNAL(transferAdded(QUuid)), SLOT(showNewTransferDlg(QUuid)));
+ connect(Client::transferManager(), &TransferManager::transferAdded, this, &MainWin::showNewTransferDlg);
}
setConnectedState();
action->setVisible(!Client::internalCore());
}
- 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 &)));
+ disconnect(Client::backlogManager(), &ClientBacklogManager::updateProgress, _msgProcessorStatusWidget, &MsgProcessorStatusWidget::setProgress);
+ disconnect(Client::backlogManager(), &ClientBacklogManager::messagesRequested, this, &MainWin::showStatusBarMessage);
+ disconnect(Client::backlogManager(), &ClientBacklogManager::messagesProcessed, this, &MainWin::showStatusBarMessage);
if (!Client::internalCore()) {
- 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 &)));
+ connect(Client::backlogManager(), &ClientBacklogManager::updateProgress, _msgProcessorStatusWidget, &MsgProcessorStatusWidget::setProgress);
+ connect(Client::backlogManager(), &ClientBacklogManager::messagesRequested, this, &MainWin::showStatusBarMessage);
+ connect(Client::backlogManager(), &ClientBacklogManager::messagesProcessed, this, &MainWin::showStatusBarMessage);
}
// _viewMenu->setEnabled(true);
void MainWin::userAuthenticationRequired(CoreAccount *account, bool *valid, const QString &errorMessage)
{
Q_UNUSED(errorMessage)
- auto dlg = new CoreConnectAuthDlg(account, this);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- *valid = (dlg->exec() == QDialog::Accepted);
+ CoreConnectAuthDlg dlg(account);
+ *valid = (dlg.exec() == QDialog::Accepted);
}
void MainWin::handleNoSslInClient(bool *accepted)
{
- auto box = new QMessageBox(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);
- box->setAttribute(Qt::WA_DeleteOnClose);
- *accepted = (box->exec() == QMessageBox::Ignore);
+ QMessageBox box(QMessageBox::Warning, tr("Unencrypted Connection"), tr("<b>Your client does not support SSL encryption</b>"),
+ QMessageBox::Ignore|QMessageBox::Cancel);
+ 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)
{
- auto box = new QMessageBox(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);
- box->setAttribute(Qt::WA_DeleteOnClose);
- *accepted = (box->exec() == QMessageBox::Ignore);
+ QMessageBox box(QMessageBox::Warning, tr("Unencrypted Connection"), tr("<b>Your core does not support SSL encryption</b>"),
+ QMessageBox::Ignore|QMessageBox::Cancel);
+ box.setInformativeText(tr("Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."));
+ box.setDefaultButton(QMessageBox::Ignore);
+ *accepted = box.exec() == QMessageBox::Ignore;
}
errorString += QString("<li>%1</li>").arg(error.errorString());
errorString += "</ul>";
- auto box = new QMessageBox(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));
- box->setAttribute(Qt::WA_DeleteOnClose);
+ 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);
+ 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());
+ box.exec();
+ role = box.buttonRole(box.clickedButton());
if (role == QMessageBox::HelpRole) {
- auto dlg = new SslInfoDlg(socket, this);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- dlg->exec();
+ SslInfoDlg dlg(socket);
+ dlg.exec();
}
}
while (role == QMessageBox::HelpRole);
*accepted = role == QMessageBox::AcceptRole;
if (*accepted) {
- auto box2 = new QMessageBox(QMessageBox::Warning,
- tr("Untrusted Security Certificate"),
- tr("Would you like to accept this certificate forever without being prompted?"),
- nullptr, this);
- box2->setDefaultButton(box2->addButton(tr("Current Session Only"), QMessageBox::NoRole));
- box2->addButton(tr("Forever"), QMessageBox::YesRole);
- box2->setAttribute(Qt::WA_DeleteOnClose);
- box2->exec();
- *permanently = (box2->buttonRole(box2->clickedButton()) == QMessageBox::YesRole);
+ QMessageBox box2(QMessageBox::Warning,
+ tr("Untrusted Security Certificate"),
+ tr("Would you like to accept this certificate forever without being prompted?"),
+ 0);
+ 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::showCoreConnectionDlg()
{
- auto dlg = new CoreConnectDlg(this);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- if (dlg->exec() == QDialog::Accepted) {
- AccountId accId = dlg->selectedAccount();
+ CoreConnectDlg dlg;
+ if (dlg.exec() == QDialog::Accepted) {
+ AccountId accId = dlg.selectedAccount();
if (accId.isValid())
Client::coreConnection()->connectToCore(accId);
}
void MainWin::showCoreConfigWizard(const QVariantList &backends, const QVariantList &authenticators)
{
- CoreConfigWizard *wizard = new CoreConfigWizard(Client::coreConnection(), backends, authenticators, this);
+ auto *wizard = new CoreConfigWizard(Client::coreConnection(), backends, authenticators, this);
wizard->show();
}
void MainWin::showChannelList(NetworkId netId, const QString &channelFilters, bool listImmediately)
{
if (!netId.isValid()) {
- QAction *action = qobject_cast<QAction *>(sender());
+ auto *action = qobject_cast<QAction *>(sender());
if (action)
netId = action->data().value<NetworkId>();
if (!netId.isValid()) {
// We still haven't found a valid network, probably no network selected, e.g. "/list"
// on the client homescreen when no networks are connected.
- auto box = new QMessageBox(QMessageBox::Information, tr("No network selected"),
- QString("<b>%1</b>").arg(tr("No network selected")),
- QMessageBox::Ok, this);
- box->setInformativeText(tr("Select a network before trying to view the channel list."));
- box->setAttribute(Qt::WA_DeleteOnClose);
- box->exec();
+ QMessageBox box(QMessageBox::Information, tr("No network selected"),
+ QString("<b>%1</b>").arg(tr("No network selected")),
+ QMessageBox::Ok);
+ box.setInformativeText(tr("Select a network before trying to view the channel list."));
+ box.exec();
return;
}
}
- ChannelListDlg *channelListDlg = new ChannelListDlg(this);
+ auto *channelListDlg = new ChannelListDlg(this);
channelListDlg->setAttribute(Qt::WA_DeleteOnClose);
channelListDlg->setNetwork(netId);
if (!channelFilters.isEmpty()) {
void MainWin::showNetworkConfig(NetworkId netId)
{
- auto dlg = new SettingsPageDlg(new NetworksSettingsPage(this), this);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
+ SettingsPageDlg dlg{new NetworksSettingsPage{}};
if (netId.isValid())
- qobject_cast<NetworksSettingsPage *>(dlg->currentPage())->bufferList_Open(netId);
- dlg->exec();
+ qobject_cast<NetworksSettingsPage *>(dlg.currentPage())->bufferList_Open(netId);
+ dlg.exec();
}
void MainWin::showIgnoreList(QString newRule)
{
- auto dlg = new SettingsPageDlg(new IgnoreListSettingsPage(this), this);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
+ SettingsPageDlg dlg{new IgnoreListSettingsPage{}};
// prepare config dialog for new rule
if (!newRule.isEmpty())
- qobject_cast<IgnoreListSettingsPage *>(dlg->currentPage())->editIgnoreRule(newRule);
- dlg->exec();
+ qobject_cast<IgnoreListSettingsPage *>(dlg.currentPage())->editIgnoreRule(newRule);
+ dlg.exec();
}
void MainWin::showCoreInfoDlg()
{
- auto dlg = new CoreInfoDlg(this);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- dlg->exec();
+ CoreInfoDlg{}.exec();
}
{
if (_awayLog)
return;
- AwayLogFilter *filter = new AwayLogFilter(Client::messageModel());
- _awayLog = new AwayLogView(filter, 0);
+ auto *filter = new AwayLogFilter(Client::messageModel());
+ _awayLog = new AwayLogView(filter, nullptr);
filter->setParent(_awayLog);
- connect(_awayLog, SIGNAL(destroyed()), this, SLOT(awayLogDestroyed()));
+ connect(_awayLog, &QObject::destroyed, this, &MainWin::awayLogDestroyed);
_awayLog->setAttribute(Qt::WA_DeleteOnClose);
_awayLog->show();
}
void MainWin::awayLogDestroyed()
{
- _awayLog = 0;
+ _awayLog = nullptr;
}
void MainWin::showSettingsDlg()
{
- SettingsDlg *dlg = new SettingsDlg();
- dlg->setAttribute(Qt::WA_DeleteOnClose);
+ auto *dlg = new SettingsDlg();
//Category: Interface
dlg->registerSettingsPage(new AppearanceSettingsPage(dlg));
void MainWin::showAboutDlg()
{
- auto dlg = new AboutDlg(this);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- dlg->exec();
+ AboutDlg{}.exec();
}
void MainWin::showShortcutsDlg()
{
#ifdef HAVE_KDE
- auto dlg = new KShortcutsDialog(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsDisallowed, this);
- foreach(KActionCollection *coll, QtUi::actionCollections()) {
- dlg->addCollection(coll, coll->property("Category").toString());
- }
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- dlg->configure(true);
+ KShortcutsDialog dlg(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsDisallowed);
+ foreach(KActionCollection *coll, QtUi::actionCollections())
+ dlg.addCollection(coll, coll->property("Category").toString());
+ dlg.configure(true);
#else
- auto dlg = new SettingsPageDlg(new ShortcutsSettingsPage(QtUi::actionCollections(), this), this);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- dlg->exec();
+ SettingsPageDlg{new ShortcutsSettingsPage{QtUi::actionCollections()}}.exec();
#endif
}
auto transfer = Client::transferManager()->transfer(transferId);
if (transfer) {
if (transfer->status() == Transfer::Status::New) {
- ReceiveFileDlg *dlg = new ReceiveFileDlg(transfer, this);
+ auto *dlg = new ReceiveFileDlg(transfer, this);
dlg->show();
}
}
void MainWin::closeEvent(QCloseEvent *event)
{
QtUiSettings s;
- QtUiApplication *app = qobject_cast<QtUiApplication *> qApp;
+ auto *app = qobject_cast<QtUiApplication *> qApp;
Q_ASSERT(app);
// On OSX it can happen that the closeEvent occurs twice. (Especially if packaged with Frameworks)
// This messes up MainWinState/MainWinHidden save/restore.
else if(!_aboutToQuit) {
_aboutToQuit = true;
event->accept();
- quit();
+ Quassel::instance()->quit();
}
else {
event->ignore();
{
Q_UNUSED(parent);
- bool hasFocus = QApplication::activeWindow() != 0;
+ bool hasFocus = QApplication::activeWindow() != nullptr;
for (int i = start; i <= end; i++) {
QModelIndex idx = Client::messageModel()->index(i, ChatLineModel::ContentsColumn);
void MainWin::clientNetworkCreated(NetworkId id)
{
const Network *net = Client::network(id);
- QAction *act = new QAction(net->networkName(), this);
+ auto *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()));
+ connect(net, &SyncableObject::updatedRemotely, this, &MainWin::clientNetworkUpdated);
+ connect(act, &QAction::triggered, this, &MainWin::connectOrDisconnectFromNet);
- QAction *beforeAction = 0;
+ QAction *beforeAction = nullptr;
foreach(QAction *action, _networksMenu->actions()) {
if (!action->data().isValid()) // ignore stock actions
continue;
void MainWin::clientNetworkUpdated()
{
- const Network *net = qobject_cast<const Network *>(sender());
+ const auto *net = qobject_cast<const Network *>(sender());
if (!net)
return;
- QAction *action = findChild<QAction *>(QString("NetworkAction-%1").arg(net->networkId().toInt()));
+ auto *action = findChild<QAction *>(QString("NetworkAction-%1").arg(net->networkId().toInt()));
if (!action)
return;
void MainWin::clientNetworkRemoved(NetworkId id)
{
- QAction *action = findChild<QAction *>(QString("NetworkAction-%1").arg(id.toInt()));
+ auto *action = findChild<QAction *>(QString("NetworkAction-%1").arg(id.toInt()));
if (!action)
return;
void MainWin::connectOrDisconnectFromNet()
{
- QAction *act = qobject_cast<QAction *>(sender());
+ auto *act = qobject_cast<QAction *>(sender());
if (!act) return;
const Network *net = Client::network(act->data().value<NetworkId>());
if (!net) return;
void MainWin::onJumpKey()
{
- QAction *action = qobject_cast<QAction *>(sender());
+ auto *action = qobject_cast<QAction *>(sender());
if (!action || !Client::bufferModel())
return;
int idx = action->property("Index").toInt();
void MainWin::bindJumpKey()
{
- QAction *action = qobject_cast<QAction *>(sender());
+ auto *action = qobject_cast<QAction *>(sender());
if (!action || !Client::bufferModel())
return;
int idx = action->property("Index").toInt();
void MainWin::on_actionDebugNetworkModel_triggered()
{
- QTreeView *view = new QTreeView;
+ auto *view = new QTreeView;
view->setAttribute(Qt::WA_DeleteOnClose);
view->setWindowTitle("Debug NetworkModel View");
view->setModel(Client::networkModel());
_bufferHotList->invalidate();
_bufferHotList->sort(0, Qt::DescendingOrder);
- QTreeView *view = new QTreeView;
+ auto *view = new QTreeView;
view->setAttribute(Qt::WA_DeleteOnClose);
view->setModel(_bufferHotList);
view->show();
void MainWin::on_actionDebugBufferViewOverlay_triggered()
{
- DebugBufferViewOverlay *overlay = new DebugBufferViewOverlay(0);
+ auto *overlay = new DebugBufferViewOverlay(nullptr);
overlay->setAttribute(Qt::WA_DeleteOnClose);
overlay->show();
}
void MainWin::on_actionDebugMessageModel_triggered()
{
- QTableView *view = new QTableView(0);
- DebugMessageModelFilter *filter = new DebugMessageModelFilter(view);
+ auto *view = new QTableView(nullptr);
+ auto *filter = new DebugMessageModelFilter(view);
filter->setSourceModel(Client::messageModel());
view->setModel(filter);
view->setAttribute(Qt::WA_DeleteOnClose, true);
void MainWin::on_actionDebugLog_triggered()
{
- DebugLogWidget *logWidget = new DebugLogWidget(nullptr); // will be deleted on close
- logWidget->show();
+ auto dlg = new DebugLogDlg(this); // will be deleted on close
+ dlg->show();
}
+void MainWin::on_actionShowResourceTree_triggered()
+{
+ auto dlg = new ResourceTreeDlg(this); // will be deleted on close
+ dlg->show();
+}
void MainWin::showStatusBarMessage(const QString &message)
{
projects / quassel.git / blobdiff