diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/eventsrc | 22 | ||||
| -rw-r--r-- | src/freshklam.cpp | 14 | ||||
| -rw-r--r-- | src/scanviewer.cpp | 4 |
3 files changed, 14 insertions, 26 deletions
diff --git a/src/eventsrc b/src/eventsrc index 2594053..17e7e9e 100644 --- a/src/eventsrc +++ b/src/eventsrc @@ -3,43 +3,31 @@ IconName=klamav Comment=KlamAV [UpdatedDatabase] -Name=UpdatedDatabase +Name=Virus Database Updated Comment=The Virus Database was updated default_sound=k3b_success1.wav default_presentation=16 -# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32 [DatabaseUpToDate] -Name=DatabaseUpToDate +Name=Database Up To Date Comment=The Virus Database is up to date. default_sound=k3b_success1.wav default_presentation=16 -# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32 [ScanCompleteNoVirus] -Name=ScanCompleteNoVirus +Name=Scan Complete - No Virus Found Comment=Scan Complete - No Viruses Found! default_sound=k3b_success1.wav default_presentation=16 -# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32 [ScanCompleteNoVirusButErrors] -Name=ScanCompleteNoVirusButErrors +Name=Scan Complete - No Virus But Errors Comment=Scan Complete - No Viruses Found But Some Errors Encountered! default_sound=k3b_success1.wav default_presentation=16 -# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32 [ScanAccessDenied] -Name=ScanAccessDenied +Name=Scan - Access Denied Comment=Scan - Access Denied! default_sound=k3b_success1.wav default_presentation=16 -# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32 - -[ClamAVOutDated] -Name=ClamAVOutDated -Comment=Your copy of ClamAV is out of date! Please Upgrade! -default_sound=k3b_success1.wav -default_presentation=16 -# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32 diff --git a/src/freshklam.cpp b/src/freshklam.cpp index 18fc5cd..202b57c 100644 --- a/src/freshklam.cpp +++ b/src/freshklam.cpp @@ -296,30 +296,30 @@ void Freshklam::processOutput() // -> Database updated if ((pos = item2.find("daily.cvd updated")) != -1 || (pos = item2.find("daily.cld updated")) != -1 ){ CollectionDB::instance()->insertEvent("Updates","Daily Database Updated",dir_combo->url()); - KNotifyClient::event(tdemain->_tray->winId(),"UpdatedDatabase", "Updated Daily DB (1 out of 3)."); + KNotifyClient::event(tdemain->_tray->winId(),"Virus Database Updated", "Updated Daily DB (1 out of 3)."); updateMailClient(); } if ((pos = item2.find("main.cvd updated")) != -1 || (pos = item2.find("main.cld updated")) != -1 ){ - KNotifyClient::event(tdemain->_tray->winId(),"UpdatedDatabase", "Updated Main DB (2 out of 3)."); + KNotifyClient::event(tdemain->_tray->winId(),"Virus Database Updated", "Updated Main DB (2 out of 3)."); } if ((pos = item2.find("bytecode.cvd updated")) != -1 || (pos = item2.find("bytecode.cld updated")) != -1 ){ - KNotifyClient::event(tdemain->_tray->winId(),"UpdatedDatabase", "Updated Bytecode DB (3 out of 3)."); + KNotifyClient::event(tdemain->_tray->winId(),"Virus Database Updated", "Updated Bytecode DB (3 out of 3)."); } // -> Database already up to date if ((pos = item2.find("daily.cvd database is up to date")) != -1 || (pos = item2.find("daily.cld database is up to date")) != -1){ - KNotifyClient::event(tdemain->_tray->winId(),"DatabaseUpToDate", "Daily DB Up To Date (1 out of 3)."); + KNotifyClient::event(tdemain->_tray->winId(),"Database Up To Date", "Daily DB Up To Date (1 out of 3)."); updateMailClient(); } if ((pos = item2.find("main.cvd database is up to date")) != -1 || (pos = item2.find("main.cld database is up to date")) != -1){ - KNotifyClient::event(tdemain->_tray->winId(),"DatabaseUpToDate", "Main DB Up To Date (2 out of 3)."); + KNotifyClient::event(tdemain->_tray->winId(),"Database Up To Date", "Main DB Up To Date (2 out of 3)."); } if ((pos = item2.find("bytecode.cvd database is up to date")) != -1 || (pos = item2.find("bytecode.cld database is up to date")) != -1){ - KNotifyClient::event(tdemain->_tray->winId(),"DatabaseUpToDate", "Bytecode DB Up To Date (3 out of 3)."); + KNotifyClient::event(tdemain->_tray->winId(),"Database Up To Date", "Bytecode DB Up To Date (3 out of 3)."); } @@ -416,7 +416,7 @@ void Freshklam::finish() TDEIO::NetAccess::del(tempFileName,NULL); CollectionDB::instance()->insertEvent("Updates","Virus Database Updated",dir_combo->url()); - KNotifyClient::event(tdemain->_tray->winId(),"UpdatedDatabase", "Virus Database updated successfully."); + KNotifyClient::event(tdemain->_tray->winId(),"Virus Database Updated", "Virus Database updated successfully."); tdemain->EnableFreshklam->setEnabled(TRUE); tdemain->DisableFreshklam->setEnabled(FALSE); diff --git a/src/scanviewer.cpp b/src/scanviewer.cpp index a8b94ea..d61f4a4 100644 --- a/src/scanviewer.cpp +++ b/src/scanviewer.cpp @@ -609,9 +609,9 @@ void ScanViewer::childExited() tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_safe")); TQTimer::singleShot( 10000, this, SLOT(resetSysTray()) ); if (!(errorsEncountered)) - KNotifyClient::event(tdemain->_tray->winId(),"ScanCompleteNoVirus", i18n("Scan Complete - No Viruses Found!")); + KNotifyClient::event(tdemain->_tray->winId(),"Scan Complete - No Virus Found", i18n("Scan Complete - No Viruses Found!")); else - KNotifyClient::event(tdemain->_tray->winId(),"ScanCompleteNoVirusButErrors", i18n("Scan Complete - No Viruses Found But Some Errors Encountered!")); + KNotifyClient::event(tdemain->_tray->winId(),"Scan Complete - No Virus But Errors", i18n("Scan Complete - No Viruses Found But Some Errors Encountered!")); }else if(status == 1){ tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_found")); |