godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/godotengine/godot

Browse Source
This commit is contained in:
Juan Linietsky 2015-12-05 14:19:19 -03:00
commit 3ecc9e07b7
6 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scene/gui/file_dialog.cpp
View File

@ -46,6 +46,11 @@ VBoxContainer *FileDialog::get_vbox() {
}
void FileDialog::_notification(int p_what) {
if (p_what==NOTIFICATION_ENTER_TREE) {
refresh->set_icon(get_icon("Reload","EditorIcons"));
}
if (p_what==NOTIFICATION_DRAW) {
@ -700,6 +705,10 @@ FileDialog::FileDialog() {
pathhb->add_child(dir);
dir->set_h_size_flags(SIZE_EXPAND_FILL);
refresh = memnew( ToolButton );
refresh->connect("pressed",this,"_update_file_list");
pathhb->add_child(refresh);
drives = memnew( OptionButton );
pathhb->add_child(drives);
drives->connect("item_selected",this,"_select_drive");

3
scene/gui/file_dialog.h
View File

@ -34,6 +34,7 @@
#include "scene/gui/line_edit.h"
#include "scene/gui/option_button.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/tool_button.h"
#include "os/dir_access.h"
#include "box_container.h"
/**
@ -86,6 +87,8 @@ private:
OptionButton *filter;
DirAccess *dir_access;
ConfirmationDialog *confirm_save;
ToolButton *refresh;
Vector<String> filters;

5
tools/editor/editor_file_dialog.cpp
View File

@ -27,6 +27,7 @@ void EditorFileDialog::_notification(int p_what) {
dir_prev->set_icon(get_icon("ArrowLeft","EditorIcons"));
dir_next->set_icon(get_icon("ArrowRight","EditorIcons"));
dir_up->set_icon(get_icon("ArrowUp","EditorIcons"));
refresh->set_icon(get_icon("Reload","EditorIcons"));
favorite->set_icon(get_icon("Favorites","EditorIcons"));
fav_up->set_icon(get_icon("MoveUp","EditorIcons"));
@ -1170,6 +1171,10 @@ EditorFileDialog::EditorFileDialog() {
pathhb->add_child(dir);
dir->set_h_size_flags(SIZE_EXPAND_FILL);
refresh = memnew( ToolButton );
refresh->connect("pressed",this,"_update_file_list");
pathhb->add_child(refresh);
favorite = memnew( ToolButton );
favorite->set_toggle_mode(true);
favorite->connect("toggled",this,"_favorite_toggled");

1
tools/editor/editor_file_dialog.h
View File

@ -108,6 +108,7 @@ private:
ToolButton *mode_list;
ToolButton *refresh;
ToolButton *favorite;
ToolButton *fav_up;

2
tools/editor/editor_node.cpp
View File

@ -2042,7 +2042,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
return;
};
// fallthrough to save_as
} break;
};
case FILE_SAVE_AS_SCENE: {
Node *scene = editor_data.get_edited_scene_root();

4
tools/editor/io_plugins/editor_font_import_plugin.cpp
View File

@ -520,6 +520,10 @@ class EditorFontImportDialog : public ConfirmationDialog {
return;
}
if (dest->get_line_edit()->get_text().get_file()==".fnt") {
dest->get_line_edit()->set_text(dest->get_line_edit()->get_text().get_base_dir() + "/" + source->get_line_edit()->get_text().get_file().basename() + ".fnt" );
}
Ref<ResourceImportMetadata> rimd = get_rimd();
if (rimd.is_null()) {