zui 0.0.2 → 0.0.4

data/Components/Builtins/ModalSheet.qml

@@ -130,7 +130,7 @@ QQC.Popup {
         visible: renderer.prop("show_close", true) !== false
           && renderer.prop("dismissible", true) !== false
         text: renderer.iconGlyph("xmark")
-        font.family: renderer.fontFamily
+        font.family: renderer.iconFontFamily
         font.pixelSize: Number(renderer.prop("font_size", Style.font.body))
         onClicked: modalSheetRoot.dismiss("close_button")
       }

data/Components/Builtins/MultiSelect.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/NavigationRail.qml

@@ -103,7 +103,7 @@ QQC.Pane {
               color: parent.selected ? renderer.prop("accent", Color.accent)
                 : (parent.available ? renderer.prop("foreground", renderer.foreground)
                   : renderer.prop("muted", Color.muted))
-              font.family: renderer.fontFamily
+              font.family: renderer.iconFontFamilyFor(railRoot.itemValue(index, "icon", "circle_info"))
               font.pixelSize: Number(renderer.prop("icon_size", Style.font.icon))
               anchors.verticalCenter: parent.verticalCenter
             }

data/Components/Builtins/NumberField.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/OpticalGlyph.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 
@@ -12,5 +10,5 @@ ZuiControls.OpticalGlyph {
   fontSize: Number(renderer.prop("size", Style.font.body))
   color: renderer.prop("color", renderer.foreground)
   debugBounds: renderer.prop("debug_bounds", false) === true
-  fontFamily: renderer.fontFamily
+  fontFamily: renderer.iconFontFamilyFor(renderer.prop("text", ""))
 }

