Explorar el Código

Merge pull request #75898 from YuriSizov/docs-make-rst-enhancements-3.x

Update `make_rst.py` to match the master version
Rémi Verschelde hace 2 años
padre
commit
b14a759fb3
Se han modificado 4 ficheros con 766 adiciones y 269 borrados
  1. 1 1
      doc/classes/EditorSettings.xml
  2. 1 1
      doc/classes/OS.xml
  3. 761 267
      doc/tools/make_rst.py
  4. 3 0
      editor/doc/doc_data.cpp

+ 1 - 1
doc/classes/EditorSettings.xml

@@ -811,7 +811,7 @@
 		</member>
 		<member name="text_editor/indent/type" type="int" setter="" getter="">
 			The indentation style to use (tabs or spaces).
-			[b]Note:[/b] The [url=$DOCS_URL/getting_started/scripting/gdscript/gdscript_styleguide.html]GDScript style guide[/url] recommends using tabs for indentation. It is advised to change this setting only if you need to work on a project that currently uses spaces for indentation.
+			[b]Note:[/b] The [url=$DOCS_URL/tutorials/scripting/gdscript/gdscript_styleguide.html]GDScript style guide[/url] recommends using tabs for indentation. It is advised to change this setting only if you need to work on a project that currently uses spaces for indentation.
 		</member>
 		<member name="text_editor/navigation/drag_and_drop_selection" type="bool" setter="" getter="">
 			If [code]true[/code], allows drag-and-dropping text in the script editor to move text. Disable this if you find yourself accidentally drag-and-dropping text in the script editor.

+ 1 - 1
doc/classes/OS.xml

@@ -1183,7 +1183,7 @@
 			The minimum size of the window in pixels (without counting window manager decorations). Does not affect fullscreen mode. Set to [code](0, 0)[/code] to reset to the system's default value.
 			[b]Note:[/b] By default, the project window has a minimum size of [code]Vector2(64, 64)[/code]. This prevents issues that can arise when the window is resized to a near-zero size.
 		</member>
-		<member name="screen_orientation" type="int" setter="set_screen_orientation" getter="get_screen_orientation" enum="_OS.ScreenOrientation" default="0">
+		<member name="screen_orientation" type="int" setter="set_screen_orientation" getter="get_screen_orientation" enum="OS.ScreenOrientation" default="0">
 			The current screen orientation.
 		</member>
 		<member name="tablet_driver" type="String" setter="set_current_tablet_driver" getter="get_current_tablet_driver" default="&quot;&quot;">

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 761 - 267
doc/tools/make_rst.py


+ 3 - 0
editor/doc/doc_data.cpp

@@ -384,6 +384,9 @@ void DocData::generate(bool p_basic_types) {
 					found_type = true;
 					if (retinfo.type == Variant::INT && retinfo.usage & PROPERTY_USAGE_CLASS_IS_ENUM) {
 						prop.enumeration = retinfo.class_name;
+						if (prop.enumeration.begins_with("_")) { //proxy class
+							prop.enumeration = prop.enumeration.substr(1, prop.enumeration.length());
+						}
 						prop.type = "int";
 					} else if (retinfo.class_name != StringName()) {
 						prop.type = retinfo.class_name;

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio