The removable media check never seems to have been implemented

parent 8c4f3ba1
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
bool Config::scanAcrossMounts; bool Config::scanAcrossMounts;
bool Config::scanRemoteMounts; bool Config::scanRemoteMounts;
bool Config::scanRemovableMedia;
bool Config::varyLabelFontSizes; bool Config::varyLabelFontSizes;
bool Config::showSmallFiles; bool Config::showSmallFiles;
bool Config::antialias; bool Config::antialias;
...@@ -47,7 +46,6 @@ Filelight::Config::read() ...@@ -47,7 +46,6 @@ Filelight::Config::read()
scanAcrossMounts = config.readEntry("scanAcrossMounts", false); scanAcrossMounts = config.readEntry("scanAcrossMounts", false);
scanRemoteMounts = config.readEntry("scanRemoteMounts", false); scanRemoteMounts = config.readEntry("scanRemoteMounts", false);
scanRemovableMedia = config.readEntry("scanRemovableMedia", false);
varyLabelFontSizes = config.readEntry("varyLabelFontSizes", true); varyLabelFontSizes = config.readEntry("varyLabelFontSizes", true);
showSmallFiles = config.readEntry("showSmallFiles", false); showSmallFiles = config.readEntry("showSmallFiles", false);
contrast = config.readEntry("contrast", 75); contrast = config.readEntry("contrast", 75);
...@@ -66,7 +64,6 @@ Filelight::Config::write() ...@@ -66,7 +64,6 @@ Filelight::Config::write()
config.writeEntry("scanAcrossMounts", scanAcrossMounts); config.writeEntry("scanAcrossMounts", scanAcrossMounts);
config.writeEntry("scanRemoteMounts", scanRemoteMounts); config.writeEntry("scanRemoteMounts", scanRemoteMounts);
config.writeEntry("scanRemovableMedia", scanRemovableMedia);
config.writeEntry("varyLabelFontSizes", varyLabelFontSizes); config.writeEntry("varyLabelFontSizes", varyLabelFontSizes);
config.writeEntry("showSmallFiles", showSmallFiles); config.writeEntry("showSmallFiles", showSmallFiles);
config.writeEntry("contrast", contrast); config.writeEntry("contrast", contrast);
......
...@@ -51,7 +51,6 @@ public: ...@@ -51,7 +51,6 @@ public:
static bool scanAcrossMounts; static bool scanAcrossMounts;
static bool scanRemoteMounts; static bool scanRemoteMounts;
static bool scanRemovableMedia;
static bool varyLabelFontSizes; static bool varyLabelFontSizes;
static bool showSmallFiles; static bool showSmallFiles;
static uint contrast; static uint contrast;
......
...@@ -185,22 +185,6 @@ ...@@ -185,22 +185,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1">
<widget class="QCheckBox" name="dontScanRemovableMedia">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string/>
</property>
<property name="whatsThis">
<string>Prevents Filelight from scanning removable media (eg. CD-ROMs).</string>
</property>
<property name="text">
<string>E&amp;xclude removable media</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
...@@ -403,7 +387,6 @@ ...@@ -403,7 +387,6 @@
<tabstop>m_addButton</tabstop> <tabstop>m_addButton</tabstop>
<tabstop>scanAcrossMounts</tabstop> <tabstop>scanAcrossMounts</tabstop>
<tabstop>dontScanRemoteMounts</tabstop> <tabstop>dontScanRemoteMounts</tabstop>
<tabstop>dontScanRemovableMedia</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>
......
...@@ -70,10 +70,8 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) ...@@ -70,10 +70,8 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
connect(scanAcrossMounts, &QCheckBox::toggled, this, &SettingsDialog::startTimer); connect(scanAcrossMounts, &QCheckBox::toggled, this, &SettingsDialog::startTimer);
connect(dontScanRemoteMounts, &QCheckBox::toggled, this, &SettingsDialog::startTimer); connect(dontScanRemoteMounts, &QCheckBox::toggled, this, &SettingsDialog::startTimer);
connect(dontScanRemovableMedia, &QCheckBox::toggled, this, &SettingsDialog::startTimer);
connect(scanAcrossMounts, &QCheckBox::toggled, this, &SettingsDialog::toggleScanAcrossMounts); connect(scanAcrossMounts, &QCheckBox::toggled, this, &SettingsDialog::toggleScanAcrossMounts);
connect(dontScanRemoteMounts, &QCheckBox::toggled, this, &SettingsDialog::toggleDontScanRemoteMounts); connect(dontScanRemoteMounts, &QCheckBox::toggled, this, &SettingsDialog::toggleDontScanRemoteMounts);
connect(dontScanRemovableMedia, &QCheckBox::toggled, this, &SettingsDialog::toggleDontScanRemovableMedia);
connect(useAntialiasing, &QCheckBox::toggled, this, &SettingsDialog::toggleUseAntialiasing); connect(useAntialiasing, &QCheckBox::toggled, this, &SettingsDialog::toggleUseAntialiasing);
connect(varyLabelFontSizes, &QCheckBox::toggled, this, &SettingsDialog::toggleVaryLabelFontSizes); connect(varyLabelFontSizes, &QCheckBox::toggled, this, &SettingsDialog::toggleVaryLabelFontSizes);
...@@ -104,10 +102,8 @@ void SettingsDialog::reset() ...@@ -104,10 +102,8 @@ void SettingsDialog::reset()
//tab 1 //tab 1
scanAcrossMounts->setChecked(Config::scanAcrossMounts); scanAcrossMounts->setChecked(Config::scanAcrossMounts);
dontScanRemoteMounts->setChecked(!Config::scanRemoteMounts); dontScanRemoteMounts->setChecked(!Config::scanRemoteMounts);
dontScanRemovableMedia->setChecked(!Config::scanRemovableMedia);
dontScanRemoteMounts->setEnabled(Config::scanAcrossMounts); dontScanRemoteMounts->setEnabled(Config::scanAcrossMounts);
// dontScanRemovableMedia.setEnabled(Config::scanAcrossMounts);
m_listBox->clear(); m_listBox->clear();
m_listBox->addItems(Config::skipList); m_listBox->addItems(Config::skipList);
...@@ -142,7 +138,6 @@ void SettingsDialog::toggleScanAcrossMounts(bool b) ...@@ -142,7 +138,6 @@ void SettingsDialog::toggleScanAcrossMounts(bool b)
Config::scanAcrossMounts = b; Config::scanAcrossMounts = b;
dontScanRemoteMounts->setEnabled(b); dontScanRemoteMounts->setEnabled(b);
//dontScanRemovableMedia.setEnabled(b);
} }
void SettingsDialog::toggleDontScanRemoteMounts(bool b) void SettingsDialog::toggleDontScanRemoteMounts(bool b)
...@@ -150,11 +145,6 @@ void SettingsDialog::toggleDontScanRemoteMounts(bool b) ...@@ -150,11 +145,6 @@ void SettingsDialog::toggleDontScanRemoteMounts(bool b)
Config::scanRemoteMounts = !b; Config::scanRemoteMounts = !b;
} }
void SettingsDialog::toggleDontScanRemovableMedia(bool b)
{
Config::scanRemovableMedia = !b;
}
void SettingsDialog::addFolder() void SettingsDialog::addFolder()
......
...@@ -48,7 +48,6 @@ public Q_SLOTS: ...@@ -48,7 +48,6 @@ public Q_SLOTS:
void removeFolder(); void removeFolder();
void toggleScanAcrossMounts(bool); void toggleScanAcrossMounts(bool);
void toggleDontScanRemoteMounts(bool); void toggleDontScanRemoteMounts(bool);
void toggleDontScanRemovableMedia(bool);
void reset(); void reset();
void startTimer(); void startTimer();
void toggleUseAntialiasing(bool = true); void toggleUseAntialiasing(bool = true);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment