maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move export GUI debug toggle to export settings window

Browse source 
(cherry picked from commit ab4caa7953)
This commit is contained in:
eska 2016-04-28 02:39:52 +02:00 committed by Rémi Verschelde
parent 3a3f56689e
commit 91461b588d
10 changed files with 65 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/android/export/export.cpp
View file

@ -251,7 +251,7 @@ public:
virtual String get_device_info(int p_device) const;
virtual Error run(int p_device,int p_flags=0);
virtual bool requieres_password(bool p_debug) const { return !p_debug; }
virtual bool requires_password(bool p_debug) const { return !p_debug; }
virtual String get_binary_extension() const { return "apk"; }
virtual Error export_project(const String& p_path, bool p_debug, int p_flags=0);

2
platform/bb10/export/export.cpp
View file

@ -69,7 +69,7 @@ public:
virtual String get_device_info(int p_device) const;
virtual Error run(int p_device,int p_flags=0);
virtual bool requieres_password(bool p_debug) const { return !p_debug; }
virtual bool requires_password(bool p_debug) const { return !p_debug; }
virtual String get_binary_extension() const { return "bar"; }
virtual Error export_project(const String& p_path,bool p_debug,int p_flags=0);

2
platform/javascript/export/export.cpp
View file

@ -86,7 +86,7 @@ public:
virtual String get_device_info(int p_device) const { return "Run exported HTML in the system's default browser."; }
virtual Error run(int p_device,int p_flags=0);
virtual bool requieres_password(bool p_debug) const { return false; }
virtual bool requires_password(bool p_debug) const { return false; }
virtual String get_binary_extension() const { return "html"; }
virtual Error export_project(const String& p_path,bool p_debug,int p_flags=0);

2
platform/osx/export/export.cpp
View file

@ -59,7 +59,7 @@ public:
virtual String get_device_info(int p_device) const { return String(); }
virtual Error run(int p_device,int p_flags=0);
virtual bool requieres_password(bool p_debug) const { return false; }
virtual bool requires_password(bool p_debug) const { return false; }
virtual String get_binary_extension() const { return "zip"; }
virtual Error export_project(const String& p_path,bool p_debug,int p_flags=0);

45
tools/editor/editor_import_export.cpp
View file

