Move version info to separate file, update byte-code version info.

bruvzg · Mar 13, 2019 · eae1872 · eae1872
1 parent 93aac27
commit eae1872
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 8 deletions.
diff --git a/bytecode/bytecode_versions.h b/bytecode/bytecode_versions.h
@@ -59,8 +59,8 @@ struct GDScriptDecompVersion {
 
 static GDScriptDecompVersion decomp_versions[] = {
 
-	{ 0x1a36141, "3.1.0 beta 6 (1a36141 / 2019-02-20 / Bytecode version: 13)" },
-	{ 0x1ca61a3, "3.1.0 beta 1 - beta 5 (1ca61a3 / 2018-10-31 / Bytecode version: 13)" },
+	{ 0x1a36141, "3.1.0 release (1a36141 / 2019-02-20 / Bytecode version: 13)" },
+	{ 0x1ca61a3, "     3.1 beta 1 - beta 5 (1ca61a3 / 2018-10-31 / Bytecode version: 13)" },
 	{ 0xd6b31da, "     3.1 dev (d6b31da / 2018-09-15 / Bytecode version: 13)" },
 	{ 0x8aab9a0, "     3.1 dev (8aab9a0 / 2018-07-20 / Bytecode version: 13)" },
 	{ 0xa3f1ee5, "     3.1 dev (a3f1ee5 / 2018-07-15 / Bytecode version: 13)" },

diff --git a/editor/gdre_editor.cpp b/editor/gdre_editor.cpp
@@ -2,6 +2,8 @@
 /*  gdre_editor.cpp                                                      */
 /*************************************************************************/
 
+#include "gdre_version.h"
+
 #include "gdre_editor.h"
 
 #include "modules/gdscript/gdscript.h"
@@ -399,7 +401,7 @@ void GodotREEditor::init_gui(Control *p_control, HBoxContainer *p_menu, bool p_l
 		about_label->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 		about_label->set_autowrap(true);
 		String about_text =
-				String("Godot RE Tools, v0.0.3-poc \n\n") +
+				String("Godot RE Tools, ") + String(GDRE_VERSION) + String(" \n\n") +
 				RTR(String("Resources, binary code and source code might be protected by copyright and trademark\n") +
 						"laws. Before using this software make sure that decompilation is not prohibited by the\n" +
 						"applicable license agreement, permitted under applicable law or you obtained explicit\n" +
@@ -1690,7 +1692,7 @@ void GodotREEditor::_notification(int p_notification) {
 				show_about_dialog();
 				about_dialog->set_exclusive(false);
 			}
-			emit_signal("write_log_message", "****\nGodot RE Tools, v0.0.3-poc\n****\n\n");
+			emit_signal("write_log_message", String("****\nGodot RE Tools, ") + String(GDRE_VERSION) + String("\n****\n\n"));
 		}
 	}
 }
@@ -1753,10 +1755,17 @@ void GodotREEditorStandalone::_write_log_message(String p_message) {
 	emit_signal("write_log_message", p_message);
 }
 
+String GodotREEditorStandalone::get_version() {
+
+	return String(GDRE_VERSION);
+}
+
 void GodotREEditorStandalone::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("_write_log_message"), &GodotREEditorStandalone::_write_log_message);
 	ADD_SIGNAL(MethodInfo("write_log_message", PropertyInfo(Variant::STRING, "message")));
+
+	ClassDB::bind_method(D_METHOD("get_version"), &GodotREEditorStandalone::get_version);
 }
 
 GodotREEditorStandalone::GodotREEditorStandalone() {

diff --git a/editor/gdre_editor.h b/editor/gdre_editor.h
@@ -314,6 +314,7 @@ class GodotREEditorStandalone : public Control {
 
 public:
 	void _write_log_message(String p_message);
+	String get_version();
 
 	GodotREEditorStandalone();
 	~GodotREEditorStandalone();

diff --git a/editor/gdre_npck_dlg.cpp b/editor/gdre_npck_dlg.cpp
@@ -6,6 +6,8 @@
 
 #include "core/version.h"
 
+#include "gdre_version.h"
+
 NewPackDialog::NewPackDialog() {
 
 	set_title(RTR("Create new PCK..."));
@@ -51,7 +53,7 @@ NewPackDialog::NewPackDialog() {
 	script_vb->add_margin_child(RTR("Target Godot engine version:"), dir_hbc);
 
 	wmark = memnew(LineEdit);
-	wmark->set_text(String("Created with Godot RE tools, v0.0.1-poc!"));
+	wmark->set_text(String("Created with Godot RE tools, ") + String(GDRE_VERSION));
 	script_vb->add_margin_child(RTR("Extra tag:"), wmark);
 
 	add_child(script_vb);

diff --git a/editor/gdre_version.h b/editor/gdre_version.h
@@ -0,0 +1 @@
+#define GDRE_VERSION "v0.0.4-poc (for Godot 3.1)"
diff --git a/misc/dist/Godot RE Tools.app/Contents/Info.plist b/misc/dist/Godot RE Tools.app/Contents/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>rerools</string>
+	<string>gdretools</string>
 	<key>CFBundleName</key>
 	<string>Godot RE Tools</string>
 	<key>CFBundleIconFile</key>

diff --git a/standalone/icon.png.import b/standalone/icon.png.import
@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 

diff --git a/standalone/main.gd b/standalone/main.gd
@@ -1,5 +1,8 @@
 extends Control
 
+func _ready():
+	$menu_background/version_lbl.text = $re_editor_standalone.get_version()
+
 func _on_re_editor_standalone_write_log_message(message):
 	$log_window.text += message
 	$log_window.scroll_to_line($log_window.get_line_count() - 1)

diff --git a/standalone/main.tscn b/standalone/main.tscn
@@ -27,12 +27,13 @@ anchor_left = 1.0
 anchor_top = 0.5
 anchor_right = 1.0
 anchor_bottom = 0.5
-margin_left = -97.0
+margin_left = -209.0
 margin_top = -10.0
 margin_right = -4.0
 margin_bottom = 12.0
-text = "v0.0.3-poc"
+text = "$$$"
 flat = true
+align = 2
 
 [node name="re_editor_standalone" type="GodotREEditorStandalone" parent="."]
 anchor_right = 1.0

diff --git a/standalone/project.godot b/standalone/project.godot
@@ -25,6 +25,10 @@ window/size/width=1200
 window/size/height=1024
 window/dpi/allow_hidpi=true
 
+[editor]
+
+convert_text_resources_to_binary_on_export=true
+
 [rendering]
 
 quality/driver/driver_name="GLES2"