2020-02-25 Fred Gleason <fredg@paravelsystems.com>

* Removed the 'Q3FileDialog' dependency from rddbconfig(8).
This commit is contained in:
Fred Gleason 2020-02-25 17:00:41 -05:00
parent ad7aafbe63
commit 2bc5f740a3
2 changed files with 14 additions and 9 deletions

View File

@ -19703,3 +19703,5 @@
dialog. dialog.
2020-02-25 Fred Gleason <fredg@paravelsystems.com> 2020-02-25 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Q3FileDialog' dependency from rdadmin(1). * Removed the 'Q3FileDialog' dependency from rdadmin(1).
2020-02-25 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Q3FileDialog' dependency from rddbconfig(8).

View File

@ -25,12 +25,13 @@
#include <sys/types.h> #include <sys/types.h>
#include <qapplication.h> #include <qapplication.h>
#include <qprocess.h> #include <qfiledialog.h>
#include <qmessagebox.h> #include <qmessagebox.h>
#include <q3filedialog.h> #include <qprocess.h>
#include <dbversion.h> #include <dbversion.h>
#include <rdapplication.h> #include <rdapplication.h>
#include <rdconf.h>
#include <rdconfig.h> #include <rdconfig.h>
#include <rdpaths.h> #include <rdpaths.h>
@ -298,9 +299,10 @@ void MainWidget::backupData()
(const char *)rd_config->mysqlDbname())); (const char *)rd_config->mysqlDbname()));
return; return;
} }
filename=QFileDialog::getSaveFileName(this,"RDDbConfig - "+
filename=Q3FileDialog::getSaveFileName("rivendell.sql", tr("Enter the MySQL Backup Filename"),
"MySQL (*.sql)",this,"open file dialog","Enter the MySQL Backup Filename"); RDHomeDir(),
"MySQL files (*.sql);;All files (*.*)");
if (!filename.isEmpty()) { if (!filename.isEmpty()) {
QProcess backupProcess(this); QProcess backupProcess(this);
@ -340,10 +342,11 @@ void MainWidget::restoreData()
tr("Could not open Rivendell database.")); tr("Could not open Rivendell database."));
return; return;
} }
filename=
filename=Q3FileDialog::getOpenFileName("", QFileDialog::getOpenFileName(this,"RDDbConfig - "+
"MySQL (*.sql);;All Files(*)",this,"open file dialog", tr("Choose the MySQL Backup File to Restore"),
"Choose the MySQL Backup File to Restore"); RDHomeDir(),
"MySQL files (*.sql);;All files (*.*)");
if(!filename.isEmpty()) { if(!filename.isEmpty()) {
if (QMessageBox::question(this,tr("Restore Entire Database"),tr("Are you sure you want to restore your entire Rivendell database?"),(QMessageBox::No|QMessageBox::Yes)) != QMessageBox::Yes) { if (QMessageBox::question(this,tr("Restore Entire Database"),tr("Are you sure you want to restore your entire Rivendell database?"),(QMessageBox::No|QMessageBox::Yes)) != QMessageBox::Yes) {