@ -270,6 +270,39 @@ static void _remove_filter_from_list(Set<StringName>& r_list,const String& p_fil
_edit_filter_list(r_list,p_filter,true);
}
bool EditorExportPlatform::_set(const StringName& p_name, const Variant& p_value) {
String n = p_name;
if (n=="debug/debugging_enabled") {
set_debugging_enabled(p_value);
} else {
return false;
}
return true;
}
bool EditorExportPlatform::_get(const StringName& p_name,Variant &r_ret) const {
String n = p_name;
if (n=="debug/debugging_enabled") {
r_ret=is_debugging_enabled();
} else {
return false;
}
return true;
}
void EditorExportPlatform::_get_property_list( List<PropertyInfo> *p_list) const {
p_list->push_front( PropertyInfo( Variant::BOOL, "debug/debugging_enabled"));
}
Vector<uint8_t> EditorExportPlatform::get_exported_file_default(String& p_fname) const {
FileAccess *f = FileAccess::open(p_fname,FileAccess::READ);
@ -457,8 +490,15 @@ bool EditorExportPlatform::exists_export_template(String template_file_name, Str
bool EditorExportPlatform::is_debugging_enabled() const {
return debugging_enabled;
}
void EditorExportPlatform::set_debugging_enabled(bool p_enabled) {
debugging_enabled = p_enabled;
}
bool EditorExportPlatformPC::_set(const StringName& p_name, const Variant& p_value) {
@ -1236,6 +1276,11 @@ Error EditorExportPlatform::save_pack(FileAccess *dst,bool p_make_bundles, int p
return OK;
}
EditorExportPlatform::EditorExportPlatform() {
debugging_enabled = true;
}
Error EditorExportPlatformPC::export_project(const String& p_path, bool p_debug, int p_flags) {

15
tools/editor/editor_import_export.h
View file

@ -82,8 +82,17 @@ class EditorExportPlatform : public Reference {
public:
typedef Error (*EditorExportSaveFunction)(void *p_userdata,const String& p_path, const Vector<uint8_t>& p_data,int p_file,int p_total);
private:
bool debugging_enabled;
protected:
bool _set(const StringName& p_name, const Variant& p_value);
bool _get(const StringName& p_name,Variant &r_ret) const;
void _get_property_list( List<PropertyInfo> *p_list) const;
Vector<uint8_t> get_exported_file_default(String& p_fname) const;
virtual Vector<uint8_t> get_exported_file(String& p_fname) const;
virtual Vector<StringName> get_dependencies(bool p_bundles) const;
@ -141,6 +150,8 @@ public:
EXPORT_VIEW_NAVIGATION=16,
};
bool is_debugging_enabled() const;
void set_debugging_enabled( bool p_enabled );
Error export_project_files(EditorExportSaveFunction p_func, void* p_udata,bool p_make_bundles);
@ -160,11 +171,11 @@ public:
virtual bool can_export(String *r_error=NULL) const=0;
virtual bool requieres_password(bool p_debug) const { return false; }
virtual bool requires_password(bool p_debug) const { return false; }
virtual String get_binary_extension() const=0;
virtual Error export_project(const String& p_path,bool p_debug,int p_flags=0)=0;
EditorExportPlatform() {};
EditorExportPlatform();
};
class EditorExportPlatformPC : public EditorExportPlatform {

5
tools/editor/editor_node.cpp
View file

@ -5809,11 +5809,6 @@ EditorNode::EditorNode() {
file_export_check = memnew( CheckButton );
file_export_check->set_text("Enable Debugging");
file_export_check->set_pressed(true);
file_export_check->connect("pressed",this,"_export_debug_toggled");
file_export->get_vbox()->add_margin_child("Debug:",file_export_check);
file_export_password = memnew( LineEdit );
file_export_password->set_secret(true);
file_export_password->set_editable(false);

1
tools/editor/editor_node.h
View file

@ -297,7 +297,6 @@ class EditorNode : public Node {
FileDialog *file_export;
FileDialog *file_export_lib;
FileDialog *file_script;
CheckButton *file_export_check;
CheckButton *file_export_lib_merge;
LineEdit *file_export_password;
String current_path;

11
tools/editor/project_export.cpp
View file

@ -481,7 +481,8 @@ void ProjectExportDialog::_export_action(const String& p_file) {
return;
String platform = selected->get_metadata(0);
Error err = export_platform(platform,p_file,file_export_check->is_pressed(),file_export_password->get_text(),false);
bool debugging_enabled = EditorImportExport::get_singleton()->get_export_platform(platform)->is_debugging_enabled();
Error err = export_platform(platform,p_file,debugging_enabled,file_export_password->get_text(),false);
if (err!=OK) {
error->set_text("Error exporting project!");
error->popup_centered_minsize();
@ -592,7 +593,7 @@ void ProjectExportDialog::custom_action(const String&) {
String extension = exporter->get_binary_extension();
file_export_password->set_editable( exporter->requieres_password(file_export_check->is_pressed()));
file_export_password->set_editable( exporter->requires_password(exporter->is_debugging_enabled()) );
file_export->clear_filters();
if (extension!="") {
@ -1453,12 +1454,6 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
file_export->set_title("Export Project");
file_export->connect("file_selected", this,"_export_action");
file_export_check = memnew( CheckButton );
file_export_check->set_text("Enable Debugging");
file_export_check->set_pressed(true);
file_export_check->connect("pressed",this,"_export_debug_toggled");
file_export->get_vbox()->add_margin_child("Debug:",file_export_check);
file_export_password = memnew( LineEdit );
file_export_password->set_secret(true);
file_export_password->set_editable(false);

1
tools/editor/project_export.h
View file

@ -86,7 +86,6 @@ private:
EditorFileDialog *pck_export;
EditorFileDialog *file_export;
CheckButton *file_export_check;
LineEdit *file_export_password;
Button *button_export;