Merge branch 'core-text-logic' into editor-store

Author: claude

VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/ContentView.swift

@@ -246,6 +246,21 @@ struct ContentView: View {
             printDiagram()
             #endif
         }
+        .onReceive(NotificationCenter.default.publisher(for: DiagramMenuNotification.sharePNG)) { _ in
+            guard !isSimulationMode else { return }
+            exportPNG()
+        }
+        .onReceive(NotificationCenter.default.publisher(for: DiagramMenuNotification.shareDocument)) { _ in
+            guard !isSimulationMode else { return }
+            shareDocumentAsFile()
+        }
+        .onReceive(NotificationCenter.default.publisher(for: DiagramMenuNotification.exportPDF)) { _ in
+            guard !isSimulationMode else { return }
+            shareDiagramPDF()
+        }
+        .onReceive(NotificationCenter.default.publisher(for: DiagramMenuNotification.showAbout)) { _ in
+            showInfo = true
+        }
         .onReceive(NotificationCenter.default.publisher(for: DiagramMenuNotification.close)) { _ in
             guard !isSimulationMode else { return }
             requestCloseDiagramTab(id: tabsModel.selectedTabId)
@@ -590,65 +605,6 @@ struct ContentView: View {
                 .accessibilityLabel(
                     codeGeneratorAccessGranted ? lang.tr("a11y_generate_code") : lang.tr("a11y_generate_code_locked")
                 )
-                Button {
-                    exportPNG()
-                } label: {
-                    Label(lang.tr("action_share_png"), systemImage: "square.and.arrow.up")
-                        .foregroundStyle(isSimulationMode ? .tertiary : .primary)
-                }
-                .buttonStyle(PaletteListElementButtonStyle())
-                .disabledAndDimmed(isSimulationMode)
-                .listRowInsets(
-                    isCompact
-                        ? EdgeInsets(top: 3, leading: 10, bottom: 3, trailing: 10)
-                        : EdgeInsets(top: 5, leading: 12, bottom: 5, trailing: 12)
-                )
-                .listRowSeparator(.hidden)
-                .listRowBackground(Color.clear)
-                Button {
-                    shareDocumentAsFile()
-                } label: {
-                    Label(lang.tr("action_share_document"), systemImage: "square.and.arrow.up.on.square")
-                        .foregroundStyle(isSimulationMode ? .tertiary : .primary)
-                }
-                .buttonStyle(PaletteListElementButtonStyle())
-                .disabledAndDimmed(isSimulationMode)
-                .listRowInsets(
-                    isCompact
-                        ? EdgeInsets(top: 3, leading: 10, bottom: 3, trailing: 10)
-                        : EdgeInsets(top: 5, leading: 12, bottom: 5, trailing: 12)
-                )
-                .listRowSeparator(.hidden)
-                .listRowBackground(Color.clear)
-                Button {
-                    shareDiagramPDF()
-                } label: {
-                    Label(lang.tr("action_export_pdf"), systemImage: "doc.text.magnifyingglass")
-                        .foregroundStyle(isSimulationMode ? .tertiary : .primary)
-                }
-                .buttonStyle(PaletteListElementButtonStyle())
-                .disabledAndDimmed(isSimulationMode)
-                .listRowInsets(
-                    isCompact
-                        ? EdgeInsets(top: 3, leading: 10, bottom: 3, trailing: 10)
-                        : EdgeInsets(top: 5, leading: 12, bottom: 5, trailing: 12)
-                )
-                .listRowSeparator(.hidden)
-                .listRowBackground(Color.clear)
-
-                Button {
-                    showInfo = true
-                } label: {
-                    Label(lang.tr("action_about"), systemImage: "info.circle")
-                }
-                .buttonStyle(PaletteListElementButtonStyle())
-                .listRowInsets(
-                    isCompact
-                        ? EdgeInsets(top: 3, leading: 10, bottom: 4, trailing: 10)
-                        : EdgeInsets(top: 5, leading: 12, bottom: 8, trailing: 12)
-                )
-                .listRowSeparator(.hidden)
-                .listRowBackground(Color.clear)
             }
         }
         .listStyle(.insetGrouped)
