bash-script-maker 1.7.0__tar.gz → 1.9.0__tar.gz

{bash-script-maker-1.7.0/bash_script_maker.egg-info → bash-script-maker-1.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bash-script-maker
-Version: 1.7.0
+Version: 1.9.0
 Summary: Ein GUI-Programm zur Erstellung von Bash-Scripts mit visueller Unterstützung
 Home-page: https://github.com/securebitsorg/bash-script-maker
 Author: Marcel Dellmann

bash-script-maker-1.9.0/VERSION

@@ -0,0 +1 @@
+1.9.0

{bash-script-maker-1.7.0 → bash-script-maker-1.9.0}/__version__.py

@@ -4,5 +4,5 @@
 Version information for Bash-Script-Maker
 """
 
-__version__ = "1.7.0"
-__version_info__ = (1, 7, 0)
+__version__ = "1.9.0"
+__version_info__ = (1, 9, 0)

{bash-script-maker-1.7.0 → bash-script-maker-1.9.0/bash_script_maker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bash-script-maker
-Version: 1.7.0
+Version: 1.9.0
 Summary: Ein GUI-Programm zur Erstellung von Bash-Scripts mit visueller Unterstützung
 Home-page: https://github.com/securebitsorg/bash-script-maker
 Author: Marcel Dellmann

{bash-script-maker-1.7.0 → bash-script-maker-1.9.0}/bash_script_maker.py

@@ -125,18 +125,26 @@ class AboutDialog(ttk.Toplevel):
     def __init__(self, parent):
         super().__init__(parent)
         self.title(_("Über Bash-Script-Maker"))
-        self.geometry("450x350")
+        self.geometry("500x450")
+        self.resizable(False, False)
 
         container = ttk.Frame(self, padding=20)
         container.pack(fill=tk.BOTH, expand=True)
 
+        # Logo und Titel-Bereich
+        header_frame = ttk.Frame(container)
+        header_frame.pack(fill=tk.X, pady=(0, 20))
+
+        # Logo hinzufügen
+        self.add_logo_to_header(header_frame)
+
         title_label = ttk.Label(
-            container,
+            header_frame,
             text="Bash-Script-Maker",
-            font=("", 18, "bold"),
+            font=("Arial", 20, "bold"),
             bootstyle="primary",
         )
-        title_label.pack(pady=(0, 10))
+        title_label.pack(pady=(10, 0))
 
         desc_text = _("Ein GUI-Programm zur einfachen Erstellung von Bash-Scripts.")
         desc_label = ttk.Label(container, text=desc_text, wraplength=400)
@@ -182,6 +190,44 @@ class AboutDialog(ttk.Toplevel):
         )
         version_label.pack(pady=(15, 0))
 
+        # Schließen-Button
+        close_btn = ttk.Button(
+            container, text=_("Schließen"), command=self.destroy, bootstyle="primary"
+        )
+        close_btn.pack(pady=(20, 0))
+
+    def add_logo_to_header(self, header_frame):
+        """Fügt das Logo zum About-Dialog-Header hinzu"""
+        try:
+            script_dir = os.path.dirname(os.path.abspath(__file__))
+            logo_path = os.path.join(script_dir, "assets", "bash-script-maker-64.png")
+
+            if os.path.exists(logo_path):
+                try:
+                    from PIL import Image, ImageTk
+
+                    # Logo für About-Dialog (64x64)
+                    img = Image.open(logo_path)
+                    logo_photo = ImageTk.PhotoImage(img)
+
+                    logo_label = ttk.Label(header_frame, image=logo_photo)
+                    logo_label.image = logo_photo  # Referenz behalten
+                    logo_label.pack(anchor=tk.CENTER)
+
+                except ImportError:
+                    # Fallback: Großes Emoji
+                    logo_label = ttk.Label(header_frame, text="🖥️", font=("Arial", 48))
+                    logo_label.pack(anchor=tk.CENTER)
+            else:
+                # Fallback: Emoji
+                logo_label = ttk.Label(header_frame, text="🖥️", font=("Arial", 48))
+                logo_label.pack(anchor=tk.CENTER)
+
+        except Exception as e:
+            print(f"Fehler beim Hinzufügen des Logos zum About-Dialog: {e}")
+            # Minimaler Fallback
+            pass
+
 
 class ScriptInfoDialog(ttk.Toplevel):
     def __init__(self, parent, script_name, content):
@@ -330,48 +376,196 @@ class BashScriptMaker:
             print(f"Fehler beim Setzen des Icons: {e}")
 
     def add_logo_to_toolbar(self, toolbar):
-        """Fügt das Logo zur Toolbar hinzu"""
+        """Fügt das Logo und den App-Namen zur Toolbar hinzu"""
         try:
+            # Logo-Container für bessere Anordnung
+            logo_container = ttk.Frame(toolbar)
+            logo_container.pack(side=tk.LEFT, padx=(0, 20), pady=15)
+
             # Pfad zum Icon ermitteln
             script_dir = os.path.dirname(os.path.abspath(__file__))
-            logo_path = os.path.join(script_dir, "assets", "bash-script-maker-32.png")
-            
+            logo_path = os.path.join(script_dir, "assets", "bash-script-maker-48.png")
+
             if os.path.exists(logo_path):
                 try:
                     from PIL import Image, ImageTk
-                    
-                    # Logo laden und für Toolbar optimieren
+
+                    # Logo laden - größer für bessere Sichtbarkeit
                     img = Image.open(logo_path)
-                    # Etwas kleiner für die Toolbar (24x24)
-                    img = img.resize((24, 24), Image.Resampling.LANCZOS)
+                    # Optimale Größe für Toolbar (36x36)
+                    img = img.resize((36, 36), Image.Resampling.LANCZOS)
                     logo_photo = ImageTk.PhotoImage(img)
-                    
+
                     # Logo-Label erstellen
-                    logo_label = ttk.Label(toolbar, image=logo_photo)
+                    logo_label = ttk.Label(logo_container, image=logo_photo)
                     logo_label.image = logo_photo  # Referenz behalten
-                    logo_label.pack(side=tk.LEFT, padx=(0, 10), pady=20)
+                    logo_label.pack(side=tk.LEFT, padx=(0, 8))
+
+                    # App-Name-Label hinzufügen
+                    name_label = ttk.Label(
+                        logo_container,
+                        text="Bash-Script-Maker",
+                        font=("Arial", 12, "bold"),
+                        foreground="#2c3e50",  # Dunkle Farbe für bessere Lesbarkeit
+                    )
+                    name_label.pack(side=tk.LEFT, anchor=tk.CENTER)
+
+                    # Version-Label (kleiner) hinzufügen
+                    version_label = ttk.Label(
+                        logo_container,
+                        text=f"v{__version__}",
+                        font=("Arial", 9),
+                        foreground="#7f8c8d",  # Grau für subtile Version
+                    )
+                    version_label.pack(side=tk.LEFT, padx=(5, 0), anchor=tk.CENTER)
+
+                    # Tooltips hinzufügen
+                    ToolTip(logo_label, text=f"Bash-Script-Maker v{__version__}")
+                    ToolTip(name_label, text=f"Bash-Script-Maker v{__version__}")
+                    ToolTip(version_label, text=f"Version {__version__}")
+
+                    print("Logo und App-Name zur Toolbar hinzugefügt")
+
+                except ImportError:
+                    # Fallback ohne PIL - verwende Text-Logo mit Name
+                    logo_label = ttk.Label(logo_container, text="🖥️", font=("Arial", 24))
+                    logo_label.pack(side=tk.LEFT, padx=(0, 8))
+
+                    # App-Name auch im Fallback
+                    name_label = ttk.Label(
+                        logo_container,
+                        text="Bash-Script-Maker",
+                        font=("Arial", 12, "bold"),
+                    )
+                    name_label.pack(side=tk.LEFT, anchor=tk.CENTER)
+
+                    version_label = ttk.Label(
+                        logo_container, text=f"v{__version__}", font=("Arial", 9)
+                    )
+                    version_label.pack(side=tk.LEFT, padx=(5, 0), anchor=tk.CENTER)
+
+                    # Tooltips
+                    ToolTip(logo_label, text=f"Bash-Script-Maker v{__version__}")
+                    ToolTip(name_label, text=f"Bash-Script-Maker v{__version__}")
+                    ToolTip(version_label, text=f"Version {__version__}")
+
+                    print("Text-Logo und App-Name zur Toolbar hinzugefügt")
+
+            else:
+                # Nur Text-Branding wenn kein Icon gefunden
+                name_label = ttk.Label(
+                    logo_container,
+                    text="🖥️ Bash-Script-Maker",
+                    font=("Arial", 12, "bold"),
+                )
+                name_label.pack(side=tk.LEFT)
+
+                version_label = ttk.Label(
+                    logo_container, text=f"v{__version__}", font=("Arial", 9)
+                )
+                version_label.pack(side=tk.LEFT, padx=(5, 0), anchor=tk.CENTER)
+
+                ToolTip(name_label, text=f"Bash-Script-Maker v{__version__}")
+                ToolTip(version_label, text=f"Version {__version__}")
+
+                print(f"Logo-Datei nicht gefunden: {logo_path}, verwende Text-Branding")
+
+        except Exception as e:
+            print(f"Fehler beim Hinzufügen des Logos: {e}")
+            # Minimaler Fallback
+            try:
+                fallback_label = ttk.Label(
+                    toolbar, text="Bash-Script-Maker", font=("Arial", 10, "bold")
+                )
+                fallback_label.pack(side=tk.LEFT, padx=(0, 15), pady=20)
+            except:
+                pass
+
+    def create_header(self):
+        """Erstellt den Header-Bereich mit Logo, App-Titel und Version"""
+        header_frame = ttk.Frame(self.root, bootstyle="primary")
+        header_frame.pack(side=tk.TOP, fill=tk.X, padx=5, pady=(5, 10))
+        
+        # Header-Container für bessere Kontrolle
+        header_container = ttk.Frame(header_frame)
+        header_container.pack(fill=tk.X, padx=15, pady=10)
+        
+        # Logo (links)
+        logo_frame = ttk.Frame(header_container)
+        logo_frame.pack(side=tk.LEFT)
+        
+        try:
+            script_dir = os.path.dirname(os.path.abspath(__file__))
+            logo_path = os.path.join(script_dir, "assets", "bash-script-maker-48.png")
+            
+            if os.path.exists(logo_path):
+                try:
+                    from PIL import Image, ImageTk
                     
-                    # Tooltip hinzufügen
-                    ToolTip(logo_label, text="Bash-Script-Maker v" + __version__)
+                    # Logo für Header (48x48)
+                    img = Image.open(logo_path)
+                    logo_photo = ImageTk.PhotoImage(img)
                     
-                    print("Logo zur Toolbar hinzugefügt")
+                    logo_label = ttk.Label(logo_frame, image=logo_photo)
+                    logo_label.image = logo_photo  # Referenz behalten
+                    logo_label.pack(side=tk.LEFT, padx=(0, 15))
                     
                 except ImportError:
-                    # Fallback ohne PIL - verwende Text-Logo
-                    logo_label = ttk.Label(
-                        toolbar, 
-                        text="🖥️", 
-                        font=("Arial", 16)
-                    )
-                    logo_label.pack(side=tk.LEFT, padx=(0, 10), pady=20)
-                    ToolTip(logo_label, text="Bash-Script-Maker v" + __version__)
-                    print("Text-Logo zur Toolbar hinzugefügt")
-                    
+                    # Fallback: Großes Emoji
+                    logo_label = ttk.Label(logo_frame, text="🖥️", font=("Arial", 36))
+                    logo_label.pack(side=tk.LEFT, padx=(0, 15))
             else:
-                print(f"Logo-Datei nicht gefunden: {logo_path}")
+                # Fallback: Emoji
+                logo_label = ttk.Label(logo_frame, text="🖥️", font=("Arial", 36))
+                logo_label.pack(side=tk.LEFT, padx=(0, 15))
                 
         except Exception as e:
-            print(f"Fehler beim Hinzufügen des Logos: {e}")
+            print(f"Fehler beim Laden des Header-Logos: {e}")
+            # Minimaler Fallback
+            logo_label = ttk.Label(logo_frame, text="🖥️", font=("Arial", 24))
+            logo_label.pack(side=tk.LEFT, padx=(0, 15))
+        
+        # Titel und Version (mittig-links)
+        title_frame = ttk.Frame(header_container)
+        title_frame.pack(side=tk.LEFT, fill=tk.X, expand=True)
+        
+        # Haupttitel
+        title_label = ttk.Label(
+            title_frame,
+            text="Bash-Script-Maker",
+            font=("Arial", 24, "bold"),
+            bootstyle="inverse-primary"
+        )
+        title_label.pack(anchor=tk.W)
+        
+        # Untertitel mit Version
+        subtitle_label = ttk.Label(
+            title_frame,
+            text=f"Version {__version__} - Professioneller Bash-Script-Generator",
+            font=("Arial", 11),
+            bootstyle="inverse-secondary"
+        )
+        subtitle_label.pack(anchor=tk.W, pady=(2, 0))
+        
+        # Status-Info (rechts)
+        status_frame = ttk.Frame(header_container)
+        status_frame.pack(side=tk.RIGHT)
+        
+        # Aktuelle Zeit/Datum als zusätzliche Info
+        import datetime
+        current_time = datetime.datetime.now().strftime("%d.%m.%Y")
+        
+        info_label = ttk.Label(
+            status_frame,
+            text=f"Gestartet: {current_time}",
+            font=("Arial", 9),
+            bootstyle="inverse-secondary"
+        )
+        info_label.pack(anchor=tk.E)
+        
+        # Separator-Linie unter dem Header
+        separator = ttk.Separator(self.root, orient=tk.HORIZONTAL)
+        separator.pack(side=tk.TOP, fill=tk.X, padx=5)
 
     def create_menu(self):
         """Erstellt das Menü der Anwendung"""
@@ -493,12 +687,12 @@ class BashScriptMaker:
         )
         status_bar.pack(side=tk.BOTTOM, fill=tk.X)
 
-        # Toolbar ganz oben platzieren
-        toolbar = ttk.Frame(self.root)
-        toolbar.pack(side=tk.TOP, fill=tk.X, padx=5, pady=(5, 0))
+        # Header-Bereich für App-Titel und Logo
+        self.create_header()
 
-        # Logo hinzufügen (links)
-        self.add_logo_to_toolbar(toolbar)
+        # Toolbar für Buttons
+        toolbar = ttk.Frame(self.root)
+        toolbar.pack(side=tk.TOP, fill=tk.X, padx=5, pady=(0, 0))
 
         # Toolbar-Inhalte - LINKS
         btn_new = ttk.Button(
@@ -886,13 +1080,20 @@ class BashScriptMaker:
         ScriptInfoDialog(self.root, self.script_name, content)
 
     def show_about(self):
-        """Zeigt About-Dialog"""
-        about_text = _(
-            "Bash-Script-Maker ist ein GUI-Programm zur einfachen Erstellung von Bash-Scripts.\n\n"
-            "Erstellt mit Python und Tkinter"
-        )
-
-        messagebox.showinfo(_("Über Bash-Script-Maker"), about_text)
+        """Zeigt About-Dialog mit Logo"""
+        try:
+            about_dialog = AboutDialog(self.root)
+            about_dialog.grab_set()  # Modal dialog
+            about_dialog.wait_window()  # Warten bis Dialog geschlossen wird
+        except Exception as e:
+            # Fallback auf einfachen Dialog
+            about_text = _(
+                f"Bash-Script-Maker v{__version__}\n\n"
+                "Ein GUI-Programm zur einfachen Erstellung von Bash-Scripts.\n\n"
+                "Erstellt mit Python und Tkinter\n"
+                "© 2024 SecureBits"
+            )
+            messagebox.showinfo(_("Über Bash-Script-Maker"), about_text)
 
     def open_documentation(self):
         """Öffnet die README.md Datei im Standard-Browser."""

{bash-script-maker-1.7.0 → bash-script-maker-1.9.0}/install.sh

@@ -304,7 +304,7 @@ if main_installation; then
 Name=Bash-Script-Maker
 Comment=Ein GUI-Programm zur Erstellung von Bash-Scripts
 Exec=$HOME/.local/bin/bash-script-maker
-Icon=$HOME/.local/share/icons/hicolor/scalable/apps/bash-script-maker.svg
+Icon=bash-script-maker
 Terminal=false
 Type=Application
 Categories=Development;Utility;TextEditor;

{bash-script-maker-1.7.0 → bash-script-maker-1.9.0}/install_apt.sh

@@ -170,7 +170,7 @@ if [ -f "bash-script-maker.desktop" ] && [ -f "assets/bash-script-maker.svg" ];
 Name=Bash-Script-Maker
 Comment=Ein GUI-Programm zur Erstellung von Bash-Scripts
 Exec=$HOME/.local/bin/bash-script-maker
-Icon=$HOME/.local/share/icons/hicolor/scalable/apps/bash-script-maker.svg
+Icon=bash-script-maker
 Terminal=false
 Type=Application
 Categories=Development;Utility;TextEditor;

{bash-script-maker-1.7.0 → bash-script-maker-1.9.0}/install_desktop_integration.sh

@@ -49,7 +49,7 @@ if cat > ~/.local/share/applications/bash-script-maker.desktop << EOF
 Name=Bash-Script-Maker
 Comment=Ein GUI-Programm zur Erstellung von Bash-Scripts
 Exec=$HOME/.local/bin/bash-script-maker
-Icon=$HOME/.local/share/icons/hicolor/scalable/apps/bash-script-maker.svg
+Icon=bash-script-maker
 Terminal=false
 Type=Application
 Categories=Development;Utility;TextEditor;

{bash-script-maker-1.7.0 → bash-script-maker-1.9.0}/install_dnf.sh

@@ -163,7 +163,7 @@ if [ -f "bash-script-maker.desktop" ] && [ -f "assets/bash-script-maker.svg" ];
 Name=Bash-Script-Maker
 Comment=Ein GUI-Programm zur Erstellung von Bash-Scripts
 Exec=$HOME/.local/bin/bash-script-maker
-Icon=$HOME/.local/share/icons/hicolor/scalable/apps/bash-script-maker.svg
+Icon=bash-script-maker
 Terminal=false
 Type=Application
 Categories=Development;Utility;TextEditor;

{bash-script-maker-1.7.0 → bash-script-maker-1.9.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bash-script-maker"
-version = "1.7.0"
+version = "1.9.0"
 description = "Ein GUI-Programm zur Erstellung von Bash-Scripts mit visueller Unterstützung"
 readme = "README.md"
 license = {text = "MIT"}

bash-script-maker-1.7.0/VERSION

@@ -1 +0,0 @@
-1.7.0