#include <QInputDialog>
#ifdef HAVE_KF5
+# include <kconfigwidgets_version.h>
# include <KConfigWidgets/KStandardAction>
# include <KXmlGui/KHelpMenu>
# include <KXmlGui/KShortcutsDialog>
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
// 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
qApp->closeAllWindows();
});
- QTimer::singleShot(0, this, SLOT(doAutoConnect()));
+ QTimer::singleShot(0, this, &MainWin::doAutoConnect);
}
void MainWin::setupActions()
{
+ QAction *action{nullptr};
ActionCollection *coll = QtUi::actionCollection("General", tr("General"));
+
// File
- coll->addAction("ConnectCore", new Action(icon::get("connect-quassel"), tr("&Connect to Core..."), coll,
- this, SLOT(showCoreConnectionDlg())));
- coll->addAction("DisconnectCore", new Action(icon::get("disconnect-quassel"), tr("&Disconnect from Core"), coll,
- Client::instance(), SLOT(disconnectFromCore())));
- coll->addAction("ChangePassword", new Action(icon::get("dialog-password"), tr("Change &Password..."), coll,
- this, SLOT(showPasswordChangeDlg())));
- coll->addAction("CoreInfo", new Action(icon::get("help-about"), tr("Core &Info..."), coll,
- this, SLOT(showCoreInfoDlg())));
- coll->addAction("ConfigureNetworks", new Action(icon::get("configure"), tr("Configure &Networks..."), coll,
- this, SLOT(on_actionConfigureNetworks_triggered())));
- // QKeySequence::Quit was added in Qt 4.6, and could be used instead. However, that key
- // sequence is empty by default on Windows, which would remove Ctrl-Q to quit. It may be best
- // to just keep it this way.
- //
- // See https://doc.qt.io/qt-5/qkeysequence.html
- coll->addAction("Quit", new Action(icon::get("application-exit"), tr("&Quit"), coll,
- Quassel::instance(), SLOT(quit()), Qt::CTRL + Qt::Key_Q));
+ coll->addActions({
+ {"ConnectCore", new Action(icon::get("connect-quassel"), tr("&Connect to Core..."), coll, this, &MainWin::showCoreConnectionDlg)},
+ {"DisconnectCore", new Action(icon::get("disconnect-quassel"), tr("&Disconnect from Core"), coll, Client::instance(), &Client::disconnectFromCore)},
+ {"ChangePassword", new Action(icon::get("dialog-password"), tr("Change &Password..."), coll, this, &MainWin::showPasswordChangeDlg)},
+ {"CoreInfo", new Action(icon::get("help-about"), tr("Core &Info..."), coll, this, &MainWin::showCoreInfoDlg)},
+ {"ConfigureNetworks", new Action(icon::get("configure"), tr("Configure &Networks..."), coll, this, &MainWin::on_actionConfigureNetworks_triggered)},
+ {"Quit", new Action(icon::get("application-exit"), tr("&Quit"), coll, Quassel::instance(), &Quassel::quit, Qt::CTRL + Qt::Key_Q)}
+ });
// View
- coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Chat Lists..."), coll,
- this, SLOT(on_actionConfigureViews_triggered())));
+ coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Chat Lists..."), coll, this, &MainWin::on_actionConfigureViews_triggered));
- QAction *lockAct = coll->addAction("LockLayout", new Action(tr("&Lock Layout"), coll));
- lockAct->setCheckable(true);
- connect(lockAct, SIGNAL(toggled(bool)), SLOT(on_actionLockLayout_toggled(bool)));
+ coll->addAction("ToggleSearchBar", new Action(icon::get("edit-find"), tr("Show &Search Bar"), coll, QKeySequence::Find))->setCheckable(true);
+ coll->addAction("ShowAwayLog", new Action(tr("Show Away Log"), coll, this, &MainWin::showAwayLog));
+ coll->addAction("ToggleMenuBar", new Action(icon::get("show-menu"), tr("Show &Menubar"), coll))->setCheckable(true);
+ coll->addAction("ToggleStatusBar", new Action(tr("Show Status &Bar"), coll))->setCheckable(true);
- coll->addAction("ToggleSearchBar", new Action(icon::get("edit-find"), tr("Show &Search Bar"), coll,
- 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,
- nullptr, nullptr))->setCheckable(true);
-
- coll->addAction("ToggleStatusBar", new Action(tr("Show Status &Bar"), coll,
- nullptr, nullptr))->setCheckable(true);
+ action = coll->addAction("LockLayout", new Action(tr("&Lock Layout"), coll));
+ action->setCheckable(true);
+ connect(action, &QAction::toggled, this, &MainWin::on_actionLockLayout_toggled);
#ifdef HAVE_KDE
+#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5,23,0)
_fullScreenAction = KStandardAction::fullScreen(this, SLOT(onFullScreenToggled()), this, coll);
#else
- _fullScreenAction = new Action(icon::get("view-fullscreen"), tr("&Full Screen Mode"), coll,
- this, SLOT(onFullScreenToggled()), QKeySequence(Qt::Key_F11));
+ _fullScreenAction = KStandardAction::fullScreen(this, &MainWin::onFullScreenToggled, this, coll);
+#endif
+#else
+ _fullScreenAction = new Action(icon::get("view-fullscreen"), tr("&Full Screen Mode"), coll, this, &MainWin::onFullScreenToggled, QKeySequence::FullScreen);
_fullScreenAction->setCheckable(true);
coll->addAction("ToggleFullScreen", _fullScreenAction);
#endif
// Settings
- QAction *configureShortcutsAct = new Action(icon::get("configure-shortcuts"), tr("Configure &Shortcuts..."), coll,
- this, SLOT(showShortcutsDlg()));
- configureShortcutsAct->setMenuRole(QAction::NoRole);
- coll->addAction("ConfigureShortcuts", configureShortcutsAct);
-
-#ifdef Q_OS_MAC
- QAction *configureQuasselAct = new Action(icon::get("configure"), tr("&Configure Quassel..."), coll,
- this, SLOT(showSettingsDlg()));
- configureQuasselAct->setMenuRole(QAction::PreferencesRole);
-#else
- QAction *configureQuasselAct = new Action(icon::get("configure"), tr("&Configure Quassel..."), coll,
- this, SLOT(showSettingsDlg()), QKeySequence(Qt::Key_F7));
-#endif
- coll->addAction("ConfigureQuassel", configureQuasselAct);
+ coll->addAction("ConfigureShortcuts", new Action(icon::get("configure-shortcuts"), tr("Configure &Shortcuts..."), coll,
+ this, &MainWin::showShortcutsDlg))->setMenuRole(QAction::NoRole);
+ coll->addAction("ConfigureQuassel", new Action(icon::get("configure"), tr("&Configure Quassel..."), coll,
+ this, &MainWin::showSettingsDlg, QKeySequence(Qt::Key_F7)))->setMenuRole(QAction::PreferencesRole);
// Help
- QAction *aboutQuasselAct = new Action(icon::get("quassel"), tr("&About Quassel"), coll,
- this, SLOT(showAboutDlg()));
- aboutQuasselAct->setMenuRole(QAction::AboutRole);
- coll->addAction("AboutQuassel", aboutQuasselAct);
-
- QAction *aboutQtAct = new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt"), coll,
- qApp, SLOT(aboutQt()));
- aboutQtAct->setMenuRole(QAction::AboutQtRole);
- coll->addAction("AboutQt", aboutQtAct);
- coll->addAction("DebugNetworkModel", new Action(icon::get("tools-report-bug"), tr("Debug &NetworkModel"), coll,
- this, SLOT(on_actionDebugNetworkModel_triggered())));
- coll->addAction("DebugBufferViewOverlay", new Action(icon::get("tools-report-bug"), tr("Debug &BufferViewOverlay"), coll,
- this, SLOT(on_actionDebugBufferViewOverlay_triggered())));
- coll->addAction("DebugMessageModel", new Action(icon::get("tools-report-bug"), tr("Debug &MessageModel"), coll,
- this, SLOT(on_actionDebugMessageModel_triggered())));
- coll->addAction("DebugHotList", new Action(icon::get("tools-report-bug"), tr("Debug &HotList"), 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)));
-
- coll->addAction("HideCurrentBuffer", new Action(tr("Hide Current Buffer"), coll,
- this, SLOT(hideCurrentBuffer()), QKeySequence::Close));
+ coll->addAction("AboutQuassel", new Action(icon::get("quassel"), tr("&About Quassel"), coll, this, &MainWin::showAboutDlg))->setMenuRole(QAction::AboutRole);
+ coll->addAction("AboutQt", new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt"), coll, qApp, &QApplication::aboutQt))->setMenuRole(QAction::AboutQtRole);
+ coll->addActions({
+ {"DebugNetworkModel", new Action(icon::get("tools-report-bug"), tr("Debug &NetworkModel"), coll, this, &MainWin::on_actionDebugNetworkModel_triggered)},
+ {"DebugBufferViewOverlay", new Action(icon::get("tools-report-bug"), tr("Debug &BufferViewOverlay"), coll, this, &MainWin::on_actionDebugBufferViewOverlay_triggered)},
+ {"DebugMessageModel", new Action(icon::get("tools-report-bug"), tr("Debug &MessageModel"), coll, this, &MainWin::on_actionDebugMessageModel_triggered)},
+ {"DebugHotList", new Action(icon::get("tools-report-bug"), tr("Debug &HotList"), coll, this, &MainWin::on_actionDebugHotList_triggered)},
+ {"DebugLog", new Action(icon::get("tools-report-bug"), tr("Debug &Log"), coll, this, &MainWin::on_actionDebugLog_triggered)},
+ {"ShowResourceTree", new Action(icon::get("tools-report-bug"), tr("Show &Resource Tree"), coll, this, &MainWin::on_actionShowResourceTree_triggered)},
+ {"ReloadStyle", new Action(icon::get("view-refresh"), tr("Reload Stylesheet"), coll, QtUi::style(), &UiStyle::reload, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_R))}
+ });
+
+ // Other
+ coll->addAction("HideCurrentBuffer", new Action(tr("Hide Current Buffer"), coll, this, &MainWin::hideCurrentBuffer, QKeySequence::Close));
// Text formatting
coll = QtUi::actionCollection("TextFormat", tr("Text formatting"));
- coll->addAction("FormatApplyColor", new Action(
- icon::get("format-text-color"), tr("Apply foreground color"), coll,
- this, SLOT(on_inputFormatApplyColor_triggered()),
- QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_G)));
-
- coll->addAction("FormatApplyColorFill", new Action(
- icon::get("format-fill-color"), tr("Apply background color"), coll,
- this, SLOT(on_inputFormatApplyColorFill_triggered()),
- QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B)));
-
- coll->addAction("FormatClear", new Action(
- icon::get("edit-clear"), tr("Clear formatting"), coll,
- this, SLOT(on_inputFormatClear_triggered()),
- QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_C)));
-
- coll->addAction("FormatBold", new Action(
- icon::get("format-text-bold"), tr("Toggle bold"), coll,
- this, SLOT(on_inputFormatBold_triggered()),
- QKeySequence::Bold));
-
- coll->addAction("FormatItalic", new Action(
- icon::get("format-text-italic"), tr("Toggle italics"), coll,
- this, SLOT(on_inputFormatItalic_triggered()),
- QKeySequence::Italic));
-
- coll->addAction("FormatUnderline", new Action(
- icon::get("format-text-underline"), tr("Toggle underline"), coll,
- this, SLOT(on_inputFormatUnderline_triggered()), QKeySequence::Underline));
+ coll->addActions({
+ {"FormatApplyColor", new Action(
+ icon::get("format-text-color"), tr("Apply foreground color"), coll,
+ this, &MainWin::on_inputFormatApplyColor_triggered,
+ QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_G))
+ },
+ {"FormatApplyColorFill", new Action(
+ icon::get("format-fill-color"), tr("Apply background color"), coll,
+ this, &MainWin::on_inputFormatApplyColorFill_triggered,
+ QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B))
+ },
+ {"FormatClear", new Action(
+ icon::get("edit-clear"), tr("Clear formatting"), coll,
+ this, &MainWin::on_inputFormatClear_triggered,
+ QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_C))
+ },
+ {"FormatBold", new Action(
+ icon::get("format-text-bold"), tr("Toggle bold"), coll,
+ this, &MainWin::on_inputFormatBold_triggered,
+ QKeySequence::Bold)
+ },
+ {"FormatItalic", new Action(
+ icon::get("format-text-italic"), tr("Toggle italics"), coll,
+ this, &MainWin::on_inputFormatItalic_triggered,
+ QKeySequence::Italic)
+ },
+ {"FormatUnderline", new Action(
+ icon::get("format-text-underline"), tr("Toggle underline"), coll,
+ this, &MainWin::on_inputFormatUnderline_triggered,
+ QKeySequence::Underline)
+ }
+ });
// Navigation
coll = QtUi::actionCollection("Navigation", tr("Navigation"));
- coll->addAction("JumpHotBuffer", new Action(tr("Jump to hot chat"), coll,
- this, SLOT(on_jumpHotBuffer_triggered()), QKeySequence(Qt::META + Qt::Key_A)));
-
- coll->addAction("ActivateBufferFilter", new Action(tr("Activate the buffer search"), coll,
- this, SLOT(on_bufferSearch_triggered()), QKeySequence(Qt::CTRL + Qt::Key_S)));
+ coll->addActions({
+ {"JumpHotBuffer", new Action(tr("Jump to hot chat"), coll, this, &MainWin::on_jumpHotBuffer_triggered, QKeySequence(Qt::META + Qt::Key_A))},
+ {"ActivateBufferFilter", new Action(tr("Activate the buffer search"), coll, this, &MainWin::on_bufferSearch_triggered, QKeySequence(Qt::CTRL + Qt::Key_S))}
+ });
// Jump keys
#ifdef Q_OS_MAC
const int jumpModifier = Qt::AltModifier;
#endif
- coll->addAction("BindJumpKey0", new Action(tr("Set Quick Access #0"), coll, this, SLOT(bindJumpKey()),
+ coll->addAction("BindJumpKey0", new Action(tr("Set Quick Access #0"), coll, this, &MainWin::bindJumpKey,
QKeySequence(bindModifier + Qt::Key_0)))->setProperty("Index", 0);
- coll->addAction("BindJumpKey1", new Action(tr("Set Quick Access #1"), coll, this, SLOT(bindJumpKey()),
+ coll->addAction("BindJumpKey1", new Action(tr("Set Quick Access #1"), coll, this, &MainWin::bindJumpKey,
QKeySequence(bindModifier + Qt::Key_1)))->setProperty("Index", 1);
- coll->addAction("BindJumpKey2", new Action(tr("Set Quick Access #2"), coll, this, SLOT(bindJumpKey()),
+ coll->addAction("BindJumpKey2", new Action(tr("Set Quick Access #2"), coll, this, &MainWin::bindJumpKey,
QKeySequence(bindModifier + Qt::Key_2)))->setProperty("Index", 2);
- coll->addAction("BindJumpKey3", new Action(tr("Set Quick Access #3"), coll, this, SLOT(bindJumpKey()),
+ coll->addAction("BindJumpKey3", new Action(tr("Set Quick Access #3"), coll, this, &MainWin::bindJumpKey,
QKeySequence(bindModifier + Qt::Key_3)))->setProperty("Index", 3);
- coll->addAction("BindJumpKey4", new Action(tr("Set Quick Access #4"), coll, this, SLOT(bindJumpKey()),
+ coll->addAction("BindJumpKey4", new Action(tr("Set Quick Access #4"), coll, this, &MainWin::bindJumpKey,
QKeySequence(bindModifier + Qt::Key_4)))->setProperty("Index", 4);
- coll->addAction("BindJumpKey5", new Action(tr("Set Quick Access #5"), coll, this, SLOT(bindJumpKey()),
+ coll->addAction("BindJumpKey5", new Action(tr("Set Quick Access #5"), coll, this, &MainWin::bindJumpKey,
QKeySequence(bindModifier + Qt::Key_5)))->setProperty("Index", 5);
- coll->addAction("BindJumpKey6", new Action(tr("Set Quick Access #6"), coll, this, SLOT(bindJumpKey()),
+ coll->addAction("BindJumpKey6", new Action(tr("Set Quick Access #6"), coll, this, &MainWin::bindJumpKey,
QKeySequence(bindModifier + Qt::Key_6)))->setProperty("Index", 6);
- coll->addAction("BindJumpKey7", new Action(tr("Set Quick Access #7"), coll, this, SLOT(bindJumpKey()),
+ coll->addAction("BindJumpKey7", new Action(tr("Set Quick Access #7"), coll, this, &MainWin::bindJumpKey,
QKeySequence(bindModifier + Qt::Key_7)))->setProperty("Index", 7);
- coll->addAction("BindJumpKey8", new Action(tr("Set Quick Access #8"), coll, this, SLOT(bindJumpKey()),
+ coll->addAction("BindJumpKey8", new Action(tr("Set Quick Access #8"), coll, this, &MainWin::bindJumpKey,
QKeySequence(bindModifier + Qt::Key_8)))->setProperty("Index", 8);
- coll->addAction("BindJumpKey9", new Action(tr("Set Quick Access #9"), coll, this, SLOT(bindJumpKey()),
+ coll->addAction("BindJumpKey9", new Action(tr("Set Quick Access #9"), coll, this, &MainWin::bindJumpKey,
QKeySequence(bindModifier + Qt::Key_9)))->setProperty("Index", 9);
- coll->addAction("JumpKey0", new Action(tr("Quick Access #0"), coll, this, SLOT(onJumpKey()),
+ coll->addAction("JumpKey0", new Action(tr("Quick Access #0"), coll, this, &MainWin::onJumpKey,
QKeySequence(jumpModifier + Qt::Key_0)))->setProperty("Index", 0);
- coll->addAction("JumpKey1", new Action(tr("Quick Access #1"), coll, this, SLOT(onJumpKey()),
+ coll->addAction("JumpKey1", new Action(tr("Quick Access #1"), coll, this, &MainWin::onJumpKey,
QKeySequence(jumpModifier + Qt::Key_1)))->setProperty("Index", 1);
- coll->addAction("JumpKey2", new Action(tr("Quick Access #2"), coll, this, SLOT(onJumpKey()),
+ coll->addAction("JumpKey2", new Action(tr("Quick Access #2"), coll, this, &MainWin::onJumpKey,
QKeySequence(jumpModifier + Qt::Key_2)))->setProperty("Index", 2);
- coll->addAction("JumpKey3", new Action(tr("Quick Access #3"), coll, this, SLOT(onJumpKey()),
+ coll->addAction("JumpKey3", new Action(tr("Quick Access #3"), coll, this, &MainWin::onJumpKey,
QKeySequence(jumpModifier + Qt::Key_3)))->setProperty("Index", 3);
- coll->addAction("JumpKey4", new Action(tr("Quick Access #4"), coll, this, SLOT(onJumpKey()),
+ coll->addAction("JumpKey4", new Action(tr("Quick Access #4"), coll, this, &MainWin::onJumpKey,
QKeySequence(jumpModifier + Qt::Key_4)))->setProperty("Index", 4);
- coll->addAction("JumpKey5", new Action(tr("Quick Access #5"), coll, this, SLOT(onJumpKey()),
+ coll->addAction("JumpKey5", new Action(tr("Quick Access #5"), coll, this, &MainWin::onJumpKey,
QKeySequence(jumpModifier + Qt::Key_5)))->setProperty("Index", 5);
- coll->addAction("JumpKey6", new Action(tr("Quick Access #6"), coll, this, SLOT(onJumpKey()),
+ coll->addAction("JumpKey6", new Action(tr("Quick Access #6"), coll, this, &MainWin::onJumpKey,
QKeySequence(jumpModifier + Qt::Key_6)))->setProperty("Index", 6);
- coll->addAction("JumpKey7", new Action(tr("Quick Access #7"), coll, this, SLOT(onJumpKey()),
+ coll->addAction("JumpKey7", new Action(tr("Quick Access #7"), coll, this, &MainWin::onJumpKey,
QKeySequence(jumpModifier + Qt::Key_7)))->setProperty("Index", 7);
- coll->addAction("JumpKey8", new Action(tr("Quick Access #8"), coll, this, SLOT(onJumpKey()),
+ coll->addAction("JumpKey8", new Action(tr("Quick Access #8"), coll, this, &MainWin::onJumpKey,
QKeySequence(jumpModifier + Qt::Key_8)))->setProperty("Index", 8);
- coll->addAction("JumpKey9", new Action(tr("Quick Access #9"), coll, this, SLOT(onJumpKey()),
+ coll->addAction("JumpKey9", new Action(tr("Quick Access #9"), coll, this, &MainWin::onJumpKey,
QKeySequence(jumpModifier + Qt::Key_9)))->setProperty("Index", 9);
// Buffer navigation
coll->addAction("NextBufferView", new Action(icon::get("go-next-view"), tr("Activate Next Chat List"), coll,
- this, SLOT(nextBufferView()), QKeySequence(QKeySequence::Forward)));
+ this, &MainWin::nextBufferView, QKeySequence(QKeySequence::Forward)));
coll->addAction("PreviousBufferView", new Action(icon::get("go-previous-view"), tr("Activate Previous Chat List"), coll,
- this, SLOT(previousBufferView()), QKeySequence::Back));
+ this, &MainWin::previousBufferView, QKeySequence::Back));
coll->addAction("NextBuffer", new Action(icon::get("go-down"), tr("Go to Next Chat"), coll,
- this, SLOT(nextBuffer()), QKeySequence(Qt::ALT + Qt::Key_Down)));
+ this, &MainWin::nextBuffer, QKeySequence(Qt::ALT + Qt::Key_Down)));
coll->addAction("PreviousBuffer", new Action(icon::get("go-up"), tr("Go to Previous Chat"), coll,
- this, SLOT(previousBuffer()), QKeySequence(Qt::ALT + Qt::Key_Up)));
+ this, &MainWin::previousBuffer, QKeySequence(Qt::ALT + Qt::Key_Up)));
}
_settingsMenu = menuBar()->addMenu(tr("&Settings"));
#ifdef HAVE_KDE
+#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5,23,0)
_settingsMenu->addAction(KStandardAction::configureNotifications(this, SLOT(showNotificationsDlg()), this));
_settingsMenu->addAction(KStandardAction::keyBindings(this, SLOT(showShortcutsDlg()), this));
+#else
+ _settingsMenu->addAction(KStandardAction::configureNotifications(this, &MainWin::showNotificationsDlg, this));
+ _settingsMenu->addAction(KStandardAction::keyBindings(this, &MainWin::showShortcutsDlg, this));
+#endif
#else
_settingsMenu->addAction(coll->action("ConfigureShortcuts"));
#endif
#ifndef HAVE_KDE
_helpMenu->addAction(coll->action("AboutQt"));
#else
+#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5,23,0)
_helpMenu->addAction(KStandardAction::aboutKDE(_kHelpMenu, SLOT(aboutKDE()), this));
+#else
+ _helpMenu->addAction(KStandardAction::aboutKDE(_kHelpMenu, &KHelpMenu::aboutKDE, this));
+#endif
#endif
_helpMenu->addSeparator();
_helpDebugMenu = _helpMenu->addMenu(icon::get("tools-report-bug"), tr("Debug"));
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);
}
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())
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());
_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::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);
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();
}
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 = nullptr;
foreach(QAction *action, _networksMenu->actions()) {
projects / quassel.git / blobdiff