View | Details | Raw Unified
Collapse All | Expand All

(-) klamav-0.41-source/klamav-0.41/src/sigtool.cpp.org (-80 / +80 lines)
 Lines 150-157    Link Here 
		tab->setCurrentPage(2);
		tab->setCurrentPage(2);
		freshklam->slotSearch();
		freshklam->slotSearch();
	}
	}
        if (downloadClamAVForWizard)
//        if (downloadClamAVForWizard)
            freshklam->checkForNewClamAVNow();
//            freshklam->checkForNewClamAVNow();
	//klamdb->shouldIShow();
	//klamdb->shouldIShow();
	CollectionDB::instance()->insertEvent("Launch","KlamAV Launched");
	CollectionDB::instance()->insertEvent("Launch","KlamAV Launched");
 Lines 291-300    Link Here 
                kdDebug() << "downloading database" << endl;
                kdDebug() << "downloading database" << endl;
                downloadDBForWizard = true;
                downloadDBForWizard = true;
            }
            }
            if (wizard.downloadClamAV()){
//            if (wizard.downloadClamAV()){
                kdDebug() << "downloading clamav" << endl;
//                kdDebug() << "downloading clamav" << endl;
                downloadClamAVForWizard = true;
//                downloadClamAVForWizard = true;
            }
//            }
        }
        }
 Lines 112-155    Link Here 
            KDialog::spacingHint(), "vbox");
            KDialog::spacingHint(), "vbox");
    //Proxy Widget
    //Proxy Widget
    QGroupBox *software_group = new QGroupBox(i18n("Software Updates"), this);
//    QGroupBox *software_group = new QGroupBox(i18n("Software Updates"), this);
    vbox->addWidget(software_group);
//    vbox->addWidget(software_group);
    QGridLayout *software_layout = new QGridLayout( software_group, 5, 2, KDialog::spacingHint(),
//    QGridLayout *software_layout = new QGridLayout( software_group, 5, 2, KDialog::spacingHint(),
            KDialog::spacingHint(), "software_layout");
//            KDialog::spacingHint(), "software_layout");
    software_layout->addRowSpacing(0, software_group->fontMetrics().height());
//    software_layout->addRowSpacing(0, software_group->fontMetrics().height());
    software_layout->setColStretch(0, 1);
//    software_layout->setColStretch(0, 1);
    software_layout->setColStretch(1, 1);
//    software_layout->setColStretch(1, 1);
    //Dazuko
    //Dazuko
    QWidget *dazuko_hlp = new QWidget( software_group );
//    QWidget *dazuko_hlp = new QWidget( software_group );
    software_layout->addMultiCellWidget(dazuko_hlp, 1,2, 0,2);
//    software_layout->addMultiCellWidget(dazuko_hlp, 1,2, 0,2);
    QGridLayout *dazuko_dir_layout = new QGridLayout(dazuko_hlp,2,2, KDialog::spacingHint() );
//    QGridLayout *dazuko_dir_layout = new QGridLayout(dazuko_hlp,2,2, KDialog::spacingHint() );
    clamav_box = new QCheckBox(i18n("Update ClamAV Automatically"), dazuko_hlp);
//    clamav_box = new QCheckBox(i18n("Update ClamAV Automatically"), dazuko_hlp);
    clamav_box->setMinimumWidth(clamav_box->sizeHint().width());
//    clamav_box->setMinimumWidth(clamav_box->sizeHint().width());
    dazuko_dir_layout->addWidget(clamav_box,0,0);
//    dazuko_dir_layout->addWidget(clamav_box,0,0);
    klamav_box = new QCheckBox(i18n("Update KlamAV Automatically"), dazuko_hlp);
//    klamav_box = new QCheckBox(i18n("Update KlamAV Automatically"), dazuko_hlp);
    klamav_box->setMinimumWidth(klamav_box->sizeHint().width());
//    klamav_box->setMinimumWidth(klamav_box->sizeHint().width());
    dazuko_dir_layout->addWidget(klamav_box,0,1);
//    dazuko_dir_layout->addWidget(klamav_box,0,1);
    clamav_options = new QPushButton (i18n( "Upgrade ClamAV Now" ), dazuko_hlp);
