New connect stax finished.
This commit is contained in:
parent
128a6aa22a
commit
b293ae3008
@ -289,21 +289,21 @@ void FormFeedDetails::guessIconOnly() {
|
||||
|
||||
void FormFeedDetails::createConnections() {
|
||||
// General connections.
|
||||
connect(m_ui->m_buttonBox, SIGNAL(accepted()), this, SLOT(apply()));
|
||||
connect(m_ui->m_txtTitle->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onTitleChanged(QString)));
|
||||
connect(m_ui->m_txtDescription->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onDescriptionChanged(QString)));
|
||||
connect(m_ui->m_txtUrl->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onUrlChanged(QString)));
|
||||
connect(m_ui->m_txtUsername->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onUsernameChanged(QString)));
|
||||
connect(m_ui->m_txtPassword->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onPasswordChanged(QString)));
|
||||
connect(m_ui->m_gbAuthentication, SIGNAL(toggled(bool)), this, SLOT(onAuthenticationSwitched()));
|
||||
connect(m_ui->m_cmbAutoUpdateType, SIGNAL(currentIndexChanged(int)), this, SLOT(onAutoUpdateTypeChanged(int)));
|
||||
connect(m_ui->m_btnFetchMetadata, SIGNAL(clicked()), this, SLOT(guessFeed()));
|
||||
connect(m_ui->m_buttonBox, &QDialogButtonBox::accepted, this, &FormFeedDetails::apply);
|
||||
connect(m_ui->m_txtTitle->lineEdit(), &BaseLineEdit::textChanged, this, &FormFeedDetails::onTitleChanged);
|
||||
connect(m_ui->m_txtDescription->lineEdit(), &BaseLineEdit::textChanged, this, &FormFeedDetails::onDescriptionChanged);
|
||||
connect(m_ui->m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &FormFeedDetails::onUrlChanged);
|
||||
connect(m_ui->m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormFeedDetails::onUsernameChanged);
|
||||
connect(m_ui->m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormFeedDetails::onPasswordChanged);
|
||||
connect(m_ui->m_gbAuthentication, &QGroupBox::toggled, this, &FormFeedDetails::onAuthenticationSwitched);
|
||||
connect(m_ui->m_cmbAutoUpdateType, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &FormFeedDetails::onAutoUpdateTypeChanged);
|
||||
connect(m_ui->m_btnFetchMetadata, &QPushButton::clicked, this, &FormFeedDetails::guessFeed);
|
||||
|
||||
// Icon connections.
|
||||
connect(m_actionFetchIcon, SIGNAL(triggered()), this, SLOT(guessIconOnly()));
|
||||
connect(m_actionLoadIconFromFile, SIGNAL(triggered()), this, SLOT(onLoadIconFromFile()));
|
||||
connect(m_actionNoIcon, SIGNAL(triggered()), this, SLOT(onNoIconSelected()));
|
||||
connect(m_actionUseDefaultIcon, SIGNAL(triggered()), this, SLOT(onUseDefaultIcon()));
|
||||
connect(m_actionFetchIcon, &QAction::triggered, this, &FormFeedDetails::guessIconOnly);
|
||||
connect(m_actionLoadIconFromFile, &QAction::triggered, this, &FormFeedDetails::onLoadIconFromFile);
|
||||
connect(m_actionNoIcon, &QAction::triggered, this, &FormFeedDetails::onNoIconSelected);
|
||||
connect(m_actionUseDefaultIcon, &QAction::triggered, this, &FormFeedDetails::onUseDefaultIcon);
|
||||
}
|
||||
|
||||
void FormFeedDetails::setEditableFeed(Feed *editable_feed) {
|
||||
|
@ -79,8 +79,8 @@ QList<QAction*> RecycleBin::contextMenu() {
|
||||
tr("Empty recycle bin"),
|
||||
this);
|
||||
|
||||
connect(restore_action, SIGNAL(triggered()), this, SLOT(restore()));
|
||||
connect(empty_action, SIGNAL(triggered()), this, SLOT(empty()));
|
||||
connect(restore_action, &QAction::triggered, this, &RecycleBin::restore);
|
||||
connect(empty_action, &QAction::triggered, this, &RecycleBin::empty);
|
||||
|
||||
m_contextMenu.append(restore_action);
|
||||
m_contextMenu.append(empty_action);
|
||||
|
@ -49,16 +49,16 @@ FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget *parent)
|
||||
setTabOrder(m_ui->m_checkShowPassword, m_ui->m_btnTestSetup);
|
||||
setTabOrder(m_ui->m_btnTestSetup, m_ui->m_buttonBox);
|
||||
|
||||
connect(m_ui->m_checkShowPassword, SIGNAL(toggled(bool)), this, SLOT(displayPassword(bool)));
|
||||
connect(m_ui->m_buttonBox, SIGNAL(accepted()), this, SLOT(onClickedOk()));
|
||||
connect(m_ui->m_buttonBox, SIGNAL(rejected()), this, SLOT(onClickedCancel()));
|
||||
connect(m_ui->m_txtPassword->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onPasswordChanged()));
|
||||
connect(m_ui->m_txtUsername->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onUsernameChanged()));
|
||||
connect(m_ui->m_txtUrl->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onUrlChanged()));
|
||||
connect(m_ui->m_txtPassword->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(checkOkButton()));
|
||||
connect(m_ui->m_txtUsername->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(checkOkButton()));
|
||||
connect(m_ui->m_txtUrl->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(checkOkButton()));
|
||||
connect(m_ui->m_btnTestSetup, SIGNAL(clicked()), this, SLOT(performTest()));
|
||||
connect(m_ui->m_checkShowPassword, &QCheckBox::toggled, this, &FormEditOwnCloudAccount::displayPassword);
|
||||
connect(m_ui->m_buttonBox, &QDialogButtonBox::accepted, this, &FormEditOwnCloudAccount::onClickedOk);
|
||||
connect(m_ui->m_buttonBox, &QDialogButtonBox::rejected, this, &FormEditOwnCloudAccount::onClickedCancel);
|
||||
connect(m_ui->m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditOwnCloudAccount::onPasswordChanged);
|
||||
connect(m_ui->m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditOwnCloudAccount::onUsernameChanged);
|
||||
connect(m_ui->m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditOwnCloudAccount::onUrlChanged);
|
||||
connect(m_ui->m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditOwnCloudAccount::checkOkButton);
|
||||
connect(m_ui->m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditOwnCloudAccount::checkOkButton);
|
||||
connect(m_ui->m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditOwnCloudAccount::checkOkButton);
|
||||
connect(m_ui->m_btnTestSetup, &QPushButton::clicked, this, &FormEditOwnCloudAccount::performTest);
|
||||
|
||||
onPasswordChanged();
|
||||
onUsernameChanged();
|
||||
|
@ -80,7 +80,7 @@ QList<QAction*> OwnCloudServiceRoot::serviceMenu() {
|
||||
if (m_serviceMenu.isEmpty()) {
|
||||
m_actionSyncIn = new QAction(qApp->icons()->fromTheme(QSL("view-refresh")), tr("Sync in"), this);
|
||||
|
||||
connect(m_actionSyncIn, SIGNAL(triggered()), this, SLOT(syncIn()));
|
||||
connect(m_actionSyncIn, &QAction::triggered, this, &OwnCloudServiceRoot::syncIn);
|
||||
m_serviceMenu.append(m_actionSyncIn);
|
||||
}
|
||||
|
||||
|
@ -38,9 +38,9 @@ FormStandardImportExport::FormStandardImportExport(StandardServiceRoot *service_
|
||||
m_ui->setupUi(this);
|
||||
m_model = new FeedsImportExportModel(m_ui->m_treeFeeds);
|
||||
|
||||
connect(m_model, SIGNAL(parsingStarted()), this, SLOT(onParsingStarted()));
|
||||
connect(m_model, SIGNAL(parsingFinished(int,int,bool)), this, SLOT(onParsingFinished(int,int,bool)));
|
||||
connect(m_model, SIGNAL(parsingProgress(int,int)), this, SLOT(onParsingProgress(int,int)));
|
||||
connect(m_model, &FeedsImportExportModel::parsingStarted, this, &FormStandardImportExport::onParsingStarted);
|
||||
connect(m_model, &FeedsImportExportModel::parsingFinished, this, &FormStandardImportExport::onParsingFinished);
|
||||
connect(m_model, &FeedsImportExportModel::parsingProgress, this, &FormStandardImportExport::onParsingProgress);
|
||||
|
||||
setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint);
|
||||
|
||||
@ -48,10 +48,10 @@ FormStandardImportExport::FormStandardImportExport(StandardServiceRoot *service_
|
||||
m_ui->m_buttonBox->button(QDialogButtonBox::Ok)->disconnect();
|
||||
m_ui->m_lblResult->setStatus(WidgetWithStatus::Warning, tr("No operation executed yet."), tr("No operation executed yet."));
|
||||
|
||||
connect(m_ui->m_buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(performAction()));
|
||||
connect(m_ui->m_btnSelectFile, SIGNAL(clicked()), this, SLOT(selectFile()));
|
||||
connect(m_ui->m_btnCheckAllItems, SIGNAL(clicked()), m_model, SLOT(checkAllItems()));
|
||||
connect(m_ui->m_btnUncheckAllItems, SIGNAL(clicked()), m_model, SLOT(uncheckAllItems()));
|
||||
connect(m_ui->m_buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &FormStandardImportExport::performAction);
|
||||
connect(m_ui->m_btnSelectFile, &QPushButton::clicked, this, &FormStandardImportExport::selectFile);
|
||||
connect(m_ui->m_btnCheckAllItems, &QPushButton::clicked, m_model, &FeedsImportExportModel::checkAllItems);
|
||||
connect(m_ui->m_btnUncheckAllItems, &QPushButton::clicked, m_model, &FeedsImportExportModel::uncheckAllItems);
|
||||
}
|
||||
|
||||
FormStandardImportExport::~FormStandardImportExport() {
|
||||
|
@ -224,8 +224,8 @@ QList<QAction*> StandardServiceRoot::getContextMenuForFeed(StandardFeed *feed) {
|
||||
}
|
||||
|
||||
// Make connections.
|
||||
disconnect(m_actionFeedFetchMetadata, SIGNAL(triggered()), 0, 0);
|
||||
connect(m_actionFeedFetchMetadata, SIGNAL(triggered()), feed, SLOT(fetchMetadataForItself()));
|
||||
disconnect(m_actionFeedFetchMetadata, &QAction::triggered, 0, 0);
|
||||
connect(m_actionFeedFetchMetadata, &QAction::triggered, feed, &StandardFeed::fetchMetadataForItself);
|
||||
|
||||
return m_feedContextMenu;
|
||||
}
|
||||
@ -345,8 +345,8 @@ QList<QAction*> StandardServiceRoot::serviceMenu() {
|
||||
m_actionExportFeeds = new QAction(qApp->icons()->fromTheme("document-export"), tr("Export feeds"), this);
|
||||
m_actionImportFeeds = new QAction(qApp->icons()->fromTheme("document-import"), tr("Import feeds"), this);
|
||||
|
||||
connect(m_actionExportFeeds, SIGNAL(triggered()), this, SLOT(exportFeeds()));
|
||||
connect(m_actionImportFeeds, SIGNAL(triggered()), this, SLOT(importFeeds()));
|
||||
connect(m_actionExportFeeds, &QAction::triggered, this, &StandardServiceRoot::exportFeeds);
|
||||
connect(m_actionImportFeeds, &QAction::triggered, this, &StandardServiceRoot::importFeeds);
|
||||
|
||||
m_serviceMenu.append(m_actionExportFeeds);
|
||||
m_serviceMenu.append(m_actionImportFeeds);
|
||||
|
@ -56,21 +56,21 @@ FormEditAccount::FormEditAccount(QWidget *parent)
|
||||
setTabOrder(m_ui->m_checkShowHttpPassword, m_ui->m_btnTestSetup);
|
||||
setTabOrder(m_ui->m_btnTestSetup, m_ui->m_buttonBox);
|
||||
|
||||
connect(m_ui->m_checkShowPassword, SIGNAL(toggled(bool)), this, SLOT(displayPassword(bool)));
|
||||
connect(m_ui->m_buttonBox, SIGNAL(accepted()), this, SLOT(onClickedOk()));
|
||||
connect(m_ui->m_buttonBox, SIGNAL(rejected()), this, SLOT(onClickedCancel()));
|
||||
connect(m_ui->m_txtPassword->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onPasswordChanged()));
|
||||
connect(m_ui->m_txtUsername->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onUsernameChanged()));
|
||||
connect(m_ui->m_txtHttpPassword->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onHttpPasswordChanged()));
|
||||
connect(m_ui->m_txtHttpUsername->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onHttpUsernameChanged()));
|
||||
connect(m_ui->m_txtUrl->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(onUrlChanged()));
|
||||
connect(m_ui->m_txtPassword->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(checkOkButton()));
|
||||
connect(m_ui->m_txtUsername->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(checkOkButton()));
|
||||
connect(m_ui->m_txtUrl->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(checkOkButton()));
|
||||
connect(m_ui->m_btnTestSetup, SIGNAL(clicked()), this, SLOT(performTest()));
|
||||
connect(m_ui->m_gbHttpAuthentication, SIGNAL(toggled(bool)), this, SLOT(onHttpPasswordChanged()));
|
||||
connect(m_ui->m_gbHttpAuthentication, SIGNAL(toggled(bool)), this, SLOT(onHttpUsernameChanged()));
|
||||
connect(m_ui->m_checkShowHttpPassword, SIGNAL(toggled(bool)), this, SLOT(displayHttpPassword(bool)));
|
||||
connect(m_ui->m_checkShowPassword, &QCheckBox::toggled, this, &FormEditAccount::displayPassword);
|
||||
connect(m_ui->m_buttonBox, &QDialogButtonBox::accepted, this, &FormEditAccount::onClickedOk);
|
||||
connect(m_ui->m_buttonBox, &QDialogButtonBox::rejected, this, &FormEditAccount::onClickedCancel);
|
||||
connect(m_ui->m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::onPasswordChanged);
|
||||
connect(m_ui->m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::onUsernameChanged);
|
||||
connect(m_ui->m_txtHttpPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::onHttpPasswordChanged);
|
||||
connect(m_ui->m_txtHttpUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::onHttpUsernameChanged);
|
||||
connect(m_ui->m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::onUrlChanged);
|
||||
connect(m_ui->m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::checkOkButton);
|
||||
connect(m_ui->m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::checkOkButton);
|
||||
connect(m_ui->m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &FormEditAccount::checkOkButton);
|
||||
connect(m_ui->m_btnTestSetup, &QPushButton::clicked, this, &FormEditAccount::performTest);
|
||||
connect(m_ui->m_gbHttpAuthentication, &QGroupBox::toggled, this, &FormEditAccount::onHttpPasswordChanged);
|
||||
connect(m_ui->m_gbHttpAuthentication, &QGroupBox::toggled, this, &FormEditAccount::onHttpUsernameChanged);
|
||||
connect(m_ui->m_checkShowHttpPassword, &QCheckBox::toggled, this, &FormEditAccount::displayHttpPassword);
|
||||
|
||||
onPasswordChanged();
|
||||
onUsernameChanged();
|
||||
|
@ -170,7 +170,7 @@ QList<QAction*> TtRssServiceRoot::serviceMenu() {
|
||||
if (m_serviceMenu.isEmpty()) {
|
||||
m_actionSyncIn = new QAction(qApp->icons()->fromTheme(QSL("view-refresh")), tr("Sync in"), this);
|
||||
|
||||
connect(m_actionSyncIn, SIGNAL(triggered()), this, SLOT(syncIn()));
|
||||
connect(m_actionSyncIn, &QAction::triggered, this, &TtRssServiceRoot::syncIn);
|
||||
m_serviceMenu.append(m_actionSyncIn);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user