liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undid 413c3eb60f17, see issue 2678#c22

Browse Source
This commit is contained in:
DrSlony
2015-03-19 12:21:31 +01:00
parent 234fc04efb
commit 167058c274
1 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rtgui/dirbrowser.cc
View File

@@ -263,40 +263,14 @@ void DirBrowser::updateDir (const Gtk::TreeModel::iterator& iter) {
void DirBrowser::addDir (const Gtk::TreeModel::iterator& iter, const Glib::ustring& dirname) { void DirBrowser::addDir (const Gtk::TreeModel::iterator& iter, const Glib::ustring& dirname) {
const Gtk::TreeNodeChildren it = iter->children(); Gtk::TreeModel::iterator child = dirTreeModel->append(iter->children());
Gtk::TreeModel::iterator child = dirTreeModel->append(it);
child->set_value (dtColumns.filename, dirname); child->set_value (dtColumns.filename, dirname);
child->set_value (0, openfolder); child->set_value (0, openfolder);
child->set_value (1, closedfolder); child->set_value (1, closedfolder);
Glib::ustring fullname = Glib::build_filename (iter->get_value (dtColumns.dirname), dirname); Glib::ustring fullname = Glib::build_filename (iter->get_value (dtColumns.dirname), dirname);
child->set_value (dtColumns.dirname, fullname); child->set_value (dtColumns.dirname, fullname);
if (!safe_file_test(fullname, Glib::FILE_TEST_IS_DIR)) { Gtk::TreeModel::iterator fooRow = dirTreeModel->append(child->children());
return; fooRow->set_value (dtColumns.filename, Glib::ustring("foo"));
}
try {
Glib::RefPtr<Gio::File> dir = Gio::File::create_for_path(fullname);
Glib::RefPtr<Gio::FileEnumerator> dirList = dir->enumerate_children("standard::type");
if (dirList) {
bool canBeExpanded = false;
for (Glib::RefPtr<Gio::FileInfo> info = dirList->next_file(); info; info = dirList->next_file()) {
if (info->get_file_type() == Gio::FILE_TYPE_DIRECTORY ||
info->get_file_type() == Gio::FILE_TYPE_SYMBOLIC_LINK) {
canBeExpanded = true;
break;
}
}
if (canBeExpanded) {
Gtk::TreeModel::iterator fooRow = dirTreeModel->append(child->children());
fooRow->set_value(dtColumns.filename, Glib::ustring("foo"));
}
}
}
catch (...) {
// will catch excepions like 'Permission denied'
}
} }
void DirBrowser::row_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column) { void DirBrowser::row_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column) {