//    clamav_options = new QPushButton (i18n( "Upgrade ClamAV Now" ), dazuko_hlp);
    dazuko_dir_layout->addWidget(clamav_options,1,0);
//    dazuko_dir_layout->addWidget(clamav_options,1,0);
    clamav_options->setFixedSize(clamav_options->sizeHint());
//    clamav_options->setFixedSize(clamav_options->sizeHint());
    connect( clamav_options, SIGNAL( clicked() ), this,
//    connect( clamav_options, SIGNAL( clicked() ), this,
		SLOT( checkForNewClamAVNow() ) );
//		SLOT( checkForNewClamAVNow() ) );
    klamav_options = new QPushButton (i18n( "Upgrade KlamAV Now" ), dazuko_hlp);
//    klamav_options = new QPushButton (i18n( "Upgrade KlamAV Now" ), dazuko_hlp);
    dazuko_dir_layout->addWidget(klamav_options,1,1);
//    dazuko_dir_layout->addWidget(klamav_options,1,1);
    klamav_options->setFixedSize(klamav_options->sizeHint());
//    klamav_options->setFixedSize(klamav_options->sizeHint());
    connect( klamav_options, SIGNAL( clicked() ), this,
//    connect( klamav_options, SIGNAL( clicked() ), this,
		SLOT( checkForNewKlamAVNow() ) );
//		SLOT( checkForNewKlamAVNow() ) );
 Lines 354-377    Link Here 
    }
    }
    if ((pos = item2.find("Recommended version:")) != -1){
//    if ((pos = item2.find("Recommended version:")) != -1){
        pos2 = item2.find('\n',pos);
//        pos2 = item2.find('\n',pos);
        QString version = item2.mid((pos+20),pos2 - (pos+20)).stripWhiteSpace();
//        QString version = item2.mid((pos+20),pos2 - (pos+20)).stripWhiteSpace();
        if ((clamav_box->isChecked())){
//        if ((clamav_box->isChecked())){
    
    
            int result = KMessageBox::warningContinueCancel(this, i18n( "It looks like your version of the ClamAV engine is out of date! ClamAV-%1 is the most recent version of ClamAV available. Would you like to KlamAV to download and compile it for you?").arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version));
//            int result = KMessageBox::warningContinueCancel(this, i18n( "It looks like your version of the ClamAV engine is out of date! ClamAV-%1 is the most recent version of ClamAV available. Would you like to KlamAV to download and compile it for you?").arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version),i18n( "Download and Install ClamAV-%1" ).arg(version));
        
        
            switch (result) {
//            switch (result) {
                case 2 : 
//                case 2 : 
                    break;
//                    break;
                case 5 : 
//                case 5 : 
                    updater->downloadComponent("clamav",version,"tar.gz");
//                    updater->downloadComponent("clamav",version,"tar.gz");
            }
//            }
        }else if (!(clamav_box->isChecked()))
//        }else if (!(clamav_box->isChecked()))
            KNotifyClient::event(kmain->_tray->winId(),"ClamAVOutDated", QString("Your copy of ClamAV is out of date! Please Upgrade to ClamAV %1!").arg(version));
//            KNotifyClient::event(kmain->_tray->winId(),"ClamAVOutDated", QString("Your copy of ClamAV is out of date! Please Upgrade to ClamAV %1!").arg(version));
    }
//    }
}
}
 Lines 720-739    Link Here 
        check_combo->setEnabled(false);
        check_combo->setEnabled(false);
    }
    }
    if ((config->readEntry("AutoUpdateClamAV")) == "Yes"){
//    if ((config->readEntry("AutoUpdateClamAV")) == "Yes"){
        clamav_box->setChecked(true);
//        clamav_box->setChecked(true);
    }else{
//    }else{
        clamav_box->setChecked(false);
//        clamav_box->setChecked(false);
    }
