Editor settings categories are now tidy and beautiful!

2 files changed, 49 insertions, 49 deletions

diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 3259f0a165..e836258e04 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -1212,9 +1212,9 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d
 
 	if (p_flags&EXPORT_DUMB_CLIENT) {
 
-		/*String host = EditorSettings::get_singleton()->get("file_server/host");
-		int port = EditorSettings::get_singleton()->get("file_server/post");
-		String passwd = EditorSettings::get_singleton()->get("file_server/password");
+		/*String host = EditorSettings::get_singleton()->get("filesystem/file_server/host");
+		int port = EditorSettings::get_singleton()->get("filesystem/file_server/post");
+		String passwd = EditorSettings::get_singleton()->get("filesystem/file_server/password");
 		cl.push_back("-rfs");
 		cl.push_back(host+":"+itos(port));
 		if (passwd!="") {
@@ -1305,7 +1305,7 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d
 	if (_signed) {
 
 
-		String jarsigner=EditorSettings::get_singleton()->get("android/jarsigner");
+		String jarsigner=EditorSettings::get_singleton()->get("export/android/jarsigner");
 		if (!FileAccess::exists(jarsigner)) {
 			EditorNode::add_io_error("'jarsigner' could not be found.\nPlease supply a path in the editor settings.\nResulting apk is unsigned.");
 			return OK;
@@ -1315,9 +1315,9 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d
 		String password;
 		String user;
 		if (p_debug) {
-			keystore=EditorSettings::get_singleton()->get("android/debug_keystore");
-			password=EditorSettings::get_singleton()->get("android/debug_keystore_pass");
-			user=EditorSettings::get_singleton()->get("android/debug_keystore_user");
+			keystore=EditorSettings::get_singleton()->get("export/android/debug_keystore");
+			password=EditorSettings::get_singleton()->get("export/android/debug_keystore_pass");
+			user=EditorSettings::get_singleton()->get("export/android/debug_keystore_user");
 
 			ep.step("Signing Debug APK..",103);
 
@@ -1340,7 +1340,7 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d
 		args.push_back("SHA1");
 		args.push_back("-sigalg");
 		args.push_back("MD5withRSA");
-		String tsa_url=EditorSettings::get_singleton()->get("android/timestamping_authority_url");
+		String tsa_url=EditorSettings::get_singleton()->get("export/android/timestamping_authority_url");
 		if (tsa_url != "") {
 			args.push_back("-tsa");
 			args.push_back(tsa_url);
@@ -1506,7 +1506,7 @@ void EditorExportPlatformAndroid::_device_poll_thread(void *ud) {
 
 	while(!ea->quit_request) {
 
-		String adb=EditorSettings::get_singleton()->get("android/adb");
+		String adb=EditorSettings::get_singleton()->get("export/android/adb");
 		if (FileAccess::exists(adb)) {
 
 			String devices;
@@ -1628,8 +1628,8 @@ void EditorExportPlatformAndroid::_device_poll_thread(void *ud) {
 
 	}
 
-	if (EditorSettings::get_singleton()->get("android/shutdown_adb_on_exit")) {
-		String adb=EditorSettings::get_singleton()->get("android/adb");
+	if (EditorSettings::get_singleton()->get("export/android/shutdown_adb_on_exit")) {
+		String adb=EditorSettings::get_singleton()->get("export/android/adb");
 		if (!FileAccess::exists(adb)) {
 			return; //adb not configured
 		}
@@ -1647,7 +1647,7 @@ Error EditorExportPlatformAndroid::run(int p_device, int p_flags) {
 
 	EditorProgress ep("run","Running on "+devices[p_device].name,3);
 
-	String adb=EditorSettings::get_singleton()->get("android/adb");
+	String adb=EditorSettings::get_singleton()->get("export/android/adb");
 	if (adb=="") {
 
 		EditorNode::add_io_error("ADB executable not configured in settings, can't run.");
@@ -1659,7 +1659,7 @@ Error EditorExportPlatformAndroid::run(int p_device, int p_flags) {
 	ep.step("Exporting APK",0);
 
 
-	bool use_adb_over_usb = bool(EDITOR_DEF("android/use_remote_debug_over_adb",true));
+	bool use_adb_over_usb = bool(EDITOR_DEF("export/android/use_remote_debug_over_adb",true));
 
 	if (use_adb_over_usb) {
 		p_flags|=EXPORT_REMOTE_DEBUG_LOCALHOST;
@@ -1728,7 +1728,7 @@ Error EditorExportPlatformAndroid::run(int p_device, int p_flags) {
 		err = OS::get_singleton()->execute(adb,args,true,NULL,NULL,&rv);
 		print_line("Reverse result: "+itos(rv));
 
-		int fs_port = EditorSettings::get_singleton()->get("file_server/port");
+		int fs_port = EditorSettings::get_singleton()->get("filesystem/file_server/port");
 
 		args.clear();
 		args.push_back("reverse");
@@ -1822,7 +1822,7 @@ EditorExportPlatformAndroid::EditorExportPlatformAndroid() {
 bool EditorExportPlatformAndroid::can_export(String *r_error) const {
 
 	bool valid=true;
-	String adb=EditorSettings::get_singleton()->get("android/adb");
+	String adb=EditorSettings::get_singleton()->get("export/android/adb");
 	String err;
 
 	if (!FileAccess::exists(adb)) {
@@ -1831,7 +1831,7 @@ bool EditorExportPlatformAndroid::can_export(String *r_error) const {
 		err+="ADB executable not configured in editor settings.\n";
 	}
 
-	String js = EditorSettings::get_singleton()->get("android/jarsigner");
+	String js = EditorSettings::get_singleton()->get("export/android/jarsigner");
 
 	if (!FileAccess::exists(js)) {
 
@@ -1839,7 +1839,7 @@ bool EditorExportPlatformAndroid::can_export(String *r_error) const {
 		err+="OpenJDK 6 jarsigner not configured in editor settings.\n";
 	}
 
-	String dk = EditorSettings::get_singleton()->get("android/debug_keystore");
+	String dk = EditorSettings::get_singleton()->get("export/android/debug_keystore");
 
 	if (!FileAccess::exists(dk)) {
 
@@ -1893,20 +1893,20 @@ EditorExportPlatformAndroid::~EditorExportPlatformAndroid() {
 void register_android_exporter() {
 
 	String exe_ext=OS::get_singleton()->get_name()=="Windows"?"exe":"";
-	EDITOR_DEF("android/adb","");
+	EDITOR_DEF("export/android/adb","");
 	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"android/adb",PROPERTY_HINT_GLOBAL_FILE,exe_ext));
-	EDITOR_DEF("android/jarsigner","");
+	EDITOR_DEF("export/android/jarsigner","");
 	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"android/jarsigner",PROPERTY_HINT_GLOBAL_FILE,exe_ext));
-	EDITOR_DEF("android/debug_keystore","");
+	EDITOR_DEF("export/android/debug_keystore","");
 	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"android/debug_keystore",PROPERTY_HINT_GLOBAL_FILE,"keystore"));
-	EDITOR_DEF("android/debug_keystore_user","androiddebugkey");
-	EDITOR_DEF("android/debug_keystore_pass","android");
+	EDITOR_DEF("export/android/debug_keystore_user","androiddebugkey");
+	EDITOR_DEF("export/android/debug_keystore_pass","android");
 	//EDITOR_DEF("android/release_keystore","");
 	//EDITOR_DEF("android/release_username","");
 	//EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"android/release_keystore",PROPERTY_HINT_GLOBAL_FILE,"*.keystore"));
-	EDITOR_DEF("android/timestamping_authority_url","");
-	EDITOR_DEF("android/use_remote_debug_over_adb",false);
-	EDITOR_DEF("android/shutdown_adb_on_exit",true);
+	EDITOR_DEF("export/android/timestamping_authority_url","");
+	EDITOR_DEF("export/android/use_remote_debug_over_adb",false);
+	EDITOR_DEF("export/android/shutdown_adb_on_exit",true);
 
 	Ref<EditorExportPlatformAndroid> exporter = Ref<EditorExportPlatformAndroid>( memnew(EditorExportPlatformAndroid) );
 	EditorImportExport::get_singleton()->add_export_platform(exporter);
diff --git a/platform/bb10/export/export.cpp b/platform/bb10/export/export.cpp
index 6ba97b8b6e..cc994c8f24 100644
--- a/platform/bb10/export/export.cpp
+++ b/platform/bb10/export/export.cpp
@@ -469,7 +469,7 @@ Error EditorExportPlatformBB10::export_project(const String& p_path, bool p_debu
 
 	ep.step("Creating BAR Package..",104);
 
-	String bb_packager=EditorSettings::get_singleton()->get("blackberry/host_tools");
+	String bb_packager=EditorSettings::get_singleton()->get("export/blackberry/host_tools");
 	bb_packager=bb_packager.plus_file("blackberry-nativepackager");
 	if (OS::get_singleton()->get_name()=="Windows")
 		bb_packager+=".bat";
@@ -485,7 +485,7 @@ Error EditorExportPlatformBB10::export_project(const String& p_path, bool p_debu
 	args.push_back(p_path);
 	if (p_debug) {
 
-		String debug_token=EditorSettings::get_singleton()->get("blackberry/debug_token");
+		String debug_token=EditorSettings::get_singleton()->get("export/blackberry/debug_token");
 		if (!FileAccess::exists(debug_token)) {
 			EditorNode::add_io_error("Debug token not found!");
 		} else {
@@ -554,7 +554,7 @@ void EditorExportPlatformBB10::_device_poll_thread(void *ud) {
 
 	while(!ea->quit_request) {
 
-		String bb_deploy=EditorSettings::get_singleton()->get("blackberry/host_tools");
+		String bb_deploy=EditorSettings::get_singleton()->get("export/blackberry/host_tools");
 		bb_deploy=bb_deploy.plus_file("blackberry-deploy");
 		bool windows = OS::get_singleton()->get_name()=="Windows";
 		if (windows)
@@ -567,10 +567,10 @@ void EditorExportPlatformBB10::_device_poll_thread(void *ud) {
 
 			for (int i=0;i<MAX_DEVICES;i++) {
 
-				String host = EditorSettings::get_singleton()->get("blackberry/device_"+itos(i+1)+"/host");
+				String host = EditorSettings::get_singleton()->get("export/blackberry/device_"+itos(i+1)+"/host");
 				if (host==String())
 					continue;
-				String pass = EditorSettings::get_singleton()->get("blackberry/device_"+itos(i+1)+"/password");
+				String pass = EditorSettings::get_singleton()->get("export/blackberry/device_"+itos(i+1)+"/password");
 				if (pass==String())
 					continue;
 
@@ -661,7 +661,7 @@ Error EditorExportPlatformBB10::run(int p_device, int p_flags) {
 
 	ERR_FAIL_INDEX_V(p_device,devices.size(),ERR_INVALID_PARAMETER);
 
-	String bb_deploy=EditorSettings::get_singleton()->get("blackberry/host_tools");
+	String bb_deploy=EditorSettings::get_singleton()->get("export/blackberry/host_tools");
 	bb_deploy=bb_deploy.plus_file("blackberry-deploy");
 	if (OS::get_singleton()->get_name()=="Windows")
 		bb_deploy+=".bat";
@@ -714,8 +714,8 @@ Error EditorExportPlatformBB10::run(int p_device, int p_flags) {
 	args.push_back("-installApp");
 	args.push_back("-launchApp");
 	args.push_back("-device");
-	String host = EditorSettings::get_singleton()->get("blackberry/device_"+itos(p_device+1)+"/host");
-	String pass = EditorSettings::get_singleton()->get("blackberry/device_"+itos(p_device+1)+"/password");
+	String host = EditorSettings::get_singleton()->get("export/blackberry/device_"+itos(p_device+1)+"/host");
+	String pass = EditorSettings::get_singleton()->get("export/blackberry/device_"+itos(p_device+1)+"/password");
 	args.push_back(host);
 	args.push_back("-password");
 	args.push_back(pass);
@@ -761,7 +761,7 @@ EditorExportPlatformBB10::EditorExportPlatformBB10() {
 bool EditorExportPlatformBB10::can_export(String *r_error) const {
 
 	bool valid=true;
-	String bb_deploy=EditorSettings::get_singleton()->get("blackberry/host_tools");
+	String bb_deploy=EditorSettings::get_singleton()->get("export/blackberry/host_tools");
 	String err;
 
 	if (!FileAccess::exists(bb_deploy.plus_file("blackberry-deploy"))) {
@@ -775,7 +775,7 @@ bool EditorExportPlatformBB10::can_export(String *r_error) const {
 		err+="No export template found.\nDownload and install export templates.\n";
 	}
 
-	String debug_token=EditorSettings::get_singleton()->get("blackberry/debug_token");
+	String debug_token=EditorSettings::get_singleton()->get("export/blackberry/debug_token");
 
 	if (!FileAccess::exists(debug_token)) {
 		valid=false;
@@ -806,20 +806,20 @@ EditorExportPlatformBB10::~EditorExportPlatformBB10() {
 
 void register_bb10_exporter() {
 
-	EDITOR_DEF("blackberry/host_tools","");
-	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"blackberry/host_tools",PROPERTY_HINT_GLOBAL_DIR));
-	EDITOR_DEF("blackberry/debug_token","");
-	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"blackberry/debug_token",PROPERTY_HINT_GLOBAL_FILE,"bar"));
-	EDITOR_DEF("blackberry/device_1/host","");
-	EDITOR_DEF("blackberry/device_1/password","");
-	EDITOR_DEF("blackberry/device_2/host","");
-	EDITOR_DEF("blackberry/device_2/password","");
-	EDITOR_DEF("blackberry/device_3/host","");
-	EDITOR_DEF("blackberry/device_3/password","");
-	EDITOR_DEF("blackberry/device_4/host","");
-	EDITOR_DEF("blackberry/device_4/password","");
-	EDITOR_DEF("blackberry/device_5/host","");
-	EDITOR_DEF("blackberry/device_5/password","");
+	EDITOR_DEF("export/blackberry/host_tools","");
+	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"export/blackberry/host_tools",PROPERTY_HINT_GLOBAL_DIR));
+	EDITOR_DEF("export/blackberry/debug_token","");
+	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"export/blackberry/debug_token",PROPERTY_HINT_GLOBAL_FILE,"bar"));
+	EDITOR_DEF("export/blackberry/device_1/host","");
+	EDITOR_DEF("export/blackberry/device_1/password","");
+	EDITOR_DEF("export/blackberry/device_2/host","");
+	EDITOR_DEF("export/blackberry/device_2/password","");
+	EDITOR_DEF("export/blackberry/device_3/host","");
+	EDITOR_DEF("export/blackberry/device_3/password","");
+	EDITOR_DEF("export/blackberry/device_4/host","");
+	EDITOR_DEF("export/blackberry/device_4/password","");
+	EDITOR_DEF("export/blackberry/device_5/host","");
+	EDITOR_DEF("export/blackberry/device_5/password","");
 
 	Ref<EditorExportPlatformBB10> exporter = Ref<EditorExportPlatformBB10>( memnew(EditorExportPlatformBB10) );
 	EditorImportExport::get_singleton()->add_export_platform(exporter);