Fix GitHub Actions build workflow

  - Use CLI arguments instead of spec file in build.py
  - Add version env variable for consistent release naming
  - Use Pillow to create .ico on Windows
  - Fix heredoc formatting in .deb creation
  - Update README with all v1.1.0 features

Author: achrafsoltani

.github/workflows/build.yml

@@ -7,6 +7,9 @@ on:
   pull_request:
     branches: [main]
 
+env:
+  APP_VERSION: "1.1.0"
+
 jobs:
   build-linux:
     runs-on: ubuntu-latest
@@ -43,9 +46,9 @@ jobs:
           mkdir -p merisio-deb/usr/share/applications
           mkdir -p merisio-deb/usr/share/icons/hicolor/256x256/apps
 
-          cat > merisio-deb/DEBIAN/control << 'EOF'
+          cat > merisio-deb/DEBIAN/control << EOF
           Package: merisio
-          Version: 1.1.0
+          Version: ${{ env.APP_VERSION }}
           Section: database
           Priority: optional
           Architecture: amd64
@@ -57,11 +60,14 @@ jobs:
           Homepage: https://github.com/AchrafSoltani/Merisio
           EOF
 
+          # Remove leading spaces from control file
+          sed -i 's/^          //' merisio-deb/DEBIAN/control
+
           cp dist/Merisio merisio-deb/usr/bin/merisio
           chmod 755 merisio-deb/usr/bin/merisio
           cp resources/icons/app_icon.png merisio-deb/usr/share/icons/hicolor/256x256/apps/merisio.png
 
-          cat > merisio-deb/usr/share/applications/merisio.desktop << 'EOF'
+          cat > merisio-deb/usr/share/applications/merisio.desktop << EOF
           [Desktop Entry]
           Name=Merisio
           Comment=MERISE Database Modeling Tool
@@ -73,15 +79,18 @@ jobs:
           Keywords=database;modeling;merise;mcd;sql;
           EOF
 
-          dpkg-deb --build merisio-deb merisio_1.1.0_amd64.deb
+          # Remove leading spaces from desktop file
+          sed -i 's/^          //' merisio-deb/usr/share/applications/merisio.desktop
+
+          dpkg-deb --build merisio-deb merisio_${{ env.APP_VERSION }}_amd64.deb
 
       - name: Upload Linux artifacts
         uses: actions/upload-artifact@v4
         with:
           name: merisio-linux
           path: |
             Merisio-linux-x64.tar.gz
-            merisio_1.1.0_amd64.deb
+            merisio_${{ env.APP_VERSION }}_amd64.deb
 
   build-windows:
     runs-on: windows-latest
@@ -94,7 +103,11 @@ jobs:
           python-version: '3.11'
 
       - name: Install dependencies
-        run: pip install -r requirements.txt pyinstaller
+        run: pip install -r requirements.txt pyinstaller pillow
+
+      - name: Create .ico file
+        run: |
+          python -c "from PIL import Image; img = Image.open('resources/icons/app_icon.png'); img.save('resources/icons/app_icon.ico', format='ICO', sizes=[(256,256), (128,128), (64,64), (48,48), (32,32), (16,16)])"
 
       - name: Build executable
         run: python build.py build
@@ -134,6 +147,6 @@ jobs:
         with:
           files: |
             Merisio-linux-x64.tar.gz
-            merisio_1.1.0_amd64.deb
+            merisio_${{ env.APP_VERSION }}_amd64.deb
             Merisio-windows-x64.zip
           generate_release_notes: true

README.md

@@ -2,13 +2,25 @@
 
 A modern MERISE database modeling tool built with Python and PySide6.
 