@@ -745,6 +701,10 @@ struct ContentView: View {
             onSave: performPrimarySave,
             onSaveAs: { showExporter = true },
             onPrint: printAction,
+            onSharePNG: exportPNG,
+            onShareDocument: shareDocumentAsFile,
+            onExportPDF: shareDiagramPDF,
+            onShowAbout: { showInfo = true },
             onKeyboardDismiss: {
                 focusedField = nil
                 if isPhone { hideInspectorOnPhone = true }

VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/Toolbar/DiagramMainEditorToolbar.swift

@@ -1,6 +1,6 @@
 import SwiftUI
 
-/// Hauptfenster-Toolbar: Titel, Undo/Redo, Datei-Menü, Palette (iPhone), Tastatur „Fertig“.
+/// Hauptfenster-Toolbar: Titel, Undo/Redo, Datei-Menü (inkl. Teilen/Export und Info), Palette (iPhone), Tastatur „Fertig“.
 /// Diagramm-Reiter liegen in `DiagramTabStrip`.
 struct DiagramMainEditorToolbar: ToolbarContent {
     @Environment(\.appLanguage) private var lang
@@ -29,6 +29,11 @@ struct DiagramMainEditorToolbar: ToolbarContent {
     /// Nur unter UIKit (Druck); sonst `nil` und kein Eintrag.
     let onPrint: (() -> Void)?
 
+    let onSharePNG: () -> Void
+    let onShareDocument: () -> Void
+    let onExportPDF: () -> Void
+    let onShowAbout: () -> Void
+
     let onKeyboardDismiss: () -> Void
 
     var body: some ToolbarContent {
@@ -76,8 +81,8 @@ struct DiagramMainEditorToolbar: ToolbarContent {
             Menu {
                 Button(action: onOpenImporter) {
                     Label(lang.tr("menu_open"), systemImage: "square.and.arrow.down")
-                        .foregroundStyle(isSimulationMode ? .tertiary : .primary)
                 }
+                .disabled(isSimulationMode)
                 Menu {
                     if recentFiles.isEmpty {
                         Text(lang.tr("recent_files_empty"))
@@ -97,26 +102,43 @@ struct DiagramMainEditorToolbar: ToolbarContent {
                 } label: {
                     Label(lang.tr("recent_files_menu"), systemImage: "clock")
                 }
+                .disabled(isSimulationMode)
                 Divider()
-                Button(action: onSave) {
-                    Label(lang.tr("menu_save"), systemImage: "arrow.down.doc")
-                }
-                Button(action: onSaveAs) {
-                    Label(lang.tr("menu_save_as"), systemImage: "square.and.arrow.up")
+                Group {
+                    Button(action: onSave) {
+                        Label(lang.tr("menu_save"), systemImage: "arrow.down.doc")
+                    }
+                    Button(action: onSaveAs) {
+                        Label(lang.tr("menu_save_as"), systemImage: "square.and.arrow.up")
+                    }
                 }
-                #if canImport(UIKit)
-                if let onPrint {
-                    Divider()
-                    Button(action: onPrint) {
-                        Label(lang.tr("menu_print"), systemImage: "printer")
+                .disabled(isSimulationMode)
+                Section {
+                    Button(action: onShareDocument) {
+                        Label(lang.tr("action_share_document"), systemImage: "square.and.arrow.up.on.square")
+                    }
+                    Button(action: onSharePNG) {
+                        Label(lang.tr("action_share_png"), systemImage: "photo")
+                    }
+                    Button(action: onExportPDF) {
+                        Label(lang.tr("action_export_pdf"), systemImage: "doc.text.magnifyingglass")
                     }
+                    #if canImport(UIKit)
+                    if let onPrint {
+                        Button(action: onPrint) {
+                            Label(lang.tr("menu_print"), systemImage: "printer")
+                        }
+                    }
+                    #endif
+                }
+                .disabled(isSimulationMode)
+                Divider()
+                Button(action: onShowAbout) {
+                    Label(lang.tr("action_about"), systemImage: "info.circle")
                 }
-                #endif
             } label: {
                 Label(lang.tr("menu_file"), systemImage: "folder")
-                    .foregroundStyle(isSimulationMode ? .tertiary : .primary)
             }
-            .disabledAndDimmed(isSimulationMode)
         }
         #if canImport(UIKit)
         ToolbarItemGroup(placement: .keyboard) {

VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/VisuStructApp.swift

@@ -47,6 +47,10 @@ enum DiagramMenuNotification {
     static let printDocument = Notification.Name("visustruct.menu.print")
     static let close = Notification.Name("visustruct.menu.close")
     static let openRecent = Notification.Name("visustruct.menu.openRecent")
+    static let sharePNG = Notification.Name("visustruct.menu.sharePNG")
+    static let shareDocument = Notification.Name("visustruct.menu.shareDocument")
+    static let exportPDF = Notification.Name("visustruct.menu.exportPDF")
+    static let showAbout = Notification.Name("visustruct.menu.showAbout")
 
     static let recentFileIDKey = "id"
 }
@@ -124,6 +128,22 @@ final class DiagramCommandCenter: ObservableObject {
         NotificationCenter.default.post(name: DiagramMenuNotification.close, object: nil)
     }
 
+    func sharePNG() {
+        NotificationCenter.default.post(name: DiagramMenuNotification.sharePNG, object: nil)
+    }
+
+    func shareDocument() {
+        NotificationCenter.default.post(name: DiagramMenuNotification.shareDocument, object: nil)
+    }
+
+    func exportPDF() {
+        NotificationCenter.default.post(name: DiagramMenuNotification.exportPDF, object: nil)
+    }
+
+    func showAbout() {
+        NotificationCenter.default.post(name: DiagramMenuNotification.showAbout, object: nil)
+    }
+
     func openRecent(_ file: RecentVisuStructFile) {
         NotificationCenter.default.post(
             name: DiagramMenuNotification.openRecent,
@@ -297,6 +317,11 @@ private struct VisuStructCommands: Commands {
     }
 
     var body: some Commands {
+        CommandGroup(replacing: .appInfo) {
+            Button(lang.tr("action_about")) {
+                commandCenter.showAbout()
+            }
+        }
         CommandGroup(replacing: .newItem) {
             Button(lang.tr("menu_new")) {
                 commandCenter.newDocument()
@@ -316,6 +341,18 @@ private struct VisuStructCommands: Commands {
             .keyboardShortcut("s", modifiers: [.command, .shift])
             .disabled(!commandCenter.canSaveAs)
             Divider()
+            Button(lang.tr("action_share_document")) {
+                commandCenter.shareDocument()
+            }
+            .disabled(!commandCenter.canPrint)
+            Button(lang.tr("action_share_png")) {
+                commandCenter.sharePNG()
+            }
+            .disabled(!commandCenter.canPrint)
+            Button(lang.tr("action_export_pdf")) {
+                commandCenter.exportPDF()
+            }
+            .disabled(!commandCenter.canPrint)
             Button(lang.tr("menu_print")) {
                 commandCenter.printDocument()
             }