From 9fb36f56fc5255d0375e9233670da753572bc207 Mon Sep 17 00:00:00 2001 From: eshe Date: Sat, 31 Jul 2010 14:50:56 +0100 Subject: [PATCH] Removed file types from sound selector and poi selector. --- src/fileselector.cpp | 27 +++++++++++++++++++++++---- src/fileselector.h | 4 ++-- src/poisettings.cpp | 2 +- src/soundselector.cpp | 4 ++-- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/fileselector.cpp b/src/fileselector.cpp index 847de62..86419a9 100644 --- a/src/fileselector.cpp +++ b/src/fileselector.cpp @@ -27,7 +27,7 @@ FileSelector::FileSelector(QString const& text, QWidget* parent): ButtonSelector { } -bool FileSelector::loadFiles(QString const& dir, QStringList const& patterns) +bool FileSelector::loadFiles(QString const& dir, QStringList const& patterns, bool stripType) { QDir directory(dir); @@ -39,7 +39,26 @@ bool FileSelector::loadFiles(QString const& dir, QStringList const& patterns) for(int i = 0; i < files.size(); i++) { - addItem(files.at(i)); + if(stripType) + { + int pos = files.at(i).lastIndexOf('.'); + QString name; + + if(pos != -1) + { + name = files.at(i).left(pos); + } + else + { + name = files.at(i); + } + + addItem(name, files.at(i)); + } + else + { + addItem(files.at(i), files.at(i)); + } } return true; @@ -48,9 +67,9 @@ bool FileSelector::loadFiles(QString const& dir, QStringList const& patterns) return false; } -bool FileSelector::loadFiles(QString const& dir, QString const& pattern) +bool FileSelector::loadFiles(QString const& dir, QString const& pattern, bool stripType) { - return loadFiles(dir, QStringList() << pattern); + return loadFiles(dir, QStringList() << pattern, stripType); } bool FileSelector::importFile(QString const& dir, diff --git a/src/fileselector.h b/src/fileselector.h index 26981da..56144f0 100644 --- a/src/fileselector.h +++ b/src/fileselector.h @@ -29,8 +29,8 @@ class FileSelector : public ButtonSelector public: FileSelector(QString const& text, QWidget* parent = 0); - bool loadFiles(QString const& dir, QStringList const& patterns); - bool loadFiles(QString const& dir, QString const& pattern); + bool loadFiles(QString const& dir, QStringList const& patterns, bool stripType = false); + bool loadFiles(QString const& dir, QString const& pattern, bool stripType = false); bool importFile(QString const& dir, QString const& name, QString const& pattern, bool add = true, QString* addedFile = 0); diff --git a/src/poisettings.cpp b/src/poisettings.cpp index dfb03eb..2388d5f 100644 --- a/src/poisettings.cpp +++ b/src/poisettings.cpp @@ -109,7 +109,7 @@ void PoiSettings::loadFiles() poiFileSelector_->clear(); QString selectedPoi = Settings::instance().value("alert_poi_file", "").toString(); - poiFileSelector_->loadFiles(PoiAlerts::getPoiDir(), PoiReader::getFormatPattern()); + poiFileSelector_->loadFiles(PoiAlerts::getPoiDir(), PoiReader::getFormatPattern(), true); poiFileSelector_->selectByValue(selectedPoi); } diff --git a/src/soundselector.cpp b/src/soundselector.cpp index 0113032..1e26eed 100644 --- a/src/soundselector.cpp +++ b/src/soundselector.cpp @@ -58,8 +58,8 @@ void SoundSelector::load() QString currentValue = selector_->value().toString(); selector_->clear(); QStringList patterns = MediaPlayer::getFormatPatterns(); - selector_->loadFiles(MediaPlayer::getLocalSoundDir(), patterns); - selector_->loadFiles(MediaPlayer::getSoundDir(), patterns); + selector_->loadFiles(MediaPlayer::getLocalSoundDir(), patterns, true); + selector_->loadFiles(MediaPlayer::getSoundDir(), patterns, true); setValue(currentValue); } -- 1.7.9.5