TDE
/
klamav
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/klamav.git
0
0
Fork 0
Code Issues Releases Wiki Activity

Reworked First-Run Wizard.

Browse Source 
It was made more compact because it doesn't make sense to have a
full-blown two-page wizard for setting up two paths and showing a
checkbox.

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
pull/24/head
Mavridis Philippe 3 years ago
parent 3a5d06908c
commit cbf067eac1
No known key found for this signature in database
GPG Key ID: F8D2D7E2F989A494
3 changed files with 151 additions and 277 deletions
Show Stats Download Patch File Download Diff File

327
src/firstrunwizard.ui
View File

File diff suppressed because one or more lines are too long

26
src/firstrunwizard.ui.h
Unescape View File

@ -28,9 +28,10 @@ void
FirstRunWizard::init() FirstRunWizard::init()
{ {
//aesthetics // remove unwanted buttons
cancelButton()->setFixedSize( cancelButton()->sizeHint() ); cancelButton()->hide();
helpButton()->hide(); helpButton()->hide();
backButton()->hide();
TQString homepath = getenv("HOME"); TQString homepath = getenv("HOME");
databasepath = homepath + "/.klamav/database"; databasepath = homepath + "/.klamav/database";
@ -39,29 +40,10 @@ FirstRunWizard::init()
quarantinepath = homepath + "/.klamav/quarantine"; quarantinepath = homepath + "/.klamav/quarantine";
QuarantineLocation->setURL(quarantinepath); QuarantineLocation->setURL(quarantinepath);
preview->setPixmap( TQPixmap(locate("data", "klamav/about/klam.png")) ); setFinishEnabled ( WizardPage, true );
// picture1->setPixmap( getJPG( "amarok_rocks" ) );
// picture4->setPixmap( *picture1->pixmap() );
setFinishEnabled ( WizardPage_1, true );
} }
void
FirstRunWizard::showPage( TQWidget *w ) //virtual
{
TQWizard::showPage( w );
cancelButton()->setText( w == WizardPage ? i18n("&Skip") : i18n("&Cancel") );
}
// void // void
// FirstRunWizard::destroy() // FirstRunWizard::destroy()
// { // {

75
src/klamav.cpp
Unescape View File

@ -346,52 +346,51 @@ void Klamav::firstRunWizard() {
TQString homepath = getenv("HOME"); TQString homepath = getenv("HOME");
TQString defaultdb = homepath + "/.klamav/database"; TQString defaultdb = homepath + "/.klamav/database";
TQString defaultquar = homepath + "/.klamav/quarantine"; TQString defaultquar = homepath + "/.klamav/quarantine";
if( wizard.exec() != TQDialog::Rejected ){
TDEConfig* config = TDEGlobal::config(); // Execute wizard
wizard.exec();
config->setGroup("Freshklam"); // These are run after the wizard is finished
TDEConfig* config = TDEGlobal::config();
config->setGroup("Freshklam");
TQString wizardDBPath = wizard.databasePath().path(-1); TQString wizardDBPath = wizard.databasePath().path(-1);
TQString wizardTQRPath = wizard.quarantinePath().path(-1); TQString wizardTQRPath = wizard.quarantinePath().path(-1);
/* kdDebug() << wizard.databasePath() << endl;
kdDebug() << wizard.defaultDatabasePath() << endl;*/ //Configure Database Path
//Configure Database Path TQStringList lastDownloadPaths;
TQStringList lastDownloadPaths; if ((wizardDBPath != "") && (TQDir::cleanDirPath(wizardDBPath) != defaultdb)){
if ((wizardDBPath != "") && (TQDir::cleanDirPath(wizardDBPath) != defaultdb)){ lastDownloadPaths.prepend( TQString("%1").arg(wizardDBPath));
lastDownloadPaths.prepend( TQString("%1").arg(wizardDBPath)); checkDir(wizardDBPath);
checkDir(wizardDBPath); }else{
}else{ lastDownloadPaths.prepend( TQString("%1").arg(wizard.defaultDatabasePath()));
lastDownloadPaths.prepend( TQString("%1").arg(wizard.defaultDatabasePath())); createDefaultKlamAVDir("database");
createDefaultKlamAVDir("database"); }
} config->writeEntry("lastDownloadPaths", lastDownloadPaths);
config->writeEntry("lastDownloadPaths", lastDownloadPaths); config->sync();
config->sync();
//Configure Quarantine Path //Configure Quarantine Path
TQStringList lastQuarLocations; TQStringList lastQuarLocations;
config->setGroup("Kuarantine"); config->setGroup("Kuarantine");
/* kdDebug() << wizard.quarantinePath() << endl; if ((wizardTQRPath != "") && (TQDir::cleanDirPath(wizardTQRPath) != defaultquar)){
kdDebug() << wizard.defaultQuarantinePath() << endl; lastQuarLocations.prepend( TQString("%1").arg(wizardTQRPath));
kdDebug() << defaultquar << endl;*/ checkDir(wizardTQRPath);
if ((wizardTQRPath != "") && (TQDir::cleanDirPath(wizardTQRPath) != defaultquar)){ }else{
lastQuarLocations.prepend( TQString("%1").arg(wizardTQRPath)); lastQuarLocations.prepend( TQString("%1").arg(wizard.defaultQuarantinePath()));
checkDir(wizardTQRPath); createDefaultKlamAVDir("quarantine");
}else{ }
lastQuarLocations.prepend( TQString("%1").arg(wizard.defaultQuarantinePath())); config->writeEntry("KuarantineLocations", lastQuarLocations);
createDefaultKlamAVDir("quarantine"); config->sync();
}
config->writeEntry("KuarantineLocations", lastQuarLocations);
config->sync();
if (wizard.downloadDatabase()){
kdDebug() << "downloading database" << endl;
downloadDBForWizard = true;
}
if (wizard.downloadDatabase()){
kdDebug() << "downloading database" << endl;
downloadDBForWizard = true;
} }
} }
void Klamav::createDefaultKlamAVDir(TQString type){ void Klamav::createDefaultKlamAVDir(TQString type){

Write Preview
Loading…
Cancel
Save