upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-12 18:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pictures added for the folders in the file chooser dialog.

Browse Source
This commit is contained in:
Kristoffer Erlandsson 2004-06-02 20:26:25 +00:00
parent 6105dc96f3
commit 33465196af
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
images/misc/folder-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 198 B

25
src/widgets/file_chooser.cpp
View File

@ -15,6 +15,12 @@
#include "../display.hpp" #include "../display.hpp"
#include "file_chooser.hpp" #include "file_chooser.hpp"
#include <sstream>
namespace {
const std::string dir_picture = "misc/folder-icon.png";
}
namespace gui { namespace gui {
file_chooser::file_chooser(display &disp, std::string start_file) file_chooser::file_chooser(display &disp, std::string start_file)
@ -23,7 +29,8 @@ file_chooser::file_chooser(display &disp, std::string start_file)
filename_textbox_(disp, 100, start_file, true), choice_made_(false), filename_textbox_(disp, 100, start_file, true), choice_made_(false),
last_selection_(-1) { last_selection_(-1) {
// If the start file is not a file or directory, use the root. // If the start file is not a file or directory, use the root.
if(!file_exists(chosen_file_) && !is_directory(chosen_file_) || !is_directory(current_dir_)) { if(!file_exists(chosen_file_) && !is_directory(chosen_file_)
|| !is_directory(current_dir_)) {
current_dir_ = path_delim_; current_dir_ = path_delim_;
chosen_file_ = current_dir_; chosen_file_ = current_dir_;
} }
@ -67,21 +74,25 @@ void file_chooser::display_current_files() {
std::back_inserter(to_show)); std::back_inserter(to_show));
std::vector<std::string>::iterator it; std::vector<std::string>::iterator it;
for (it = to_show.begin(); it != to_show.end(); it++) { for (it = to_show.begin(); it != to_show.end(); it++) {
// Add a delimiter to show that these are directories. // Add an image to show that these are directories.
(*it) += path_delim_; std::stringstream ss;
ss << font::IMAGE << dir_picture << ',' << *it;
*it = ss.str();
}
for (it = files_in_current_dir_.begin(); it != files_in_current_dir_.end(); it++) {
*it = std::string(" ,") + *it;
to_show.push_back(*it);
} }
std::copy(files_in_current_dir_.begin(), files_in_current_dir_.end(),
std::back_inserter(to_show));
const int menu_font_size = 14; // Known from menu.cpp. const int menu_font_size = 14; // Known from menu.cpp.
for (it = to_show.begin(); it != to_show.end(); it++) { for (it = to_show.begin(); it != to_show.end(); it++) {
// Make sure that all lines fit. // Make sure that all lines fit.
// Guess the width of the scrollbar to be 30 since it is not accessible from here. // Guess the width of the scrollbar to be 30 since it is not accessible from here.
while (font::line_width(*it, menu_font_size) > file_list_.width() - 30) { // -25 to compensate for the picture column.
while (font::line_width(*it, menu_font_size) > file_list_.width() - 30 - 25) {
(*it).resize((*it).size() - 1); (*it).resize((*it).size() - 1);
} }
} }
file_list_.set_items(to_show); file_list_.set_items(to_show);
// This will prevent the "box" with filenames from changing size on // This will prevent the "box" with filenames from changing size on
// every redisplay, it looks better when it's static. // every redisplay, it looks better when it's static.
file_list_.set_width(width()); file_list_.set_width(width());