Skip to content

Commit

Permalink
LibGUI: Add Options flags and OpenMultiple mode for FilePicker
Browse files Browse the repository at this point in the history 
If the application can't open more than one file, we should not
allow the user to select multiple.
  • Loading branch information
@tomuta @awesomekling
tomuta authored and awesomekling committed Jul 13, 2020
1 parent d4c6ae8 commit c8d3f8c
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 31 deletions.
73 changes: 45 additions & 28 deletions Libraries/LibGUI/FilePicker.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@

namespace GUI {

Optional<String> FilePicker::get_open_filepath(const String& window_title)
Optional<String> FilePicker::get_open_filepath(const String& window_title, Options options)
{
auto picker = FilePicker::construct(Mode::Open);
auto picker = FilePicker::construct(Mode::Open, options);

if (!window_title.is_null())
picker->set_title(window_title);
Expand All @@ -60,9 +60,9 @@ Optional<String> FilePicker::get_open_filepath(const String& window_title)
return {};
}

Optional<String> FilePicker::get_save_filepath(const String& title, const String& extension)
Optional<String> FilePicker::get_save_filepath(const String& title, const String& extension, Options options)
{
auto picker = FilePicker::construct(Mode::Save, String::format("%s.%s", title.characters(), extension.characters()));
auto picker = FilePicker::construct(Mode::Save, options, String::format("%s.%s", title.characters(), extension.characters()));

if (picker->exec() == Dialog::ExecOK) {
String file_path = picker->selected_file().string();
Expand All @@ -75,11 +75,22 @@ Optional<String> FilePicker::get_save_filepath(const String& title, const String
return {};
}

FilePicker::FilePicker(Mode mode, const StringView& file_name, const StringView& path, Window* parent_window)
FilePicker::FilePicker(Mode mode, Options options, const StringView& file_name, const StringView& path, Window* parent_window)
: Dialog(parent_window)
, m_model(FileSystemModel::create())
, m_mode(mode)
{
switch (m_mode) {
case Mode::Open:
set_title("Open File");
break;
case Mode::OpenMultiple:
set_title("Open Files");
break;
case Mode::Save:
set_title("Save File");
break;
}
set_title(m_mode == Mode::Open ? "Open File" : "Save File");
set_rect(200, 200, 700, 400);
auto& horizontal_container = set_main_widget<Widget>();
Expand Down Expand Up @@ -113,6 +124,7 @@ FilePicker::FilePicker(Mode mode, const StringView& file_name, const StringView&
m_location_textbox->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-folder.png"));

m_view = vertical_container.add<MultiView>();
m_view->set_multi_select(m_mode == Mode::OpenMultiple);
m_view->set_model(SortingProxyModel::create(*m_model));
m_view->set_model_column(FileSystemModel::Column::Name);
m_view->model()->set_key_column_and_sort_order(GUI::FileSystemModel::Column::Name, GUI::SortOrder::Ascending);
Expand Down Expand Up @@ -198,11 +210,13 @@ FilePicker::FilePicker(Mode mode, const StringView& file_name, const StringView&
const FileSystemModel::Node& node = m_model->node(local_index);
LexicalPath path { node.full_path(m_model) };

clear_preview();
if (have_preview())
clear_preview();

if (!node.is_directory())
m_filename_textbox->set_text(node.name);
set_preview(path);
if (have_preview())
set_preview(path);
};

auto& button_container = lower_container.add<Widget>();
Expand Down Expand Up @@ -242,26 +256,28 @@ FilePicker::FilePicker(Mode mode, const StringView& file_name, const StringView&
}
};

m_preview_container = horizontal_container.add<Frame>();
m_preview_container->set_visible(false);
m_preview_container->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
m_preview_container->set_preferred_size(180, 0);
m_preview_container->set_layout<VerticalBoxLayout>();
m_preview_container->layout()->set_margins({ 8, 8, 8, 8 });

m_preview_image = m_preview_container->add<Image>();
m_preview_image->set_should_stretch(true);
m_preview_image->set_auto_resize(false);
m_preview_image->set_preferred_size(160, 160);

m_preview_name_label = m_preview_container->add<Label>();
m_preview_name_label->set_font(Gfx::Font::default_bold_font());
m_preview_name_label->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
m_preview_name_label->set_preferred_size(0, m_preview_name_label->font().glyph_height());

m_preview_geometry_label = m_preview_container->add<Label>();
m_preview_geometry_label->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
m_preview_geometry_label->set_preferred_size(0, m_preview_name_label->font().glyph_height());
if (!((unsigned)options & (unsigned)Options::DisablePreview)) {
m_preview_container = horizontal_container.add<Frame>();
m_preview_container->set_visible(false);
m_preview_container->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
m_preview_container->set_preferred_size(180, 0);
m_preview_container->set_layout<VerticalBoxLayout>();
m_preview_container->layout()->set_margins({ 8, 8, 8, 8 });

m_preview_image = m_preview_container->add<Image>();
m_preview_image->set_should_stretch(true);
m_preview_image->set_auto_resize(false);
m_preview_image->set_preferred_size(160, 160);

m_preview_name_label = m_preview_container->add<Label>();
m_preview_name_label->set_font(Gfx::Font::default_bold_font());
m_preview_name_label->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
m_preview_name_label->set_preferred_size(0, m_preview_name_label->font().glyph_height());

m_preview_geometry_label = m_preview_container->add<Label>();
m_preview_geometry_label->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
m_preview_geometry_label->set_preferred_size(0, m_preview_name_label->font().glyph_height());
}
}

FilePicker::~FilePicker()
Expand All @@ -272,7 +288,8 @@ FilePicker::~FilePicker()
void FilePicker::on_model_update(unsigned)
{
m_location_textbox->set_text(m_model->root_path());
clear_preview();
if (have_preview())
clear_preview();
}

void FilePicker::set_preview(const LexicalPath& path)
Expand Down
18 changes: 15 additions & 3 deletions Libraries/LibGUI/FilePicker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,30 +40,42 @@ class FilePicker final : public Dialog, private ModelClient {
public:
enum class Mode {
Open,
OpenMultiple,
Save
};

static Optional<String> get_open_filepath(const String& window_title = {});
static Optional<String> get_save_filepath(const String& title, const String& extension);
enum class Options : unsigned {
None = 0,
DisablePreview = (1 << 0)
};

static Optional<String> get_open_filepath(Options options)
{
return get_open_filepath({}, options);
}
static Optional<String> get_open_filepath(const String& window_title = {}, Options options = Options::None);
static Optional<String> get_save_filepath(const String& title, const String& extension, Options options = Options::None);
static bool file_exists(const StringView& path);

virtual ~FilePicker() override;

LexicalPath selected_file() const { return m_selected_file; }

private:
bool have_preview() const { return m_preview_container; }
void set_preview(const LexicalPath&);
void clear_preview();
void on_file_return();

virtual void on_model_update(unsigned) override;

FilePicker(Mode type = Mode::Open, const StringView& file_name = "Untitled", const StringView& path = Core::StandardPaths::home_directory(), Window* parent_window = nullptr);
FilePicker(Mode type = Mode::Open, Options = Options::None, const StringView& file_name = "Untitled", const StringView& path = Core::StandardPaths::home_directory(), Window* parent_window = nullptr);

static String ok_button_name(Mode mode)
{
switch (mode) {
case Mode::Open:
case Mode::OpenMultiple:
return "Open";
case Mode::Save:
return "Save";
Expand Down

0 comments on commit c8d3f8c

Please sign in to comment.