Merge branch 'main' into 'main'

Draft: Created Tutorial page; TODOs pending.

See merge request jwestman/blueprint-compiler!66

blueprintcompiler/language/values.py

@@ -225,12 +225,12 @@ class Flag(AstNode):
         return self.tokens["value"]
 
     @property
-    def value(self) -> T.Optional[str]:
+    def value(self) -> T.Optional[int]:
         type = self.context[ValueTypeCtx].value_type
         if not isinstance(type, Enumeration):
             return None
         elif member := type.members.get(self.name):
-            return member.nick
+            return member.value
         else:
             return None
 

docs/collect-sections.py

@@ -132,8 +132,5 @@ if __name__ == "__main__":
     # print the sections to a json file
     with open(outfile, "w") as f:
         json.dump(
-            {name: section.to_json() for name, section in sections.items()},
-            f,
-            indent=2,
-            sort_keys=True,
+            {name: section.to_json() for name, section in sections.items()}, f, indent=2
         )

docs/index.rst

@@ -26,7 +26,7 @@ Blueprint is a markup language and compiler for GTK 4 user interfaces.
 
    using Gtk 4.0;
 
-   template $MyAppWindow: ApplicationWindow {
+   template MyAppWindow : ApplicationWindow {
      default-width: 600;
      default-height: 300;
      title: _("Hello, Blueprint!");
@@ -35,7 +35,7 @@ Blueprint is a markup language and compiler for GTK 4 user interfaces.
      HeaderBar {}
 
      Label {
-       label: bind template.main_text;
+       label: bind MyAppWindow.main_text;
      }
    }
 

tests/samples/flags.ui

@@ -7,7 +7,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
 <interface>
   <requires lib="gtk" version="4.0"/>
   <object class="GApplication">
-    <property name="flags">is-service|handles-open</property>
+    <property name="flags">1|4</property>
   </object>
   <object class="GtkEventControllerScroll">
     <property name="flags">1</property>