Code improvements + Added new Dialogs

Disabled overrides
This commit is contained in:
Valentino Orlandi 2022-07-09 18:12:04 +02:00
parent 8472e8ce97
commit 8303aedeb4
Signed by: elB4RTO
GPG key ID: 1719E976DB2D4E71
2 changed files with 96 additions and 60 deletions

View file

@ -12,6 +12,16 @@ DialogSec::DialogSec()
//////////////////
//// DATABASE ////
//////////////////
void DialogSec::errSqlDriverNotFound( QWidget *parent, const QString& driver )
{
std::ignore=
QMessageBox::critical(parent,
t_DB_DRIVER_NOT_FOUND,
QString("%1:\n%2\n\n%3")
.arg( m_DB_DRIVER_NOT_FOUND, driver, f_ABORTING ),
QMessageBox::Ok );
}
/*bool DialogSec::choiceDatabaseNotFound( QWidget *parent, const std::string& db_name )
{
return choiceDatabaseNotFound( parent,QString::fromStdString( db_name ) );
@ -30,35 +40,35 @@ bool DialogSec::choiceDatabaseNotFound( QWidget *parent, const QString& db_name
return choice;
}
bool DialogSec::choiceDatabaseWrongTable( QWidget *parent, const QString& table_name )
bool DialogSec::choiceDatabaseWrongTable(QWidget *parent, const QString& db_name, const QString& table_name )
{
QString msg = QString("%1:\n%2").arg( m_DB_WRONG_TABLE_NAME, table_name );
return choiceDatabaseRenew( parent, t_DB_WRONG_TABLE_NAME, table_name );
QString msg = QString("%1:\n%2 -> %3").arg( m_DB_WRONG_TABLE_NAME, db_name, table_name );
return choiceDatabaseRenew( parent, t_DB_WRONG_TABLE_NAME, msg );
}
bool DialogSec::choiceDatabaseMissingTable( QWidget *parent, const QString& table_name )
bool DialogSec::choiceDatabaseMissingTable(QWidget *parent, const QString& db_name, const QString& table_name )
{
QString msg = QString("%1:\n%2").arg( m_DB_MISSING_TABLE, table_name );
QString msg = QString("%1:\n%2 -> %3").arg( m_DB_MISSING_TABLE, db_name, table_name );
return choiceDatabaseRenew( parent, t_DB_MISSING_TABLE, msg );
}
bool DialogSec::choiceDatabaseWrongColumn( QWidget *parent, const QString& column_name )
bool DialogSec::choiceDatabaseWrongColumn(QWidget *parent, const QString& db_name, const QString& table_name, const QString& column_name )
{
QString msg = QString("%1:\n%2").arg( m_DB_WRONG_COLUMN_NAME, column_name );
QString msg = QString("%1:\n%2 -> %3 -> %4").arg( m_DB_WRONG_COLUMN_NAME, db_name, table_name, column_name );
return choiceDatabaseRenew( parent, t_DB_WRONG_COLUMN_NAME, msg );
}
bool DialogSec::choiceDatabaseMissingColumn( QWidget *parent, const QString& column_name )
bool DialogSec::choiceDatabaseMissingColumn(QWidget *parent, const QString& db_name, const QString& table_name, const QString& column_name )
{
QString msg = QString("%1:\n%2").arg( m_DB_MISSING_COLUMN, column_name );
QString msg = QString("%1:\n%2 -> %3 -> %4").arg( m_DB_MISSING_COLUMN, db_name, table_name, column_name );
return choiceDatabaseRenew( parent, t_DB_MISSING_COLUMN, msg );
}
bool DialogSec::choiceDatabaseWrongDataType( QWidget *parent, const QString& data_type )
bool DialogSec::choiceDatabaseWrongDataType(QWidget *parent, const QString& db_name, const QString& table_name, const QString& column_name, const QString& data_type )
{
QString msg = QString("%1:\n%2").arg( m_DB_WRONG_COLUMN_TYPE, data_type );
QString msg = QString("%1:\n%2 -> %3 -> %4 -> %5").arg( m_DB_WRONG_COLUMN_TYPE, db_name, table_name, column_name, data_type );
return choiceDatabaseRenew( parent, t_DB_WRONG_COLUMN_TYPE, msg );
}
bool DialogSec::choiceDatabaseRenew(QWidget *parent, const QString& title, const QString& msg )
{
bool choice = false;
auto response = QMessageBox::question(parent,
auto response = QMessageBox::warning(parent,
title,
QString("%1\n\n%2")
.arg( msg, q_DB_RENEW ),
@ -68,6 +78,15 @@ bool DialogSec::choiceDatabaseRenew(QWidget *parent, const QString& title, const
}
return choice;
}
void DialogSec::msgDatabaseCreated( QWidget *parent, const QString& db_name )
{
std::ignore=
QMessageBox::information(parent,
t_DB_CREATED,
QString("%1:\n%2")
.arg( m_DB_CREATED, db_name ),
QMessageBox::Ok );
}
/*void DialogSec::errDatabaseNotReadable( QWidget *parent, const std::string& db_name )
{
@ -159,10 +178,10 @@ void DialogSec::errDatabaseFailedExecuting(QWidget *parent, const QString& db_na
///////////////////
//// LOG FILES ////
///////////////////
void DialogSec::errFailedDefiningLogType( QWidget *parent, const std::string& file )
/*void DialogSec::errFailedDefiningLogType( QWidget *parent, const std::string& file )
{
errFailedDefiningLogType( parent, QString::fromStdString(file) );
}
}*/
void DialogSec::errFailedDefiningLogType( QWidget *parent, const QString& file )
{
std::ignore=
@ -174,10 +193,10 @@ void DialogSec::errFailedDefiningLogType( QWidget *parent, const QString& file )
}
void DialogSec::errUndefinedLogType( QWidget *parent, const std::string& file )
/*void DialogSec::errUndefinedLogType( QWidget *parent, const std::string& file )
{
errUndefinedLogType( parent, QString::fromStdString(file) );
}
}*/
void DialogSec::errUndefinedLogType( QWidget *parent, const QString& file )
{
std::ignore=
@ -188,10 +207,10 @@ void DialogSec::errUndefinedLogType( QWidget *parent, const QString& file )
QMessageBox::Ok );
}
bool DialogSec::choiceUndefinedLogType( QWidget *parent, const std::string& file )
/*bool DialogSec::choiceUndefinedLogType( QWidget *parent, const std::string& file )
{
return choiceUndefinedLogType( parent, QString::fromStdString(file) );
}
}*/
bool DialogSec::choiceUndefinedLogType( QWidget *parent, const QString& file )
{
bool choice;
@ -209,10 +228,10 @@ bool DialogSec::choiceUndefinedLogType( QWidget *parent, const QString& file )
}
int DialogSec::choiceFileAlreadyUsed( QWidget *parent, const std::string& msg )
/*int DialogSec::choiceFileAlreadyUsed( QWidget *parent, const std::string& msg )
{
return choiceFileAlreadyUsed( parent, QString::fromStdString(msg) );
}
}*/
int DialogSec::choiceFileAlreadyUsed( QWidget *parent, const QString& msg )
{
int choice;
@ -255,10 +274,10 @@ int DialogSec::choiceFileSizeWarning( QWidget *parent, const QString& msg )
}
void DialogSec::errFailedReadFile(QWidget *parent, const std::string& file , const bool skipping)
/*void DialogSec::errFailedReadFile(QWidget *parent, const std::string& file , const bool skipping)
{
errFailedReadFile( parent, QString::fromStdString( file ), skipping );
}
}*/
void DialogSec::errFailedReadFile(QWidget *parent, const QString& file , const bool skipping )
{
std::ignore=
@ -270,11 +289,10 @@ void DialogSec::errFailedReadFile(QWidget *parent, const QString& file , const b
}
void DialogSec::warnEmptyFile( QWidget *parent, const std::string& file )
/*void DialogSec::warnEmptyFile( QWidget *parent, const std::string& file )
{
warnEmptyFile( parent, QString::fromStdString( file ) );
}
}*/
void DialogSec::warnEmptyFile( QWidget *parent, const QString& file )
{
std::ignore=
@ -285,12 +303,22 @@ void DialogSec::warnEmptyFile( QWidget *parent, const QString& file )
QMessageBox::Ok );
}
void DialogSec::warnFileNotReadable( QWidget *parent, const QString& file )
{
std::ignore=
QMessageBox::warning(parent,
t_FILE_NOT_READABLE,
QString("%1:\n%2\n\n%3")
.arg( m_FILE_NOT_READABLE, file, f_SKIPPING ),
QMessageBox::Ok );
}
bool DialogSec::choiceSelectedFileNotFound(QWidget *parent, const std::string& file )
/*bool DialogSec::choiceSelectedFileNotFound(QWidget *parent, const std::string& file )
{
return choiceSelectedFileNotFound( parent, QString::fromStdString( file ) );
}
}*/
bool DialogSec::choiceSelectedFileNotFound(QWidget *parent, const QString& file )
{
bool proceed = false;
@ -310,10 +338,10 @@ bool DialogSec::choiceSelectedFileNotFound(QWidget *parent, const QString& file
/////////////////////
//// PERMISSIONS ////
/////////////////////
void DialogSec::errDirNotExists(QWidget *parent, const std::string& dir )
/*void DialogSec::errDirNotExists(QWidget *parent, const std::string& dir )
{
errDirNotExists( parent, QString::fromStdString( dir ) );
}
}*/
void DialogSec::errDirNotExists(QWidget *parent, const QString& dir )
{
std::ignore=
@ -325,10 +353,10 @@ void DialogSec::errDirNotExists(QWidget *parent, const QString& dir )
}
bool DialogSec::choiceDirNotExists(QWidget *parent, const std::string& dir )
/*bool DialogSec::choiceDirNotExists(QWidget *parent, const std::string& dir )
{
return choiceDirNotExists( parent, QString::fromStdString( dir ) );
}
}*/
bool DialogSec::choiceDirNotExists(QWidget *parent, const QString& dir )
{
bool proceed = false;
@ -348,10 +376,10 @@ bool DialogSec::choiceDirNotExists(QWidget *parent, const QString& dir )
//////////////////
//// GENERICS ////
//////////////////
void DialogSec::warnGeneric(QWidget *parent, const std::string& msg, const bool report_msg )
/*void DialogSec::warnGeneric(QWidget *parent, const std::string& msg, const bool report_msg )
{
warnGeneric( parent, QString::fromStdString( msg ), report_msg );
}
}*/
void DialogSec::warnGeneric(QWidget *parent, const QString& msg, const bool report_msg )
{
QString footer = "";
@ -368,10 +396,10 @@ void DialogSec::warnGeneric(QWidget *parent, const QString& msg, const bool repo
void DialogSec::errGeneric(QWidget *parent, const std::string& msg, const bool report_msg )
/*void DialogSec::errGeneric(QWidget *parent, const std::string& msg, const bool report_msg )
{
errGeneric( parent, QString::fromStdString( msg ), report_msg );
}
}*/
void DialogSec::errGeneric(QWidget *parent, const QString& msg, const bool report_msg )
{
QString footer = "";

View file

@ -11,18 +11,20 @@ static QString
q_CONTINUE = QMessageBox::tr("Continue?"),
q_YOUR_CHOICE = QMessageBox::tr("Your choice?"),
q_DA = QMessageBox::tr("Discard it and continue, or Abort all and exit?"),
q_DIA = QMessageBox::tr("Ignore the warning and use it anyway,\nDiscard it and continue, or Abort all and exit?"),
q_DIA = QMessageBox::tr("Ignore the warning and use it anyway, Discard it and continue, or Abort all and exit?"),
q_DB_CREATE = QMessageBox::tr("Create a new database?"),
q_DB_RENEW = QMessageBox::tr("This database will renamed with a trailing '.copy'\nand a new one will be created. Continue?"),
q_DB_RENEW = QMessageBox::tr("This database will renamed with a trailing '.copy' and a new one will be created. Continue?"),
// titles
t_ERROR_OCCURED = QMessageBox::tr("An error occured"),
t_ERROR_RENAMING = QMessageBox::tr("Failed renaming"),
t_DB_FAILED_CREATING = QMessageBox::tr("Failed creating database"),
t_DB_FAILED_OPENING = QMessageBox::tr("Failed opening database"),
t_DB_FAILED_EXECUTING = QMessageBox::tr("Failed executing on database"),
t_DB_DRIVER_NOT_FOUND = QMessageBox::tr("QSql driver not found"),
t_DB_CREATED = QMessageBox::tr("Database created"),
t_DB_FAILED_CREATING = QMessageBox::tr("Failed creating database"),
t_DB_FAILED_OPENING = QMessageBox::tr("Failed opening database"),
t_DB_FAILED_EXECUTING = QMessageBox::tr("Failed executing on database"),
t_DB_WRONG_TABLE_NAME = QMessageBox::tr("Unexpected table"),
t_DB_MISSING_TABLE = QMessageBox::tr("Table not found"),
t_DB_WRONG_COLUMN_NAME = QMessageBox::tr("Unexpected column"),
@ -53,15 +55,18 @@ static QString
m_FILE_NOT_EXISTS = QMessageBox::tr("The file does not exists"),
m_DIR_NOT_EXISTS = QMessageBox::tr("The directory does not exists"),
m_FILE_EMPTY = QMessageBox::tr("The file is blank"),
m_FILE_FAILED_READ = QMessageBox::tr("An error accured while reading the file"),
m_FILE_EMPTY = QMessageBox::tr("The file is blank"),
m_FILE_NOT_READABLE = QMessageBox::tr("The file is not readable"),
m_FILE_FAILED_READ = QMessageBox::tr("An error accured while reading the file"),
m_FILE_ALREADY_USED = QMessageBox::tr("The file has probably been used already"),
m_FILE_SIZE_WARNING = QMessageBox::tr("The file's size exceeds the warning size"),
m_DB_NOT_FOUND = QMessageBox::tr("Failed to find the database file"),
m_DB_DRIVER_NOT_FOUND = QMessageBox::tr("Failed to retrieve the driver neede to handle the database"),
m_DB_NOT_FOUND = QMessageBox::tr("Failed to retrieve the database file"),
m_DB_NOT_READABLE = QMessageBox::tr("The database file is not readable"),
m_DB_NOT_WRITABLE = QMessageBox::tr("The database file is not writable"),
m_DB_CREATED = QMessageBox::tr("Successfully created a new database"),
m_DB_FAILED_CREATING = QMessageBox::tr("An error occured while creating the database"),
m_DB_FAILED_OPENING = QMessageBox::tr("An error occured while opening the database"),
m_DB_FAILED_EXECUTING = QMessageBox::tr("An error occured while executing a statement on the database"),
@ -69,8 +74,8 @@ static QString
m_DB_FAILED_ERRMSG = QMessageBox::tr("SQLite error message"),
m_DB_WRONG_TABLE_NAME = QMessageBox::tr("The database contains an unexpected table"),
m_DB_MISSING_TABLE = QMessageBox::tr("It seems that the database is missing a table"),
m_DB_WRONG_COLUMN_NAME = QMessageBox::tr("The database contains an unexpected column"),
m_DB_MISSING_COLUMN = QMessageBox::tr("It seems that the table is missing a column"),
m_DB_WRONG_COLUMN_NAME = QMessageBox::tr("The database contains an unexpected column"),
m_DB_WRONG_COLUMN_TYPE = QMessageBox::tr("A column has an unexpected data-type"),
m_LOGTYPE_FAILED = QMessageBox::tr("Failed to determine if Access or Error type file"),
@ -93,24 +98,26 @@ public:
DialogSec();
static void warnGeneric( QWidget *parent, const QString& message, const bool report_msg=false );
static void warnGeneric( QWidget *parent, const std::string& message, const bool report_msg=false );
//static void warnGeneric( QWidget *parent, const std::string& message, const bool report_msg=false );
static void errGeneric( QWidget *parent, const QString& message, const bool report_msg=false );
static void errGeneric( QWidget *parent, const std::string& message, const bool report_msg=false );
//static void errGeneric( QWidget *parent, const std::string& message, const bool report_msg=false );
static void errRenaming( QWidget *parent, const QString& path );
// database
static void errSqlDriverNotFound( QWidget *parent, const QString& driver );
static bool choiceDatabaseNotFound( QWidget *parent, const QString& db_name );
//static bool choiceDatabaseNotFound( QWidget *parent, const std::string& db_name );
static bool choiceDatabaseWrongTable( QWidget *parent, const QString& table_name );
static bool choiceDatabaseMissingTable( QWidget *parent, const QString& table_name );
static bool choiceDatabaseWrongColumn( QWidget *parent, const QString& column_name );
static bool choiceDatabaseMissingColumn( QWidget *parent, const QString& column_name );
static bool choiceDatabaseWrongDataType( QWidget *parent, const QString& data_type );
static bool choiceDatabaseWrongTable( QWidget *parent, const QString& db_name, const QString& table_name );
static bool choiceDatabaseMissingTable( QWidget *parent, const QString& db_name, const QString& table_name );
static bool choiceDatabaseWrongColumn( QWidget *parent, const QString& db_name, const QString& table_name, const QString& column_name );
static bool choiceDatabaseMissingColumn( QWidget *parent, const QString& db_name, const QString& table_name, const QString& column_name );
static bool choiceDatabaseWrongDataType( QWidget *parent, const QString& db_name, const QString& table_name, const QString& column_name, const QString& data_type );
static void errDatabaseNotReadable( QWidget *parent, const QString& db_name );
//static void errDatabaseNotReadable( QWidget *parent, const std::string& db_name );
static void errDatabaseNotWritable( QWidget *parent, const QString& db_name );
//static void errDatabaseNotWritable( QWidget *parent, const std::string& db_name );
static void msgDatabaseCreated( QWidget *parent, const QString& db_name );
static void errDatabaseFailedCreating( QWidget *parent, const QString& db_name, const QString& err_msg );
//static void errDatabaseFailedCreating( QWidget *parent, const std::string& db_name, const std::string& err_msg );
static void errDatabaseFailedOpening( QWidget *parent, const QString& db_name, const QString& err_msg );
@ -120,18 +127,18 @@ public:
// LogsList
static bool choiceSelectedFileNotFound( QWidget *parent, const QString& file );
static bool choiceSelectedFileNotFound( QWidget *parent, const std::string& file );
//static bool choiceSelectedFileNotFound( QWidget *parent, const std::string& file );
// log files type
static void errFailedDefiningLogType( QWidget *parent, const QString& file );
static void errFailedDefiningLogType( QWidget *parent, const std::string& file );
//static void errFailedDefiningLogType( QWidget *parent, const std::string& file );
static void errUndefinedLogType( QWidget *parent, const QString& file );
static void errUndefinedLogType( QWidget *parent, const std::string& file );
//static void errUndefinedLogType( QWidget *parent, const std::string& file );
static bool choiceUndefinedLogType( QWidget *parent, const QString& file );
static bool choiceUndefinedLogType( QWidget *parent, const std::string& file );
//static bool choiceUndefinedLogType( QWidget *parent, const std::string& file );
// log files hash
static int choiceFileAlreadyUsed( QWidget *parent, const QString& msg );
static int choiceFileAlreadyUsed( QWidget *parent, const std::string& msg );
//static int choiceFileAlreadyUsed( QWidget *parent, const std::string& msg );
// log files size
static int choiceFileSizeWarning( QWidget *parent, const QString& msg );
//static int choiceFileSizeWarning( QWidget *parent, const std::string& msg );
@ -140,22 +147,23 @@ public:
static void errFileNotExists( QWidget *parent );
static void errFileNotReadable( QWidget *parent );
static void errFileNotWritable( QWidget *parent );
static void warnFileNotReadable( QWidget *parent, const QString& file );
static bool choiceFileNotExists( QWidget *parent );
static bool choiceFileNotReadable( QWidget *parent );
static bool choiceFileNotWritable( QWidget *parent );
// files actions
static void warnEmptyFile( QWidget *parent, const QString& file );
static void warnEmptyFile( QWidget *parent, const std::string& file );
//static void warnEmptyFile( QWidget *parent, const std::string& file );
static void errFailedReadFile( QWidget *parent, const QString& file, const bool skipping=false );
static void errFailedReadFile( QWidget *parent, const std::string& file, const bool skipping=false );
//static void errFailedReadFile( QWidget *parent, const std::string& file, const bool skipping=false );
// folders permissions
static void errDirNotExists( QWidget *parent, const QString& dir );
static void errDirNotExists( QWidget *parent, const std::string& dir );
//static void errDirNotExists( QWidget *parent, const std::string& dir );
static void warnDirNotReadable( QWidget *parent );
static void warnDirNotWritable( QWidget *parent );
static bool choiceDirNotExists( QWidget *parent, const QString& dir );
static bool choiceDirNotExists( QWidget *parent, const std::string& dir );
//static bool choiceDirNotExists( QWidget *parent, const std::string& dir );
static void choiceDirNotReadable( QWidget *parent );
static void choiceDirNotWritable( QWidget *parent );