+![Version](https://img.shields.io/badge/version-1.1.0-blue)
+![License](https://img.shields.io/badge/license-GPL%20v2-green)
+![Python](https://img.shields.io/badge/python-3.11+-yellow)
+
 ## Features
 
 - **MCD Editor** - Visual diagram editor for entities, associations, and links
+  - Drag-and-drop positioning
+  - Multi-selection and deletion
+  - Cardinalities: (0,1), (0,N), (1,1), (1,N)
+  - Link styles: Curved, Orthogonal, Straight
+  - Toggle attribute visibility
 - **Data Dictionary** - Overview of all attributes across entities
 - **MLD View** - Logical Data Model with table/column tree view
+  - Editable column names (right-click or double-click to rename)
+  - Custom names saved in project and used in SQL generation
 - **SQL Generation** - PostgreSQL CREATE TABLE statements
-- **Project Management** - Save/load projects (.merisio format)
+- **Project Management** - Save/load projects in `.merisio` JSON format
+- **Options Menu** - Show/hide attributes, link style selection
 
 ## Screenshots
 
@@ -21,6 +33,31 @@ A modern MERISE database modeling tool built with Python and PySide6.
 
 ## Installation
 
+### Pre-built Binaries
+
+Download the latest release from the [Releases](https://github.com/AchrafSoltani/Merisio/releases) page.
+
+**Linux:**
+- `Merisio-x.x.x-linux-x64.tar.gz` - Portable archive
+- `merisio_x.x.x_amd64.deb` - Debian/Ubuntu package
+
+**Windows:**
+- `Merisio-x.x.x-windows-x64.zip` - Portable archive
+
+#### Linux Installation
+
+**From .deb package (Debian/Ubuntu):**
+```bash
+sudo dpkg -i merisio_1.1.0_amd64.deb
+```
+
+**From archive:**
+```bash
+tar -xzvf Merisio-1.1.0-linux-x64.tar.gz
+cd Merisio-1.1.0-linux-x64
+./Merisio
+```
+
 ### From Source
 
 ```bash
@@ -40,10 +77,6 @@ pip install -r requirements.txt
 python main.py
 ```
 
-### Pre-built Binaries
-
-Download the latest release from the [Releases](https://github.com/AchrafSoltani/Merisio/releases) page.
-
 ## Building from Source
 
 ### Prerequisites
@@ -84,37 +117,12 @@ python build.py build
 python build.py clean
 ```
 
-## Distribution
-
-### Linux
-
-```bash
-# Create a tarball with all necessary files
-mkdir -p Merisio-linux
-cp dist/Merisio Merisio-linux/
-cp resources/icons/app_icon.svg Merisio-linux/
-cp merisio.desktop Merisio-linux/
-tar -czvf Merisio-1.0.0-linux-x64.tar.gz Merisio-linux
-```
-
-Users can then:
-1. Extract the archive
-2. Run `./Merisio`
-3. Optionally install the .desktop file for system integration
-
-### Windows
-
-```bash
-# Create a ZIP archive
-# Or use NSIS/Inno Setup for an installer
-```
-
 ## Usage
 
-1. **Create Entities** - Click "Add Entity" in the MCD tab, define name and attributes
-2. **Create Associations** - Click "Add Association" to define relationships
-3. **Link Them** - Click "Add Link" to connect entities to associations with cardinalities
-4. **View MLD** - Switch to MLD tab to see the logical model
+1. **Create Entities** - Right-click on the MCD canvas or use the toolbar to add entities
+2. **Create Associations** - Add associations to define relationships between entities
+3. **Link Them** - Connect entities to associations with cardinalities
+4. **View MLD** - Switch to MLD tab to see the logical model (double-click columns to rename)
 5. **Generate SQL** - Switch to SQL tab to see PostgreSQL DDL statements
 6. **Save Project** - File > Save to save your work
 
@@ -132,23 +140,56 @@ Users can then:
 | Delete | Delete Selected |
 | Ctrl+Scroll | Zoom In/Out |
 
+### Options Menu
+
+| Option | Description |
+|--------|-------------|
+| Show Attributes | Toggle attribute visibility in MCD entities/associations |
+| Link Style > Curved | Bezier curve links (default) |
+| Link Style > Orthogonal | Right-angle links |
+| Link Style > Straight | Direct line links |
+
 ## Project Structure
 
 ```
-AnalyseSI/
+Merisio/
 ├── main.py                 # Application entry point
-├── build.py                # Build script
-├── analysesi.spec          # PyInstaller configuration
+├── build.py                # Build script for PyInstaller
+├── merisio.spec            # PyInstaller configuration
+├── merisio.desktop         # Linux desktop integration
 ├── requirements.txt        # Python dependencies
 ├── resources/
 │   └── icons/
-│       └── app_icon.svg    # Application icon
+│       ├── app_icon.svg    # Vector icon
+│       └── app_icon.png    # PNG icon (256x256)
 ├── src/
-│   ├── models/             # Data models
-│   ├── views/              # UI components
-│   ├── controllers/        # Business logic
-│   └── utils/              # Utilities and constants
-└── tests/                  # Unit tests
+│   ├── models/             # Data models (Entity, Association, Link, Project)
+│   ├── views/              # UI components (Canvas, Dialogs, Views)
+│   ├── controllers/        # Business logic (MLD transformer, SQL generator)
+│   └── utils/              # Utilities, constants, theme
+├── tests/                  # Unit tests
+└── .github/
+    └── workflows/
+        └── build.yml       # GitHub Actions CI/CD
+```
+
+## File Format
+
+Merisio uses a JSON-based project format with the `.merisio` extension:
+
+```json
+{
+  "version": "1.0",
+  "dictionary": { "attributes": [...] },
+  "mcd": {
+    "entities": [...],
+    "associations": [...],
+    "links": [...]
+  },
+  "mld": {
+    "column_overrides": { "TABLE.original_col": "renamed_col" }
+  }
+}
 ```
 
 ## License
@@ -157,8 +198,10 @@ GNU GPL v2
 
 ## Author
 
-Achraf SOLTANI
+**Achraf SOLTANI**
+Email: achraf.soltani@pm.me
+GitHub: [@AchrafSoltani](https://github.com/AchrafSoltani)
 
 ## Acknowledgments
 
-Based on the original [AnalyseSI](https://launchpad.net/analysesi) Java project.
+Inspired by the original [AnalyseSI](https://launchpad.net/analysesi) Java project.

build.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Build script for AnalyseSI Modern."""
+"""Build script for Merisio."""
 
 import os
 import sys
@@ -39,14 +39,36 @@ def build():
         print("PyInstaller not found. Installing...")
         subprocess.run([sys.executable, '-m', 'pip', 'install', 'pyinstaller'])
 
-    # Build command
+    # Determine icon path
+    if system == 'windows':
+        icon_path = 'resources/icons/app_icon.ico'
+        if not os.path.exists(icon_path):
+            icon_path = 'resources/icons/app_icon.png'
+    else:
+        icon_path = 'resources/icons/app_icon.png'
+
+    # Build command using CLI arguments (no spec file needed)
     cmd = [
         sys.executable, '-m', 'PyInstaller',
         '--clean',
         '--noconfirm',
-        'merisio.spec'
+        '--onefile',
+        '--windowed',
+        '--name', APP_NAME,
+        '--add-data', f'resources/icons/app_icon.svg{os.pathsep}resources/icons',
+        '--add-data', f'resources/icons/app_icon.png{os.pathsep}resources/icons',
+        '--hidden-import', 'PySide6.QtCore',
+        '--hidden-import', 'PySide6.QtGui',
+        '--hidden-import', 'PySide6.QtWidgets',
     ]
 
+    # Add icon if exists
+    if os.path.exists(icon_path):
+        cmd.extend(['--icon', icon_path])
+
+    # Add main entry point
+    cmd.append('main.py')
+
     print(f"Running: {' '.join(cmd)}")
     result = subprocess.run(cmd)
 
@@ -66,19 +88,18 @@ def build():
 
 
 def create_windows_ico():
-    """Create Windows .ico file from SVG (requires inkscape or imagemagick)."""
-    svg_path = "resources/icons/app_icon.svg"
+    """Create Windows .ico file from PNG (requires ImageMagick)."""
+    png_path = "resources/icons/app_icon.png"
     ico_path = "resources/icons/app_icon.ico"
 
-    if not os.path.exists(svg_path):
-        print(f"SVG not found: {svg_path}")
+    if not os.path.exists(png_path):
+        print(f"PNG not found: {png_path}")
         return False
 
     # Try using ImageMagick
     try:
         subprocess.run([
-            'convert', '-background', 'none',
-            svg_path,
+            'convert', png_path,
             '-define', 'icon:auto-resize=256,128,64,48,32,16',
             ico_path
         ], check=True)