Commit 95b7998d authored by Scott Wheeler's avatar Scott Wheeler

s/directory/folder/g

svn path=/trunk/kdemultimedia/juk/; revision=359550
parent fcb34d6c
...@@ -83,11 +83,11 @@ public: ...@@ -83,11 +83,11 @@ public:
virtual QString separator() const = 0; virtual QString separator() const = 0;
virtual QString musicDirectory() const = 0; virtual QString musicFolder() const = 0;
virtual int trackWidth() const = 0; virtual int trackWidth() const = 0;
virtual bool hasDirSeparator(int index) const = 0; virtual bool hasFolderSeparator(int index) const = 0;
virtual bool isDisabled(TagType category) const = 0; virtual bool isDisabled(TagType category) const = 0;
......
...@@ -75,7 +75,7 @@ ConfigCategoryReader::ConfigCategoryReader() : CategoryReaderInterface(), ...@@ -75,7 +75,7 @@ ConfigCategoryReader::ConfigCategoryReader() : CategoryReaderInterface(),
if(*it > 0 && *it < (NumTypes - 1)) if(*it > 0 && *it < (NumTypes - 1))
m_folderSeparators[*it] = true; m_folderSeparators[*it] = true;
m_musicDirectory = config.readPathEntry("MusicDirectory", "${HOME}/music"); m_musicFolder = config.readPathEntry("MusicFolder", "${HOME}/music");
m_separator = config.readEntry("Separator", " - "); m_separator = config.readEntry("Separator", " - ");
checkedSeparators = config.readIntListEntry("CategoryOrder"); checkedSeparators = config.readIntListEntry("CategoryOrder");
...@@ -144,9 +144,9 @@ QString ConfigCategoryReader::separator() const ...@@ -144,9 +144,9 @@ QString ConfigCategoryReader::separator() const
return m_separator; return m_separator;
} }
QString ConfigCategoryReader::musicDirectory() const QString ConfigCategoryReader::musicFolder() const
{ {
return m_musicDirectory; return m_musicFolder;
} }
int ConfigCategoryReader::trackWidth() const int ConfigCategoryReader::trackWidth() const
...@@ -154,7 +154,7 @@ int ConfigCategoryReader::trackWidth() const ...@@ -154,7 +154,7 @@ int ConfigCategoryReader::trackWidth() const
return m_options[Track].trackWidth(); return m_options[Track].trackWidth();
} }
bool ConfigCategoryReader::hasDirSeparator(int index) const bool ConfigCategoryReader::hasFolderSeparator(int index) const
{ {
return m_folderSeparators[index]; return m_folderSeparators[index];
} }
...@@ -212,7 +212,7 @@ void FileRenamerWidget::loadConfig() ...@@ -212,7 +212,7 @@ void FileRenamerWidget::loadConfig()
} }
QString url = config.readPathEntry("MusicDirectory", "${HOME}/music"); QString url = config.readPathEntry("MusicDirectory", "${HOME}/music");
m_musicDirectory->setURL(url); m_musicFolder->setURL(url);
m_separator->setCurrentText(config.readEntry("Separator", " - ")); m_separator->setCurrentText(config.readEntry("Separator", " - "));
} }
...@@ -236,7 +236,7 @@ void FileRenamerWidget::saveConfig() ...@@ -236,7 +236,7 @@ void FileRenamerWidget::saveConfig()
categoryOrder += m_rows[i].category; categoryOrder += m_rows[i].category;
config.writeEntry("CategoryOrder", categoryOrder); config.writeEntry("CategoryOrder", categoryOrder);
config.writePathEntry("MusicDirectory", m_musicDirectory->url()); config.writePathEntry("MusicDirectory", m_musicFolder->url());
config.writeEntry("Separator", m_separator->currentText()); config.writeEntry("Separator", m_separator->currentText());
config.sync(); config.sync();
...@@ -428,7 +428,7 @@ QValueList<TagType> FileRenamerWidget::categoryOrder() const ...@@ -428,7 +428,7 @@ QValueList<TagType> FileRenamerWidget::categoryOrder() const
return list; return list;
} }
bool FileRenamerWidget::hasDirSeparator(int index) const bool FileRenamerWidget::hasFolderSeparator(int index) const
{ {
return m_folderSwitches[index]->isChecked(); return m_folderSwitches[index]->isChecked();
} }
...@@ -609,9 +609,9 @@ QString FileRenamerWidget::separator() const ...@@ -609,9 +609,9 @@ QString FileRenamerWidget::separator() const
return m_separator->currentText(); return m_separator->currentText();
} }
QString FileRenamerWidget::musicDirectory() const QString FileRenamerWidget::musicFolder() const
{ {
return m_musicDirectory->url(); return m_musicFolder->url();
} }
void FileRenamerWidget::toggleCategory(int category) void FileRenamerWidget::toggleCategory(int category)
...@@ -702,7 +702,7 @@ QString FileRenamer::getFileName(const CategoryReaderInterface &interface) ...@@ -702,7 +702,7 @@ QString FileRenamer::getFileName(const CategoryReaderInterface &interface)
{ {
const QValueList<TagType> categoryOrder = interface.categoryOrder(); const QValueList<TagType> categoryOrder = interface.categoryOrder();
const QString separator = interface.separator(); const QString separator = interface.separator();
const QString dir = interface.musicDirectory(); const QString folder = interface.musicFolder();
const QRegExp closeBracket("[])}]\\s*$"); const QRegExp closeBracket("[])}]\\s*$");
const QRegExp openBracket("^\\s*[[({]"); const QRegExp openBracket("^\\s*[[({]");
...@@ -720,7 +720,7 @@ QString FileRenamer::getFileName(const CategoryReaderInterface &interface) ...@@ -720,7 +720,7 @@ QString FileRenamer::getFileName(const CategoryReaderInterface &interface)
value = interface.value(category); value = interface.value(category);
if(i < (NumTypes - 1) && interface.hasDirSeparator(i)) if(i < (NumTypes - 1) && interface.hasFolderSeparator(i))
value.append("/"); value.append("/");
++i; ++i;
...@@ -748,7 +748,7 @@ QString FileRenamer::getFileName(const CategoryReaderInterface &interface) ...@@ -748,7 +748,7 @@ QString FileRenamer::getFileName(const CategoryReaderInterface &interface)
} }
} }
return QString(dir + QDir::separator() + result).simplifyWhiteSpace(); return QString(folder + QDir::separator() + result).simplifyWhiteSpace();
} }
QString FileRenamer::fixupTrack(const QString &track, const CategoryReaderInterface &interface) QString FileRenamer::fixupTrack(const QString &track, const CategoryReaderInterface &interface)
......
...@@ -39,7 +39,7 @@ class QPushButton; ...@@ -39,7 +39,7 @@ class QPushButton;
class QVBox; class QVBox;
class PlaylistItem; class PlaylistItem;
// Used to decide what directory the FileRenamerWidget will move rows in. // Used to decide what direction the FileRenamerWidget will move rows in.
typedef enum { MoveUp, MoveDown } MovementDirection; typedef enum { MoveUp, MoveDown } MovementDirection;
/** /**
...@@ -84,9 +84,9 @@ public: ...@@ -84,9 +84,9 @@ public:
virtual QString emptyText(TagType category) const; virtual QString emptyText(TagType category) const;
virtual QValueList<TagType> categoryOrder() const; virtual QValueList<TagType> categoryOrder() const;
virtual QString separator() const; virtual QString separator() const;
virtual QString musicDirectory() const; virtual QString musicFolder() const;
virtual int trackWidth() const; virtual int trackWidth() const;
virtual bool hasDirSeparator(int index) const; virtual bool hasFolderSeparator(int index) const;
virtual bool isDisabled(TagType category) const; virtual bool isDisabled(TagType category) const;
private: private:
...@@ -94,7 +94,7 @@ private: ...@@ -94,7 +94,7 @@ private:
TagRenamerOptions m_options[NumTypes]; TagRenamerOptions m_options[NumTypes];
QValueList<TagType> m_categoryOrder; QValueList<TagType> m_categoryOrder;
QString m_separator; QString m_separator;
QString m_musicDirectory; QString m_musicFolder;
bool m_folderSeparators[NumTypes - 1]; bool m_folderSeparators[NumTypes - 1];
}; };
...@@ -243,9 +243,9 @@ private: ...@@ -243,9 +243,9 @@ private:
virtual QString separator() const; virtual QString separator() const;
/** /**
* @return local path to the music directory used to store renamed files. * @return local path to the music folder used to store renamed files.
*/ */
virtual QString musicDirectory() const; virtual QString musicFolder() const;
/** /**
* @return the minimum width of the track category. * @return the minimum width of the track category.
...@@ -256,13 +256,13 @@ private: ...@@ -256,13 +256,13 @@ private:
} }
/** /**
* @param index, the 0-based index for the directory boundary. * @param index, the 0-based index for the folder boundary.
* @return true if there should be a directory separator between category * @return true if there should be a folder separator between category
* index and index + 1, and false otherwise. Note that for purposes * index and index + 1, and false otherwise. Note that for purposes
* of this function, only categories that are required or non-empty * of this function, only categories that are required or non-empty
* should count. * should count.
*/ */
virtual bool hasDirSeparator(int index) const; virtual bool hasFolderSeparator(int index) const;
/** /**
* @param category The category to get the status of. * @param category The category to get the status of.
...@@ -404,7 +404,7 @@ private: ...@@ -404,7 +404,7 @@ private:
Row m_rows[NumTypes]; Row m_rows[NumTypes];
/** /**
* This holds an array of checkboxes that allow the user to insert directory * This holds an array of checkboxes that allow the user to insert folder
* separators in between categories. * separators in between categories.
*/ */
QCheckBox *m_folderSwitches[NumTypes - 1]; QCheckBox *m_folderSwitches[NumTypes - 1];
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<cstring>textLabel1_6</cstring> <cstring>textLabel1_6</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>Music Directory</string> <string>Music Folder</string>
</property> </property>
</widget> </widget>
<widget class="KComboBox" row="1" column="1"> <widget class="KComboBox" row="1" column="1">
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</widget> </widget>
<widget class="KURLRequester" row="0" column="1"> <widget class="KURLRequester" row="0" column="1">
<property name="name"> <property name="name">
<cstring>m_musicDirectory</cstring> <cstring>m_musicFolder</cstring>
</property> </property>
<property name="url" stdset="0"> <property name="url" stdset="0">
<string>/home/kde-cvs/music</string> <string>/home/kde-cvs/music</string>
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
<slot>exampleTextChanged()</slot> <slot>exampleTextChanged()</slot>
</connection> </connection>
<connection> <connection>
<sender>m_musicDirectory</sender> <sender>m_musicFolder</sender>
<signal>textChanged(const QString&amp;)</signal> <signal>textChanged(const QString&amp;)</signal>
<receiver>FileRenamerBase</receiver> <receiver>FileRenamerBase</receiver>
<slot>exampleTextChanged()</slot> <slot>exampleTextChanged()</slot>
......
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