Improvements

Code improvements.
Added new dialog: 'warnInvalidItemBW' and 'errFailedApplyingConfigs'.
This commit is contained in:
Valentino Orlandi 2022-10-10 21:16:12 +02:00
parent cec7a99de5
commit 0defc4740d
Signed by: elB4RTO
GPG Key ID: 1719E976DB2D4E71
2 changed files with 47 additions and 7 deletions

View File

@ -105,10 +105,22 @@ void DialogSec::errConfDirNotWritable( const QString& dir, QWidget *parent )
}
void DialogSec::errFailedApplyingConfigs( const QString& msg, QWidget *parent )
{
DialogMsg dialog = DialogMsg(
DialogSec::tr("Failed applying configuration"),
QString("%1\n%2").arg(
(msg=="") ? msg : QString("%1\n").arg(msg),
DialogSec::tr("Aborting") ),
"", 2, parent );
std::ignore = dialog.exec();
}
//////////////////
//// LANGUAGE ////
//////////////////
///////////////////////
//// VERSION CHECK ////
///////////////////////
void DialogSec::errVersionCheckFailed( const int& err_code, QWidget *parent )
{
QString msg;
@ -207,6 +219,19 @@ void DialogSec::errHelpNotReadable( const QString& link, QWidget *parent )
//////////////////////////
//// WARN/BLACK LISTS ////
//////////////////////////
void DialogSec::warnInvalidItemBW( QWidget *parent )
{
DialogMsg dialog = DialogMsg(
DialogSec::tr("Invalid string"),
DialogSec::tr("The given string is invalid and cannot be added to the list\n\nPlease correct it and retry"),
"", 1, parent );
std::ignore = dialog.exec();
}
//////////////////
//// DATABASE ////
@ -401,10 +426,8 @@ void DialogSec::errInvalidLogFormatString( const QString& msg, QWidget *parent )
{
DialogMsg dialog = DialogMsg(
DialogSec::tr("Invalid log format string"),
QString("%1\n\n%2").arg(
msg,
DialogSec::tr("Please check that no error is thrown from your WebServer\nIf it gets accepted, please check the presence of a typo here\nIf everything is fine, please report this issue") ),
"", 2, parent );
DialogSec::tr("Please check that no error is thrown by your WebServer\nIf it gets accepted, please check the presence of a typo here\nIf everything is fine, please report this issue"),
msg, 2, parent );
std::ignore = dialog.exec();
}
@ -483,6 +506,18 @@ const int DialogSec::choiceFileSizeWarning( const QString& msg, QWidget *parent
const int choice = dialog.exec();
return choice;
}
const bool DialogSec::choiceFileSizeWarning2( const QString& msg, QWidget *parent )
{
DialogBool dialog = DialogBool(
DialogSec::tr("File exceeds warning size"),
QString("%1:\n%2\n\n%3").arg(
DialogSec::tr("The file's size exceeds the warning size"),
msg,
DialogSec::tr("Proceed anyway?") ),
parent );
const bool choice = dialog.exec();
return choice;
}
void DialogSec::errFailedReadFile( const QString& file , const bool& skipping, QWidget *parent )

View File

@ -29,6 +29,7 @@ public:
static void errConfFileNotReadable( const QString& file, QWidget *parent=nullptr );
static void errConfFileNotWritable( const QString& file, QWidget *parent=nullptr );
static void errConfDirNotWritable( const QString& dir, QWidget *parent=nullptr );
static void errFailedApplyingConfigs( const QString& msg="", QWidget *parent=nullptr );
// update
static void errVersionCheckFailed( const int& err_code, QWidget *parent=nullptr );
@ -62,12 +63,16 @@ public:
// LogsList
static const int choiceSelectedFileNotFound( const QString& file, QWidget *parent=nullptr );
// Warn/Black lists
static void warnInvalidItemBW( QWidget *parent=nullptr );
// log files type
static void errFailedDefiningLogType( const QString& file, QWidget *parent=nullptr );
// log files hash
static const int choiceFileAlreadyUsed( const QString& msg, QWidget *parent=nullptr );
// log files size
static const int choiceFileSizeWarning( const QString& msg, QWidget *parent=nullptr );
static const bool choiceFileSizeWarning2( const QString& msg, QWidget *parent=nullptr );
// log format string invalid
static void errInvalidLogFormatString( const QString& msg, QWidget *parent=nullptr );