mirror of
https://github.com/kiwix/kiwix-desktop.git
synced 2025-09-11 13:30:03 -04:00
Add generalised confirm function and use it in confirmDialogDownloadDir
This adds a new method confirmDialog(QString, QString) as a generalised function for confirm boxes confirmDialogDownloadDir is changed to use this new method
This commit is contained in:
parent
52ff3afaec
commit
a887af01be
@ -24,19 +24,19 @@ SettingsView::SettingsView(QWidget *parent)
|
|||||||
ui->resetButton->setText(gt("reset"));
|
ui->resetButton->setText(gt("reset"));
|
||||||
ui->browseButton->setText(gt("browse"));
|
ui->browseButton->setText(gt("browse"));
|
||||||
}
|
}
|
||||||
|
|
||||||
void SettingsView::init(int zoomPercent, const QString &dir)
|
void SettingsView::init(int zoomPercent, const QString &dir)
|
||||||
{
|
{
|
||||||
ui->zoomPercentSpinBox->setValue(zoomPercent);
|
ui->zoomPercentSpinBox->setValue(zoomPercent);
|
||||||
ui->downloadDirPath->setText(dir);
|
ui->downloadDirPath->setText(dir);
|
||||||
}
|
}
|
||||||
bool SettingsView::confirmDialogDownloadDir(const QString& dir)
|
|
||||||
|
bool SettingsView::confirmDialog( QString messageText, QString messageTitle)
|
||||||
{
|
{
|
||||||
auto text = gt("download-dir-dialog-msg");
|
|
||||||
text = text.replace("{{DIRECTORY}}", dir);
|
|
||||||
QMessageBox msgBox(
|
QMessageBox msgBox(
|
||||||
QMessageBox::Question, //Icon
|
QMessageBox::Question, //Icon
|
||||||
gt("download-dir-dialog-title"), //Title
|
messageTitle, //Title
|
||||||
text, //Text
|
messageText, //Text
|
||||||
QMessageBox::Ok | QMessageBox::Cancel //Buttons
|
QMessageBox::Ok | QMessageBox::Cancel //Buttons
|
||||||
);
|
);
|
||||||
msgBox.setDefaultButton(QMessageBox::Ok);
|
msgBox.setDefaultButton(QMessageBox::Ok);
|
||||||
@ -45,6 +45,12 @@ bool SettingsView::confirmDialogDownloadDir(const QString& dir)
|
|||||||
return (ret == QMessageBox::Ok);
|
return (ret == QMessageBox::Ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool SettingsView::confirmDialogDownloadDir(const QString &dir) {
|
||||||
|
auto messageText = gt("download-dir-dialog-msg");
|
||||||
|
messageText = messageText.replace("{{DIRECTORY}}", dir);
|
||||||
|
return confirmDialog(messageText, gt("download-dir-dialog-title"));
|
||||||
|
}
|
||||||
|
|
||||||
void SettingsView::resetDownloadDir()
|
void SettingsView::resetDownloadDir()
|
||||||
{
|
{
|
||||||
auto dir = QString::fromStdString(kiwix::getDataDirectory());
|
auto dir = QString::fromStdString(kiwix::getDataDirectory());
|
||||||
|
@ -20,7 +20,7 @@ public Q_SLOTS:
|
|||||||
void onZoomChanged(qreal zoomFactor);
|
void onZoomChanged(qreal zoomFactor);
|
||||||
private:
|
private:
|
||||||
bool confirmDialogDownloadDir(const QString& dir);
|
bool confirmDialogDownloadDir(const QString& dir);
|
||||||
|
bool confirmDialog(QString messageText, QString messageTitle);
|
||||||
Ui::Settings *ui;
|
Ui::Settings *ui;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user