data/Components/Builtins/PanelHero.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/PasswordField.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 
@@ -41,7 +39,7 @@ Item {
           text: renderer.iconGlyph(passwordRoot.revealState ? "eye_slash" : "eye")
           textFormat: Text.PlainText
           color: renderer.foreground
-          font.family: renderer.fontFamily
+          font.family: renderer.iconFontFamily
           font.pixelSize: Style.font.icon
         }
         TapHandler {

data/Components/Builtins/Progress.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/RadioButton.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/RadioGroup.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/RangeSlider.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/Rectangle.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/RichText.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/RoundButton.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 
@@ -28,7 +26,9 @@ QQC.RoundButton {
         text: String(renderer.prop("icon", "")).length > 0 ? renderer.iconGlyph(renderer.prop("icon", "")) : nativeRoundButton.text
         textFormat: Text.PlainText
         color: nativeRoundButton.checked ? Color.background : renderer.prop("foreground", renderer.foreground)
-        font.family: String(renderer.prop("font_family", renderer.fontFamily))
+        font.family: String(renderer.prop("icon", "")).length > 0
+          ? renderer.iconFontFamilyFor(renderer.prop("icon", ""))
+          : String(renderer.prop("font_family", renderer.fontFamily))
         font.pixelSize: Number(String(renderer.prop("icon", "")).length > 0 ? renderer.prop("icon_size", Style.font.icon) : renderer.prop("font_size", Style.font.body))
         font.bold: true
         horizontalAlignment: Text.AlignHCenter

data/Components/Builtins/Row.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/RowLayout.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/ScreenCapture.qml

@@ -1,5 +1,5 @@
-import QtMultimedia
 import QtQuick
+import QtMultimedia
 
 Item {
     id: screenRoot

data/Components/Builtins/Scroll.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/SearchableDropdown.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/SectionHeader.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/SelectableText.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/Separator.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/Slider.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/Spacer.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/SpinBox.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/SplitView.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/Stack.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/StackLayout.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/SwipeDelegate.qml

@@ -106,7 +106,7 @@ QQC.SwipeDelegate {
       text: String(renderer.prop("icon", "")).length > 0
         ? renderer.iconGlyph(renderer.prop("icon", "")) : ""
       color: renderer.prop("icon_color", renderer.prop("foreground", renderer.foreground))
-      font.family: renderer.fontFamily
+      font.family: renderer.iconFontFamilyFor(renderer.prop("icon", ""))
       font.pixelSize: Number(renderer.prop("icon_size", 22))
       horizontalAlignment: Text.AlignHCenter
     }
@@ -147,7 +147,7 @@ QQC.SwipeDelegate {
           visible: text.length > 0
           text: renderer.iconGlyph(renderer.prop("left_icon", ""))
           color: Color.background
-          font.family: renderer.fontFamily
+          font.family: renderer.iconFontFamilyFor(renderer.prop("left_icon", ""))
           font.pixelSize: Number(renderer.prop("icon_size", 22))
         }
         Text {
@@ -174,7 +174,7 @@ QQC.SwipeDelegate {
           visible: text.length > 0
           text: renderer.iconGlyph(renderer.prop("right_icon", ""))
           color: Color.background
-          font.family: renderer.fontFamily
+          font.family: renderer.iconFontFamilyFor(renderer.prop("right_icon", ""))
           font.pixelSize: Number(renderer.prop("icon_size", 22))
         }
         Text {

data/Components/Builtins/TabButton.qml

@@ -45,7 +45,7 @@ QQC.TabButton {
         && String(renderer.prop("icon_source", "")).length === 0
       text: renderer.iconGlyph(renderer.prop("icon", ""))
       color: renderer.prop("icon_color", renderer.prop("foreground", renderer.foreground))
-      font.family: renderer.fontFamily
+      font.family: renderer.iconFontFamilyFor(renderer.prop("icon", ""))
       font.pixelSize: Number(renderer.prop("icon_width", Style.font.body))
       anchors.verticalCenter: parent.verticalCenter
     }

data/Components/Builtins/Text.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/TextArea.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/TextField.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/TextMetrics.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/Toast.qml

@@ -105,7 +105,7 @@ QQC.Popup {
       text: renderer.iconGlyph(toastRoot.severityIcon())
       textFormat: Text.PlainText
       color: toastRoot.severityColor()
-      font.family: renderer.fontFamily
+      font.family: renderer.iconFontFamily
       font.pixelSize: Number(renderer.prop("icon_size", 22))
     }
 

data/Components/Builtins/Toggle.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/ToggleSwitch.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/ToolButton.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 
@@ -28,7 +26,9 @@ QQC.ToolButton {
         text: String(renderer.prop("icon", "")).length > 0 ? renderer.iconGlyph(renderer.prop("icon", "")) : nativeToolButton.text
         textFormat: Text.PlainText
         color: nativeToolButton.checked ? Color.background : renderer.prop("foreground", renderer.foreground)
-        font.family: String(renderer.prop("font_family", renderer.fontFamily))
+        font.family: String(renderer.prop("icon", "")).length > 0
+          ? renderer.iconFontFamilyFor(renderer.prop("icon", ""))
+          : String(renderer.prop("font_family", renderer.fontFamily))
         font.pixelSize: Number(String(renderer.prop("icon", "")).length > 0 ? renderer.prop("icon_size", Style.font.icon) : renderer.prop("font_size", Style.font.body))
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter

data/Components/Builtins/Tooltip.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/VectorImage.qml

@@ -1,8 +1,7 @@
 import QtQuick
+import QtQuick.VectorImage
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/Video.qml

@@ -1,8 +1,7 @@
 import QtQuick
+import QtMultimedia
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/WidgetButton.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/Components/Builtins/Wrap.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "../../Theme"
 import "../../Controls" as ZuiControls
 

data/ControlNode.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Controls as QQC
 import QtQuick.Layouts
-import QtMultimedia
-import QtQuick.VectorImage
 import "Theme"
 import "Controls" as ZuiControls
 import "Components/Builtins" as Builtins
@@ -15,6 +13,8 @@ Loader {
   property string controlId: ""
   property color foreground: Color.foreground
   property string fontFamily: Style.font.family
+  readonly property string iconFontFamily: Fonts.iconFamily
+  readonly property string brandIconFontFamily: Fonts.brandIconFamily
 
   // Shared recursive delegates are framework infrastructure. Individual built-in
   // renderers consume these without duplicating ControlNode's lifecycle wiring.
@@ -35,7 +35,7 @@ Loader {
     "number_field", "text_area", "search_field", "password_field", "slider", "range_slider", "dial", "spin_box", "double_spin_box", "color_picker", "date_picker", "time_picker", "file_picker", "folder_picker", "font_picker", "dialog_button_box", "action", "action_group", "dropdown", "multi_select", "button_group", "progress", "line_chart", "area_chart", "bar_chart", "separator", "divider",
     "section_header", "searchable_dropdown", "confirm_dialog", "panel_hero", "optical_glyph",
     "cursor_surface", "widget_button", "list_view", "key_catcher", "canvas", "shape", "line", "path", "circle", "gradient", "shader_effect", "shader_effect_source", "multi_effect", "rectangular_shadow", "opacity_mask", "blur", "drop_shadow", "colorize", "glow", "particle_system",
-    "web_view", "data_table", "horizontal_header", "vertical_header", "table_view_delegate", "tree_view_delegate", "horizontal_header_delegate", "vertical_header_delegate", "reorderable_list", "carousel", "calendar", "month_grid", "week_number_column", "day_of_week_row", "tumbler",
+    "data_table", "horizontal_header", "vertical_header", "table_view_delegate", "tree_view_delegate", "horizontal_header_delegate", "vertical_header_delegate", "reorderable_list", "carousel", "calendar", "month_grid", "week_number_column", "day_of_week_row", "tumbler",
     "stacked_bar_chart", "pie_chart", "donut_chart", "scatter_chart", "bubble_chart", "radar_chart", "heatmap", "sparkline", "gauge", "radial_gauge", "histogram", "candlestick_chart", "legend",
     "drag_area", "drop_area", "pinch_area", "hover_area", "selection_rectangle", "scroll_bar", "scroll_indicator",
     "animation", "number_animation", "color_animation", "rotation_animation", "vector_animation", "path_animation", "property_animation", "pause_animation", "script_action", "property_action", "parallel_animation", "sequential_animation", "spring_animation", "smoothed_animation", "anchor_animation", "parent_animation", "opacity_animator", "rotation_animator", "scale_animator", "x_animator", "y_animator", "uniform_animator", "frame_animation", "animation_controller", "behavior", "transition", "state", "state_group", "property_changes", "anchor_changes", "parent_change", "timer",
@@ -55,7 +55,7 @@ Loader {
 
   function iconGlyph(name) {
     var icons = {
-      ruby: "\ue23e",
+      ruby: "\uf3a5",
       phone: "\uf3cd",
       plus: "\uf067",
       minus: "\uf068",
@@ -78,6 +78,12 @@ Loader {
     return icons[key] || key
   }
 
+  function iconFontFamilyFor(name) {
+    var key = String(name || "")
+    return ["bluetooth", "android", "apple"].indexOf(key) >= 0
+      ? brandIconFontFamily : iconFontFamily
+  }
+
   function escapeAutoText(value) {
     return String(value === undefined || value === null ? "" : value)
       .replace(/&/g, "&")
@@ -298,12 +304,9 @@ Loader {
     if (node.type === "container") return containerComponent
     if (node.type === "image") return imageComponent
     if (node.type === "vector_image") return vectorImageComponent
-    if (node.type === "model_view_3d") return modelView3dComponent
     if (node.type === "font_loader") return fontLoaderComponent
     if (node.type === "text_metrics") return textMetricsComponent
     if (node.type === "animated_image") return animatedImageComponent
-    if (node.type === "video") return videoComponent
-    if (node.type === "audio") return audioComponent
     if (node.type === "avatar") return avatarComponent
     if (node.type === "badge") return badgeComponent
     if (node.type === "chip") return chipComponent
@@ -580,11 +583,6 @@ Loader {
     Builtins.VectorImage { renderer: root }
   }
 
-  Component {
-    id: modelView3dComponent
-    Builtins.ModelView3d { renderer: root }
-  }
-
   Component {
     id: fontLoaderComponent
     Builtins.FontLoader { renderer: root }
@@ -600,16 +598,6 @@ Loader {
     Builtins.AnimatedImage { renderer: root }
   }
 
-  Component {
-    id: videoComponent
-    Builtins.Video { renderer: root }
-  }
-
-  Component {
-    id: audioComponent
-    Builtins.Audio { renderer: root }
-  }
-
   Component {
     id: avatarComponent
     Builtins.Avatar { renderer: root }

data/Controls/BarIconButton.qml

@@ -10,7 +10,7 @@ Item {
   property color activeColor: Color.accent
   property real slotSize: 30
   property real opticalSize: 18
-  property string fontFamily: Style.font.family
+  property string fontFamily: Fonts.iconFamily
   property real fontSize: Style.font.icon
   property real textRotation: 0
   property bool keepSpace: false

data/Controls/BarIndicator.qml

@@ -11,7 +11,7 @@ Item {
   property string indicatorBlock: "single"
   property color foreground: Color.foreground
   property color activeColor: Color.accent
-  property string fontFamily: Style.font.family
+  property string fontFamily: Fonts.iconFamily
   property real fontSize: Style.font.caption
   signal pressed(int button)
   signal wheelMoved(real delta)

data/Controls/Button.qml

@@ -15,6 +15,7 @@ Item {
   property color background: "transparent"
   property color accent: Color.accent
   property string fontFamily: Style.font.family
+  property string iconFontFamily: Fonts.iconFamily
   property real fontSize: Style.font.body
   property real iconSize: Style.font.icon
   property real iconRotation: 0
@@ -53,7 +54,7 @@ Item {
       visible: root.iconText !== ""
       text: root.iconText
       color: root.selected || root.active ? Color.background : root.foreground
-      font.family: root.fontFamily
+      font.family: root.iconFontFamily
       font.pixelSize: root.iconSize
       rotation: root.iconRotation
     }

data/Controls/OpticalGlyph.qml

@@ -10,5 +10,5 @@ Item {
   implicitWidth: glyph.implicitWidth
   implicitHeight: glyph.implicitHeight
   Rectangle { anchors.fill: parent; visible: parent.debugBounds; color: "transparent"; border.color: Color.accent }
-  Text { id: glyph; anchors.centerIn: parent; color: Color.foreground; font.family: Style.font.family; font.pixelSize: Style.font.icon }
+  Text { id: glyph; anchors.centerIn: parent; color: Color.foreground; font.family: Fonts.iconFamily; font.pixelSize: Style.font.icon }
 }