diff options
| -rw-r--r-- | src/firstrunwizard.ui | 134 | ||||
| -rw-r--r-- | src/firstrunwizard.ui.h | 10 | ||||
| -rw-r--r-- | src/klamav.cpp | 7 | ||||
| -rw-r--r-- | src/klamav.h | 1 |
4 files changed, 29 insertions, 123 deletions
diff --git a/src/firstrunwizard.ui b/src/firstrunwizard.ui index bbbdf4d..bb36f9f 100644 --- a/src/firstrunwizard.ui +++ b/src/firstrunwizard.ui @@ -9,7 +9,7 @@ <x>0</x> <y>0</y> <width>830</width> - <height>443</height> + <height>514</height> </rect> </property> <property name="caption"> @@ -89,56 +89,6 @@ <attribute name="title"> <string>Storage Locations (1 of 1)</string> </attribute> - <spacer> - <property name="name"> - <cstring>spacer4</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>80</width> - <height>20</height> - </size> - </property> - <property name="geometry"> - <rect> - <x>426</x> - <y>50</y> - <width>80</width> - <height>20</height> - </rect> - </property> - </spacer> - <spacer> - <property name="name"> - <cstring>spacer5</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>30</height> - </size> - </property> - <property name="geometry"> - <rect> - <x>390</x> - <y>340</y> - <width>20</width> - <height>30</height> - </rect> - </property> - </spacer> <widget class="TQCheckBox"> <property name="name"> <cstring>CheckForDatabaseUpdates</cstring> @@ -161,28 +111,6 @@ <bool>true</bool> </property> </widget> - <widget class="TQCheckBox"> - <property name="name"> - <cstring>CheckForClamAVUpdates</cstring> - </property> - <property name="geometry"> - <rect> - <x>466</x> - <y>300</y> - <width>340</width> - <height>30</height> - </rect> - </property> - <property name="text"> - <string>Check for updates &to ClamAV now.</string> - </property> - <property name="accel"> - <string>Alt+T</string> - </property> - <property name="checked"> - <bool>false</bool> - </property> - </widget> <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> @@ -288,31 +216,6 @@ </rect> </property> </spacer> - <spacer> - <property name="name"> - <cstring>spacer16</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <property name="sizeType"> - <enum>Fixed</enum> - </property> - <property name="sizeHint"> - <size> - <width>21</width> - <height>20</height> - </size> - </property> - <property name="geometry"> - <rect> - <x>200</x> - <y>130</y> - <width>21</width> - <height>20</height> - </rect> - </property> - </spacer> <widget class="KActiveLabel"> <property name="name"> <cstring>text2</cstring> @@ -321,8 +224,8 @@ <rect> <x>15</x> <y>15</y> - <width>405</width> - <height>110</height> + <width>740</width> + <height>105</height> </rect> </property> <property name="sizePolicy"> @@ -337,17 +240,40 @@ <enum>Manual</enum> </property> <property name="text"> - <string><p>KlamAV needs to know two things to get started: where you want to store your quarantine and where you want to store your signature database!.</p> + <string><p>KlamAV needs to know two things to get started: where you want to store your quarantine and where you want to store your signature database.</p> <p>You can change these settings at a later time using the configuration dialog.</p></string> </property> <property name="wrapPolicy"> <enum>AtWordBoundary</enum> </property> </widget> + <spacer> + <property name="name"> + <cstring>spacer16</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Fixed</enum> + </property> + <property name="sizeHint"> + <size> + <width>21</width> + <height>30</height> + </size> + </property> + <property name="geometry"> + <rect> + <x>200</x> + <y>120</y> + <width>21</width> + <height>30</height> + </rect> + </property> + </spacer> </widget> </widget> -<customwidgets> -</customwidgets> <includes> <include location="local" impldecl="in implementation">firstrunwizard.ui.h</include> </includes> @@ -365,12 +291,10 @@ <function returnType="TQString">defaultDatabasePath()</function> <function returnType="TQString">defaultQuarantinePath()</function> <function returnType="bool">downloadDatabase()</function> - <function returnType="bool">downloadClamAV()</function> </functions> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> - <includehint>kactivelabel.h</includehint> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/src/firstrunwizard.ui.h b/src/firstrunwizard.ui.h index 9e26acc..cb62580 100644 --- a/src/firstrunwizard.ui.h +++ b/src/firstrunwizard.ui.h @@ -128,13 +128,3 @@ FirstRunWizard::downloadDatabase( ) //virtual return true; return false; } - -bool -FirstRunWizard::downloadClamAV( ) //virtual -{ - if (CheckForClamAVUpdates->isChecked()) - return true; - return false; -} - - diff --git a/src/klamav.cpp b/src/klamav.cpp index ab99910..a300e90 100644 --- a/src/klamav.cpp +++ b/src/klamav.cpp @@ -41,7 +41,6 @@ Klamav::Klamav() { downloadDBForWizard = false; - downloadClamAVForWizard = false; tdemain = this; TQVBoxLayout *top = new TQVBoxLayout(this,10,10); @@ -150,8 +149,6 @@ Klamav::Klamav() tab->setCurrentPage(2); freshklam->slotSearch(); } - if (downloadClamAVForWizard) - freshklam->checkForNewClamAVNow(); //klamdb->shouldIShow(); CollectionDB::instance()->insertEvent("Launch","KlamAV Launched"); @@ -290,10 +287,6 @@ void Klamav::firstRunWizard() { kdDebug() << "downloading database" << endl; downloadDBForWizard = true; } - if (wizard.downloadClamAV()){ - kdDebug() << "downloading clamav" << endl; - downloadClamAVForWizard = true; - } } diff --git a/src/klamav.h b/src/klamav.h index 01a0b07..464ad1e 100644 --- a/src/klamav.h +++ b/src/klamav.h @@ -75,7 +75,6 @@ public: Freshklam *freshklam; bool firstDownload; bool downloadDBForWizard; - bool downloadClamAVForWizard; Kuarantine *kuarantine; KlamDB *klamdb; Klamscan *klamscan; |