mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-17 00:44:19 +00:00
Code Activity

Refactored some code to cut down on warnings from automatic code-analysis tools.

Browse source
This commit is contained in:
Julian Storer 2011-05-15 14:38:08 +01:00
parent 3213bec481
commit b83e97a6f7
40 changed files with 594 additions and 637 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/gui/components/filebrowser/juce_FileBrowserComponent.cpp
View file

@ -101,19 +101,7 @@ FileBrowserComponent::FileBrowserComponent (int flags_,
addAndMakeVisible (&currentPathBox);
currentPathBox.setEditableText (true);
StringArray rootNames, rootPaths;
getRoots (rootNames, rootPaths);
for (int i = 0; i < rootNames.size(); ++i)
{
if (rootNames[i].isEmpty())
currentPathBox.addSeparator();
else
currentPathBox.addItem (rootNames[i], i + 1);
}
currentPathBox.addSeparator();
resetRecentPaths();
currentPathBox.addListener (this);
addAndMakeVisible (&filenameBox);
@ -271,6 +259,24 @@ void FileBrowserComponent::setRoot (const File& newRootDirectory)
&& currentRoot.getParentDirectory() != currentRoot);
}
void FileBrowserComponent::resetRecentPaths()
{
currentPathBox.clear();
StringArray rootNames, rootPaths;
getRoots (rootNames, rootPaths);
for (int i = 0; i < rootNames.size(); ++i)
{
if (rootNames[i].isEmpty())
currentPathBox.addSeparator();
else
currentPathBox.addItem (rootNames[i], i + 1);
}
currentPathBox.addSeparator();
}
void FileBrowserComponent::goUp()
{
setRoot (getRoot().getParentDirectory());
@ -475,7 +481,7 @@ void FileBrowserComponent::comboBoxChanged (ComboBox*)
void FileBrowserComponent::getRoots (StringArray& rootNames, StringArray& rootPaths)
{
#if JUCE_WINDOWS
#if JUCE_WINDOWS
Array<File> roots;
File::findFileSystemRoots (roots);
rootPaths.clear();
@ -511,9 +517,8 @@ void FileBrowserComponent::getRoots (StringArray& rootNames, StringArray& rootPa
rootNames.add ("Documents");
rootPaths.add (File::getSpecialLocation (File::userDesktopDirectory).getFullPathName());
rootNames.add ("Desktop");
#endif
#if JUCE_MAC
#elif JUCE_MAC
rootPaths.add (File::getSpecialLocation (File::userHomeDirectory).getFullPathName());
rootNames.add ("Home folder");
rootPaths.add (File::getSpecialLocation (File::userDocumentsDirectory).getFullPathName());
@ -538,16 +543,15 @@ void FileBrowserComponent::getRoots (StringArray& rootNames, StringArray& rootPa
rootNames.add (volume.getFileName());
}
}
#endif
#if JUCE_LINUX
#else
rootPaths.add ("/");
rootNames.add ("/");
rootPaths.add (File::getSpecialLocation (File::userHomeDirectory).getFullPathName());
rootNames.add ("Home folder");
rootPaths.add (File::getSpecialLocation (File::userDesktopDirectory).getFullPathName());
rootNames.add ("Desktop");
#endif
#endif
}