//    }
//    if ((config->readEntry("AutoUpdateKlamAV")) == "Yes"){
//        klamav_box->setChecked(true);
//    }else{
//        klamav_box->setChecked(false);
//    }
    if ((config->readEntry("AutoUpdateKlamAV")) == "Yes"){
//    connect( clamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) );
        klamav_box->setChecked(true);
//    connect( klamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) );
    }else{
        klamav_box->setChecked(false);
    }
    connect( clamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) );
    connect( klamav_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) );
    connect( daemon_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) );
    connect( daemon_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) );
    connect( check_combo, SIGNAL(activated(int)), SLOT(handleChecks()) );
    connect( check_combo, SIGNAL(activated(int)), SLOT(handleChecks()) );
 Lines 756-772    Link Here 
    }
    }
    config->writeEntry("NoOfUpdates", check_combo->currentText());
    config->writeEntry("NoOfUpdates", check_combo->currentText());
    if (clamav_box->isChecked()){
//    if (clamav_box->isChecked()){
        config->writeEntry("AutoUpdateClamAV","Yes");
//        config->writeEntry("AutoUpdateClamAV","Yes");
    }else{
//    }else{
        config->writeEntry("AutoUpdateClamAV","No");
//        config->writeEntry("AutoUpdateClamAV","No");
    }
//    }
    if (klamav_box->isChecked()){
//    if (klamav_box->isChecked()){
        config->writeEntry("AutoUpdateKlamAV","Yes");
//        config->writeEntry("AutoUpdateKlamAV","Yes");
    }else{
//    }else{
        config->writeEntry("AutoUpdateKlamAV","No");
//        config->writeEntry("AutoUpdateKlamAV","No");
    }
//    }
 
 
    config->sync();
    config->sync();
}
}
 Lines 961-971    Link Here 
Freshklam::resolved( KResolverResults result) // SLOT
Freshklam::resolved( KResolverResults result) // SLOT
{
{
    if ((!( result.error() != KResolver::NoError || result.isEmpty() )) 
//    if ((!( result.error() != KResolver::NoError || result.isEmpty() )) 
       && klamav_box->isChecked()){
//       && klamav_box->isChecked()){
    	updater->checkForNewKlamAV();
//    	updater->checkForNewKlamAV();
    }else
//    }else
        kdDebug() << "network error or not set to check for new klamav" << endl;
//        kdDebug() << "network error or not set to check for new klamav" << endl;
}
}
 Lines 1023-1030    Link Here 
void Freshklam::toggleUpgradeButtons(bool state)
void Freshklam::toggleUpgradeButtons(bool state)
{
{
    klamav_options->setEnabled(state);
//    klamav_options->setEnabled(state);
    clamav_options->setEnabled(state);
//    clamav_options->setEnabled(state);
}
}
 Lines 253-259    Link Here 
    //kdDebug() << "Checking for new KlamAV" << endl;
    //kdDebug() << "Checking for new KlamAV" << endl;
    checkingDirectly = true;
    checkingDirectly = false;
    highestsofarnumeric = 0;
    highestsofarnumeric = 0;
    klamav_url = "http://prdownloads.sourceforge.net/klamav/";
    klamav_url = "http://prdownloads.sourceforge.net/klamav/";
 Lines 269-275    Link Here 
    //kdDebug() << "Checking for new ClamAV" << endl;
    //kdDebug() << "Checking for new ClamAV" << endl;
    checkingDirectly = true;
    checkingDirectly = false;
    highestsofarnumeric = 0;
    highestsofarnumeric = 0;
    clamav_url = "http://prdownloads.sourceforge.net/clamav/";
    clamav_url = "http://prdownloads.sourceforge.net/clamav/";
 Lines 98-104    Link Here 
	notes_layout->addMultiCellWidget(notes_hlp, 1,1, 0,1);
	notes_layout->addMultiCellWidget(notes_hlp, 1,1, 0,1);
	QHBoxLayout *notes_box = new QHBoxLayout(notes_hlp, KDialog::spacingHint() );
	QHBoxLayout *notes_box = new QHBoxLayout(notes_hlp, KDialog::spacingHint() );
	
	
	notes_label = new QLabel(i18n(text), notes_hlp);
	notes_label = new QLabel(i18n(text.utf8()), notes_hlp);
	notes_label->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) );
	notes_label->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) );
	//notes_label->setFixedSize(notes_label->sizeHint());
	//notes_label->setFixedSize(notes_label->sizeHint());
	notes_box->addWidget(notes_label);
	notes_box->addWidget(notes_label);