v0.1.0
This commit is contained in:
ivaquero
@@ -1,143 +0,0 @@
|
|||||||
name: Build Qt Application
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ main, master ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ main, master ]
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-macos:
|
|
||||||
runs-on: macos-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Install Qt
|
|
||||||
uses: jurplel/install-qt-action@v4
|
|
||||||
with:
|
|
||||||
version: "6.5.*"
|
|
||||||
modules: "qt5compat"
|
|
||||||
cache: true
|
|
||||||
tools: "tools_ninja"
|
|
||||||
install-deps: "true"
|
|
||||||
|
|
||||||
- name: Build with qmake
|
|
||||||
run: |
|
|
||||||
qmake Clouck.pro CONFIG+=release
|
|
||||||
make
|
|
||||||
|
|
||||||
- name: Create macOS Bundle
|
|
||||||
run: |
|
|
||||||
macdeployqt build/Clouck.app -dmg
|
|
||||||
|
|
||||||
- name: Upload macOS Build
|
|
||||||
uses: actions/upload-artifact@v7
|
|
||||||
with:
|
|
||||||
name: Clouck-qmake
|
|
||||||
path: build/Clouck.dmg
|
|
||||||
|
|
||||||
build-windows:
|
|
||||||
runs-on: windows-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Setup MSVC Environment
|
|
||||||
uses: ilammy/msvc-dev-cmd@v1
|
|
||||||
|
|
||||||
- name: Install Qt
|
|
||||||
uses: jurplel/install-qt-action@v4
|
|
||||||
with:
|
|
||||||
version: "6.5.*"
|
|
||||||
modules: "qt5compat"
|
|
||||||
cache: true
|
|
||||||
tools: "tools_ninja"
|
|
||||||
install-deps: "true"
|
|
||||||
|
|
||||||
- name: Build with qmake
|
|
||||||
shell: cmd
|
|
||||||
run: |
|
|
||||||
qmake Clouck.pro CONFIG+=release
|
|
||||||
nmake
|
|
||||||
|
|
||||||
- name: Deploy Windows Build
|
|
||||||
run: |
|
|
||||||
mkdir Clouck-windows-dist
|
|
||||||
copy build\Clouck.exe Clouck-windows-dist\
|
|
||||||
windeployqt --release Clouck-windows-dist\Clouck.exe
|
|
||||||
|
|
||||||
- name: Upload Windows Build
|
|
||||||
uses: actions/upload-artifact@v7
|
|
||||||
with:
|
|
||||||
name: Clouck-windows-qmake
|
|
||||||
path: Clouck-windows-dist
|
|
||||||
|
|
||||||
# build-linux:
|
|
||||||
# runs-on: ubuntu-latest
|
|
||||||
# steps:
|
|
||||||
# - uses: actions/checkout@v6
|
|
||||||
|
|
||||||
# - name: Install Dependencies
|
|
||||||
# run: |
|
|
||||||
# sudo apt-get update
|
|
||||||
# sudo apt-get install -y build-essential qt6-base-dev qt6-tools-dev libx11-dev libxfixes-dev
|
|
||||||
|
|
||||||
# - name: Install Qt
|
|
||||||
# uses: jurplel/install-qt-action@v4
|
|
||||||
# with:
|
|
||||||
# version: "6.5.*"
|
|
||||||
# modules: "qt5compat"
|
|
||||||
# cache: true
|
|
||||||
|
|
||||||
# - name: Build with qmake
|
|
||||||
# run: |
|
|
||||||
# qmake Clouck.pro CONFIG+=release
|
|
||||||
# make
|
|
||||||
|
|
||||||
# - name: Create Linux Distribution
|
|
||||||
# run: |
|
|
||||||
# mkdir -p Clouck-linux-dist
|
|
||||||
# cp Clouck Clouck-linux-dist/
|
|
||||||
# ldd Clouck | grep -o '/lib[^ ]*' | xargs -I {} cp {} Clouck-linux-dist/ 2>/dev/null || true
|
|
||||||
|
|
||||||
# - name: Upload Linux Build
|
|
||||||
# uses: actions/upload-artifact@v7
|
|
||||||
# with:
|
|
||||||
# name: Clouck-linux-qmake
|
|
||||||
# path: Clouck-linux-dist
|
|
||||||
|
|
||||||
build-cmake:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
os: [ windows-latest, macos-latest ]
|
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Install Qt
|
|
||||||
uses: jurplel/install-qt-action@v4
|
|
||||||
with:
|
|
||||||
version: "6.5.*"
|
|
||||||
modules: "qt5compat"
|
|
||||||
cache: true
|
|
||||||
|
|
||||||
- name: Install Linux Dependencies
|
|
||||||
if: runner.os == 'Linux'
|
|
||||||
run: |
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y build-essential cmake libx11-dev libxfixes-dev
|
|
||||||
|
|
||||||
- name: Configure CMake
|
|
||||||
run: |
|
|
||||||
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
|
|
||||||
|
|
||||||
- name: Build with CMake
|
|
||||||
run: cmake --build build --config Release
|
|
||||||
|
|
||||||
- name: Upload CMake Build
|
|
||||||
uses: actions/upload-artifact@v7
|
|
||||||
with:
|
|
||||||
name: Clouck-${{ runner.os }}-cmake
|
|
||||||
path: build/Clouck*
|
|
||||||
+5
-151
@@ -40,161 +40,15 @@ jobs:
|
|||||||
version: "6.5.*"
|
version: "6.5.*"
|
||||||
modules: "qt5compat"
|
modules: "qt5compat"
|
||||||
cache: true
|
cache: true
|
||||||
tools: "tools_ninja"
|
|
||||||
install-deps: "true"
|
|
||||||
aqtversion: "==3.1.*"
|
|
||||||
py7zrversion: ">=0.20.2"
|
|
||||||
|
|
||||||
# - name: Install Linux Dependencies
|
- name: Configure CMake
|
||||||
# if: runner.os == 'Linux'
|
|
||||||
# run: |
|
|
||||||
# sudo apt-get update
|
|
||||||
# sudo apt-get install -y build-essential cmake libx11-dev libxfixes-dev
|
|
||||||
|
|
||||||
- name: Configure CMake (Windows)
|
|
||||||
if: runner.os == 'Windows'
|
|
||||||
shell: cmd
|
|
||||||
run: |
|
|
||||||
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
|
||||||
echo "Configuring CMake for Windows..."
|
|
||||||
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
|
|
||||||
echo "CMake configuration completed."
|
|
||||||
echo "Checking if build directory was created:"
|
|
||||||
dir build 2>nul && echo "Build directory exists" || echo "Build directory NOT found"
|
|
||||||
echo "Contents of current directory:"
|
|
||||||
dir
|
|
||||||
|
|
||||||
- name: Configure CMake (macOS)
|
|
||||||
if: runner.os == 'macOS'
|
|
||||||
run: cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
|
run: cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
|
||||||
|
|
||||||
- name: Build (Windows)
|
- name: Build
|
||||||
if: runner.os == 'Windows'
|
|
||||||
shell: cmd
|
|
||||||
run: |
|
|
||||||
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
|
||||||
echo "Starting Windows build..."
|
|
||||||
echo "=== Pre-build diagnostics ==="
|
|
||||||
echo "Current directory: %CD%"
|
|
||||||
echo "Checking if CMakeLists.txt exists:"
|
|
||||||
dir CMakeLists.txt 2>nul && echo "✓ CMakeLists.txt found" || echo "✗ CMakeLists.txt NOT found"
|
|
||||||
echo "Contents before build:"
|
|
||||||
dir
|
|
||||||
echo "=== Building with CMake ==="
|
|
||||||
cmake --build build --config Release
|
|
||||||
echo "=== Post-build diagnostics ==="
|
|
||||||
echo "Build completed with exit code: %ERRORLEVEL%"
|
|
||||||
echo "Contents after build:"
|
|
||||||
dir
|
|
||||||
echo "=== Searching for Clouck executable ==="
|
|
||||||
echo "Checking build directory structure:"
|
|
||||||
dir build /s /b 2>nul || echo "Build directory not found or empty"
|
|
||||||
echo "Looking for Clouck.exe in specific locations:"
|
|
||||||
dir build\Clouck.exe 2>nul && echo "✓ Found Clouck.exe in build\" || echo "✗ Clouck.exe not in build\"
|
|
||||||
dir build\Release\Clouck.exe 2>nul && echo "✓ Found Clouck.exe in build\Release\" || echo "✗ Clouck.exe not in build\Release\"
|
|
||||||
dir build\MinSizeRel\Clouck.exe 2>nul && echo "✓ Found Clouck.exe in build\MinSizeRel\" || echo "✗ Clouck.exe not in build\MinSizeRel\"
|
|
||||||
echo "Searching entire directory tree for any Clouck.exe:"
|
|
||||||
dir Clouck.exe /s /b 2>nul || echo "No Clouck.exe found anywhere"
|
|
||||||
echo "Searching for any .exe files in build directory:"
|
|
||||||
dir build\*.exe /s /b 2>nul || echo "No .exe files found in build"
|
|
||||||
|
|
||||||
- name: Build (macOS)
|
|
||||||
if: runner.os == 'macOS'
|
|
||||||
run: cmake --build build --config Release
|
run: cmake --build build --config Release
|
||||||
|
|
||||||
- name: Quick Binary Validation (macOS)
|
- name: Upload Build Artifact
|
||||||
if: runner.os == 'macOS'
|
|
||||||
run: find ./build -name "Clouck" -type f
|
|
||||||
|
|
||||||
- name: Test Build (macOS)
|
|
||||||
if: runner.os == 'macOS'
|
|
||||||
run: timeout 3s ./build/Clouck.app/Contents/MacOS/Clouck || echo "Test
|
|
||||||
completed"
|
|
||||||
|
|
||||||
- name: Quick Binary Validation (Windows)
|
|
||||||
if: runner.os == 'Windows'
|
|
||||||
shell: cmd
|
|
||||||
run: |
|
|
||||||
echo "=== Windows Quick Binary Validation ==="
|
|
||||||
echo "Current directory: %CD%"
|
|
||||||
echo "Looking for build directory..."
|
|
||||||
dir build 2>nul && echo "Build directory exists" || echo "Build directory NOT found"
|
|
||||||
echo "Looking for Clouck executable in possible locations:"
|
|
||||||
dir build\Clouck.exe 2>nul && echo "✓ Found Clouck.exe in build\" || echo "✗ Clouck.exe not in build\"
|
|
||||||
dir build\Release\Clouck.exe 2>nul && echo "✓ Found Clouck.exe in build\Release\" || echo "✗ Clouck.exe not in build\Release\"
|
|
||||||
dir build\MinSizeRel\Clouck.exe 2>nul && echo "✓ Found Clouck.exe in build\MinSizeRel\" || echo "✗ Clouck.exe not in build\MinSizeRel\"
|
|
||||||
echo "Searching entire build directory for any .exe files:"
|
|
||||||
dir build\*.exe /s /b 2>nul || echo "No .exe files found in build directory"
|
|
||||||
echo "=== End Validation ==="
|
|
||||||
|
|
||||||
- name: Test Build (Windows)
|
|
||||||
if: runner.os == 'Windows'
|
|
||||||
shell: cmd
|
|
||||||
run: |
|
|
||||||
echo "=== Windows Test Build Diagnostics ==="
|
|
||||||
echo "Current directory: %CD%"
|
|
||||||
echo "Visual Studio environment is configured (see env vars above)"
|
|
||||||
echo "Checking for build directory..."
|
|
||||||
if exist build (
|
|
||||||
echo "Build directory exists"
|
|
||||||
echo "Contents of build directory:"
|
|
||||||
dir build
|
|
||||||
echo "Looking for Clouck.exe in build directory..."
|
|
||||||
if exist build\Clouck.exe (
|
|
||||||
echo "Found Clouck.exe in build\"
|
|
||||||
echo "Testing Windows binary..."
|
|
||||||
start /min build\Clouck.exe & timeout /t 2 /nobreak >nul 2>&1 & tasklist | findstr Clouck.exe >nul 2>&1
|
|
||||||
) else (
|
|
||||||
echo "Clouck.exe not found in build\"
|
|
||||||
echo "Checking build\Release directory..."
|
|
||||||
if exist build\Release\Clouck.exe (
|
|
||||||
echo "Found Clouck.exe in build\Release\"
|
|
||||||
echo "Testing Windows binary..."
|
|
||||||
start /min build\Release\Clouck.exe & timeout /t 2 /nobreak >nul 2>&1 & tasklist | findstr Clouck.exe >nul 2>&1
|
|
||||||
) else (
|
|
||||||
echo "Clouck.exe not found in build\Release\"
|
|
||||||
echo "Checking build\MinSizeRel directory..."
|
|
||||||
if exist build\MinSizeRel\Clouck.exe (
|
|
||||||
echo "Found Clouck.exe in build\MinSizeRel\"
|
|
||||||
echo "Testing Windows binary..."
|
|
||||||
start /min build\MinSizeRel\Clouck.exe & timeout /t 2 /nobreak >nul 2>&1 & tasklist | findstr Clouck.exe >nul 2>&1
|
|
||||||
) else (
|
|
||||||
echo "ERROR: Clouck.exe not found in any expected location!"
|
|
||||||
echo "Searching entire build directory for any .exe files:"
|
|
||||||
dir build\*.exe /s /b
|
|
||||||
echo "Searching entire working directory for Clouck.exe:"
|
|
||||||
dir Clouck.exe /s /b
|
|
||||||
echo "Build failed - no executable found"
|
|
||||||
exit 1
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
) else (
|
|
||||||
echo "ERROR: Build directory does not exist!"
|
|
||||||
echo "Contents of current directory:"
|
|
||||||
dir
|
|
||||||
exit 1
|
|
||||||
)
|
|
||||||
|
|
||||||
- name: Upload Build Artifact (Windows)
|
|
||||||
if: runner.os == 'Windows'
|
|
||||||
uses: actions/upload-artifact@v7
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: Clouck-windows
|
name: Clouck-${{ runner.os }}-cmake
|
||||||
path: build/Clouck*.exe
|
path: build/Clouck*
|
||||||
|
|
||||||
- name: Upload Build Artifact (macOS)
|
|
||||||
if: runner.os == 'macOS'
|
|
||||||
run: |
|
|
||||||
echo "Checking for macOS app bundle..."
|
|
||||||
ls -la ./build/Clouck.app/Contents/MacOS/Clouck || echo "Clouck.app not found"
|
|
||||||
|
|
||||||
- name: Upload macOS Artifact
|
|
||||||
if: runner.os == 'macOS'
|
|
||||||
uses: actions/upload-artifact@v7
|
|
||||||
with:
|
|
||||||
name: Clouck-macos
|
|
||||||
path: |
|
|
||||||
build/Clouck.app/**/*
|
|
||||||
!build/Clouck.app/Contents/Frameworks/*
|
|
||||||
!build/Clouck.app/Contents/PlugIns/*
|
|
||||||
|
|||||||
+243
-247
@@ -1,285 +1,281 @@
|
|||||||
name: Build and Release Clouck
|
name: Build and Release Clouck
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- "v*"
|
- "v*"
|
||||||
workflow_dispatch:
|
- "[0-9]+.[0-9]+.[0-9]+"
|
||||||
inputs:
|
branches:
|
||||||
version:
|
- main
|
||||||
description: "Version to build (e.g., v1.0.0)"
|
- master
|
||||||
required: true
|
workflow_dispatch:
|
||||||
default: "v1.0.0"
|
inputs:
|
||||||
|
version:
|
||||||
|
description: "Version to build (e.g., v1.0.0)"
|
||||||
|
required: true
|
||||||
|
default: "v1.0.0"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-macos:
|
build-macos:
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Install Qt
|
- name: Install Qt
|
||||||
uses: jurplel/install-qt-action@v4
|
uses: jurplel/install-qt-action@v4
|
||||||
with:
|
with:
|
||||||
version: "6.5.*"
|
version: "6.5.*"
|
||||||
cache: true
|
cache: true
|
||||||
|
|
||||||
- name: Configure CMake
|
- name: Configure and Build
|
||||||
run: |
|
run: |
|
||||||
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
|
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
|
||||||
|
cmake --build build --config Release
|
||||||
|
|
||||||
- name: Build
|
- name: Create macOS App Bundle
|
||||||
run: cmake --build build --config Release
|
run: |
|
||||||
|
# Check what was actually built
|
||||||
|
echo "Contents of build directory:"
|
||||||
|
ls -la build/
|
||||||
|
|
||||||
- name: Create macOS App Bundle
|
# Look for the .app bundle or executable
|
||||||
run: |
|
if [ -d "build/Clouck.app" ]; then
|
||||||
# Debug: Check current directory and build output
|
echo "Found .app bundle"
|
||||||
echo "Current directory: $(pwd)"
|
cp -r build/Clouck.app ./
|
||||||
echo "Build directory contents:"
|
elif [ -f "build/Clouck" ]; then
|
||||||
ls -la build/
|
echo "Found standalone executable"
|
||||||
echo "Checking if Clouck executable exists:"
|
# Create app bundle
|
||||||
ls -la build/Clouck || echo "ERROR: Clouck executable not found!"
|
mkdir -p Clouck.app/Contents/MacOS
|
||||||
|
mkdir -p Clouck.app/Contents/Resources
|
||||||
|
cp build/Clouck Clouck.app/Contents/MacOS/
|
||||||
|
else
|
||||||
|
echo "Looking for executable in build directory..."
|
||||||
|
find build/ -name "Clouck*" -type f
|
||||||
|
# Try to find and copy the first executable
|
||||||
|
EXECUTABLE=$(find build/ -name "Clouck*" -type f | head -1)
|
||||||
|
if [ -n "$EXECUTABLE" ]; then
|
||||||
|
echo "Found executable: $EXECUTABLE"
|
||||||
|
mkdir -p Clouck.app/Contents/MacOS
|
||||||
|
mkdir -p Clouck.app/Contents/Resources
|
||||||
|
cp "$EXECUTABLE" Clouck.app/Contents/MacOS/
|
||||||
|
else
|
||||||
|
echo "ERROR: No Clouck executable found!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Create app bundle structure
|
# Create Info.plist
|
||||||
mkdir -p Clouck.app/Contents/MacOS
|
cat > Clouck.app/Contents/Info.plist << EOF
|
||||||
mkdir -p Clouck.app/Contents/Resources
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>CFBundleExecutable</key>
|
||||||
|
<string>Clouck</string>
|
||||||
|
<key>CFBundleIdentifier</key>
|
||||||
|
<string>com.clouck.app</string>
|
||||||
|
<key>CFBundleName</key>
|
||||||
|
<string>Clouck</string>
|
||||||
|
<key>CFBundleVersion</key>
|
||||||
|
<string>1.0.0</string>
|
||||||
|
<key>CFBundlePackageType</key>
|
||||||
|
<string>APPL</string>
|
||||||
|
<key>LSUIElement</key>
|
||||||
|
<true/>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
||||||
|
EOF
|
||||||
|
|
||||||
# Copy executable
|
- name: Deploy Qt Dependencies
|
||||||
cp build/Clouck Clouck.app/Contents/MacOS/
|
run: |
|
||||||
|
if [ -d "Clouck.app" ]; then
|
||||||
|
macdeployqt Clouck.app -dmg || hdiutil create -volname "Clouck" -srcfolder Clouck.app -ov -format UDZO Clouck.dmg
|
||||||
|
else
|
||||||
|
echo "ERROR: Clouck.app not found!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# Verify executable was copied
|
- name: Upload macOS Artifact
|
||||||
echo "App bundle contents:"
|
uses: actions/upload-artifact@v7
|
||||||
ls -la Clouck.app/Contents/MacOS/
|
with:
|
||||||
|
name: Clouck-macos
|
||||||
|
path: Clouck.dmg
|
||||||
|
|
||||||
# Create Info.plist
|
build-windows:
|
||||||
cat > Clouck.app/Contents/Info.plist << EOF
|
runs-on: windows-latest
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
steps:
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
- uses: actions/checkout@v6
|
||||||
<plist version="1.0">
|
|
||||||
<dict>
|
|
||||||
<key>CFBundleExecutable</key>
|
|
||||||
<string>Clouck</string>
|
|
||||||
<key>CFBundleIdentifier</key>
|
|
||||||
<string>com.clouck.app</string>
|
|
||||||
<key>CFBundleName</key>
|
|
||||||
<string>Clouck</string>
|
|
||||||
<key>CFBundleVersion</key>
|
|
||||||
<string>1.0.0</string>
|
|
||||||
<key>CFBundlePackageType</key>
|
|
||||||
<string>APPL</string>
|
|
||||||
<key>LSUIElement</key>
|
|
||||||
<true/>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Verify app bundle exists before running macdeployqt
|
- name: Install Qt
|
||||||
echo "Verifying app bundle structure:"
|
uses: jurplel/install-qt-action@v4
|
||||||
if [ -d "Clouck.app" ]; then
|
with:
|
||||||
echo "App bundle directory exists"
|
version: "6.5.*"
|
||||||
ls -la Clouck.app/
|
cache: true
|
||||||
ls -la Clouck.app/Contents/
|
|
||||||
ls -la Clouck.app/Contents/MacOS/
|
|
||||||
else
|
|
||||||
echo "ERROR: Clouck.app directory not found!"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check if macdeployqt is available
|
- name: Configure and Build
|
||||||
echo "Checking macdeployqt availability:"
|
run: |
|
||||||
which macdeployqt || echo "macdeployqt not found in PATH"
|
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
|
||||||
|
cmake --build build --config Release
|
||||||
|
|
||||||
# Deploy Qt dependencies (ignore non-critical errors)
|
- name: Create Windows Distribution
|
||||||
echo "Running macdeployqt..."
|
shell: pwsh
|
||||||
echo "Current directory before macdeployqt: $(pwd)"
|
run: |
|
||||||
echo "Listing current directory contents:"
|
# Check what was actually built
|
||||||
ls -la
|
Get-ChildItem -Path "build" -Recurse -Name
|
||||||
echo "Calling: macdeployqt Clouck.app -dmg"
|
|
||||||
macdeployqt build/Clouck.app -dmg || echo "macdeployqt failed, will use fallback"
|
|
||||||
|
|
||||||
# Check what was created
|
New-Item -ItemType Directory -Path Clouck-windows -Force
|
||||||
echo "Files after macdeployqt:"
|
Copy-Item "build/Release/Clouck.exe" -Destination "Clouck-windows/" -ErrorAction SilentlyContinue
|
||||||
ls -la *.dmg 2>/dev/null || echo "No DMG files found"
|
Copy-Item "build/Release/*.dll" -Destination "Clouck-windows/" -ErrorAction SilentlyContinue
|
||||||
|
windeployqt --release Clouck-windows/Clouck.exe
|
||||||
|
Compress-Archive -Path Clouck-windows -DestinationPath Clouck-windows.zip
|
||||||
|
|
||||||
- name: Check DMG Creation
|
- name: Upload Windows Artifact
|
||||||
run: |
|
uses: actions/upload-artifact@v7
|
||||||
echo "Checking for DMG files after macdeployqt:"
|
with:
|
||||||
ls -la *.dmg 2>/dev/null || echo "No DMG files found"
|
name: Clouck-windows
|
||||||
|
path: Clouck-windows.zip
|
||||||
|
|
||||||
# Check if DMG was created by macdeployqt
|
build-linux:
|
||||||
if [ -f "Clouck.dmg" ]; then
|
runs-on: ubuntu-latest
|
||||||
echo "Found Clouck.dmg, renaming to Clouck.dmg"
|
steps:
|
||||||
mv Clouck.dmg Clouck.dmg
|
- uses: actions/checkout@v6
|
||||||
echo "DMG created successfully"
|
|
||||||
else
|
|
||||||
echo "Clouck.dmg not found, checking for other DMG files:"
|
|
||||||
ls -la *.dmg 2>/dev/null || echo "Still no DMG files found"
|
|
||||||
echo "Creating DMG manually using hdiutil..."
|
|
||||||
# Fallback: create DMG manually if macdeployqt failed
|
|
||||||
hdiutil create -volname "Clouck" -srcfolder Clouck.app -ov -format UDZO Clouck.dmg
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Upload macOS Artifact
|
- name: Install Dependencies
|
||||||
uses: actions/upload-artifact@v7
|
run: |
|
||||||
with:
|
sudo apt-get update
|
||||||
name: Clouck
|
sudo apt-get install -y build-essential cmake libx11-dev libxfixes-dev
|
||||||
path: Clouck.dmg
|
|
||||||
|
|
||||||
build-windows:
|
- name: Install Qt
|
||||||
runs-on: windows-latest
|
uses: jurplel/install-qt-action@v4
|
||||||
steps:
|
with:
|
||||||
- uses: actions/checkout@v6
|
version: "6.5.*"
|
||||||
|
cache: true
|
||||||
|
|
||||||
- name: Install Qt
|
- name: Configure CMake
|
||||||
uses: jurplel/install-qt-action@v4
|
run: |
|
||||||
with:
|
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
|
||||||
version: "6.5.*"
|
|
||||||
cache: true
|
|
||||||
|
|
||||||
- name: Configure CMake
|
- name: Build
|
||||||
run: |
|
run: cmake --build build --config Release
|
||||||
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
|
|
||||||
|
|
||||||
- name: Build
|
- name: Create Linux Distribution
|
||||||
run: cmake --build build --config Release
|
run: |
|
||||||
|
# Check what was actually built
|
||||||
|
echo "Contents of build directory:"
|
||||||
|
ls -la build/
|
||||||
|
|
||||||
- name: Create Windows Installer
|
# Look for the executable
|
||||||
run: |
|
EXECUTABLE=$(find build/ -name "Clouck" -type f -executable | head -1)
|
||||||
# Copy executable and dependencies
|
if [ -n "$EXECUTABLE" ]; then
|
||||||
mkdir Clouck-windows
|
echo "Found executable: $EXECUTABLE"
|
||||||
cp build/Release/Clouck.exe Clouck-windows/
|
mkdir -p Clouck-linux
|
||||||
cp build/Release/*.dll Clouck-windows/ 2>/dev/null || true
|
cp "$EXECUTABLE" Clouck-linux/
|
||||||
|
else
|
||||||
|
echo "ERROR: No Clouck executable found!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# Deploy Qt dependencies
|
# Copy any Qt libraries
|
||||||
windeployqt --release Clouck-windows/Clouck.exe
|
find build/ -name "*.so*" -exec cp {} Clouck-linux/ \; 2>/dev/null || true
|
||||||
|
|
||||||
# Create ZIP archive
|
# Create tar.gz for distribution
|
||||||
Compress-Archive -Path Clouck-windows -DestinationPath Clouck-windows.zip
|
tar -czf Clouck-linux.tar.gz Clouck-linux/
|
||||||
|
|
||||||
- name: Upload Windows Artifact
|
- name: Upload Linux Artifact
|
||||||
uses: actions/upload-artifact@v7
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: Clouck-windows
|
name: Clouck-linux
|
||||||
path: Clouck-windows.zip
|
path: Clouck-linux.tar.gz
|
||||||
|
|
||||||
# build-linux:
|
generate-changelog:
|
||||||
# runs-on: ubuntu-latest
|
needs: [ build-macos, build-windows, build-linux ]
|
||||||
# steps:
|
runs-on: ubuntu-latest
|
||||||
# - uses: actions/checkout@v6
|
if: always()
|
||||||
#
|
outputs:
|
||||||
# - name: Install Dependencies
|
changelog: ${{ steps.changelog.outputs.changelog }}
|
||||||
# run: |
|
version: ${{ steps.version.outputs.version }}
|
||||||
# sudo apt-get update
|
|
||||||
# sudo apt-get install -y build-essential cmake qt6-base-dev qt6-tools-dev libx11-dev libxfixes-dev
|
|
||||||
#
|
|
||||||
# - name: Install Qt
|
|
||||||
# uses: jurplel/install-qt-action@v4
|
|
||||||
# with:
|
|
||||||
# version: "6.5.*"
|
|
||||||
# cache: true
|
|
||||||
#
|
|
||||||
# - name: Configure CMake
|
|
||||||
# run: |
|
|
||||||
# cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
|
|
||||||
#
|
|
||||||
# - name: Build
|
|
||||||
# run: cmake --build build --config Release
|
|
||||||
#
|
|
||||||
# - name: Create Linux AppImage
|
|
||||||
# run: |
|
|
||||||
# mkdir -p Clouck.AppDir/usr/bin
|
|
||||||
# mkdir -p Clouck.AppDir/usr/lib
|
|
||||||
#
|
|
||||||
# cp build/Clouck Clouck.AppDir/usr/bin/
|
|
||||||
#
|
|
||||||
# cat > Clouck.AppDir/clouck.desktop << EOF
|
|
||||||
# [Desktop Entry]
|
|
||||||
# Name=Clouck
|
|
||||||
# Exec=Clouck
|
|
||||||
# Icon=clouck
|
|
||||||
# Type=Application
|
|
||||||
# Categories=Utility;
|
|
||||||
# EOF
|
|
||||||
#
|
|
||||||
# # Copy desktop file
|
|
||||||
# cp Clouck.AppDir/clouck.desktop Clouck.AppDir/
|
|
||||||
#
|
|
||||||
# # Deploy Qt dependencies (simplified)
|
|
||||||
# ldd build/Clouck | grep -o '/lib[^ ]*' | xargs -I {} cp {} Clouck.AppDir/usr/lib/ 2>/dev/null || true
|
|
||||||
#
|
|
||||||
# # Create AppImage (simplified approach)
|
|
||||||
# cd Clouck.AppDir
|
|
||||||
# ln -s usr/bin/Clouck AppRun
|
|
||||||
# cd ..
|
|
||||||
#
|
|
||||||
# # Create tar.gz for distribution
|
|
||||||
# tar -czf Clouck-linux.tar.gz Clouck.AppDir/
|
|
||||||
#
|
|
||||||
# - name: Upload Linux Artifact
|
|
||||||
# uses: actions/upload-artifact@v7
|
|
||||||
# with:
|
|
||||||
# name: Clouck-linux
|
|
||||||
# path: Clouck-linux.tar.gz
|
|
||||||
|
|
||||||
create-release:
|
steps:
|
||||||
needs: [ build-macos, build-windows ]
|
- uses: actions/checkout@v6
|
||||||
runs-on: ubuntu-latest
|
with:
|
||||||
if: startsWith(github.ref, 'refs/tags/v') || github.event_name ==
|
fetch-depth: 0
|
||||||
'workflow_dispatch'
|
|
||||||
|
|
||||||
steps:
|
- name: Get Version
|
||||||
- name: Download All Artifacts
|
id: version
|
||||||
uses: actions/download-artifact@v8
|
run: |
|
||||||
with:
|
if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
|
||||||
path: artifacts
|
echo "version=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
|
||||||
|
else
|
||||||
|
echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Get Version
|
- name: Generate Changelog
|
||||||
id: version
|
id: changelog
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
|
VERSION="${{ steps.version.outputs.version }}"
|
||||||
echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
|
CHANGELOG=$(git log --pretty=format:"- %s" $(git describe --tags --abbrev=0 HEAD~1)..HEAD 2>/dev/null || echo "- Initial release")
|
||||||
else
|
echo "changelog<<EOF" >> $GITHUB_OUTPUT
|
||||||
echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
|
echo "## What's New in $VERSION" >> $GITHUB_OUTPUT
|
||||||
fi
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
||||||
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
echo "## Downloads" >> $GITHUB_OUTPUT
|
||||||
|
echo "- **macOS**: Clouck.dmg" >> $GITHUB_OUTPUT
|
||||||
|
echo "- **Windows**: Clouck-windows.zip" >> $GITHUB_OUTPUT
|
||||||
|
echo "- **Linux**: Clouck-linux.tar.gz" >> $GITHUB_OUTPUT
|
||||||
|
echo "EOF" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Create Release
|
create-release:
|
||||||
uses: softprops/action-gh-release@v3
|
needs: [ build-macos, build-windows, build-linux, generate-changelog ]
|
||||||
with:
|
runs-on: ubuntu-latest
|
||||||
name: Clouck ${{ steps.version.outputs.VERSION }}
|
if: always()
|
||||||
body: |
|
|
||||||
Cross-platform clock widget application
|
|
||||||
|
|
||||||
## Features
|
steps:
|
||||||
- Always-on-top functionality across all platforms
|
- name: Download All Artifacts
|
||||||
- Fullscreen mode compatibility
|
uses: actions/download-artifact@v8
|
||||||
- Resizable interface
|
with:
|
||||||
- Context menu with customization options
|
path: artifacts
|
||||||
- Native platform integration
|
|
||||||
|
|
||||||
## Downloads
|
- name: Display Structure
|
||||||
- **macOS**: Clouck.dmg
|
run: ls -R artifacts
|
||||||
- **Windows**: Clouck-windows.zip
|
|
||||||
- **Linux**: Clouck-linux.tar.gz
|
|
||||||
|
|
||||||
## Installation
|
- name: Create Release
|
||||||
### macOS
|
uses: softprops/action-gh-release@v3
|
||||||
1. Download Clouck.dmg
|
with:
|
||||||
2. Open the DMG file
|
name: Clouck ${{ needs.generate-changelog.outputs.version }}
|
||||||
3. Drag Clouck.app to Applications folder
|
body: |
|
||||||
|
Cross-platform clock widget application
|
||||||
|
|
||||||
### Windows
|
${{ needs.generate-changelog.outputs.changelog }}
|
||||||
1. Download Clouck-windows.zip
|
|
||||||
2. Extract the ZIP file
|
|
||||||
3. Run Clouck.exe
|
|
||||||
|
|
||||||
### Linux
|
## Installation
|
||||||
1. Download Clouck-linux.tar.gz
|
### macOS
|
||||||
2. Extract the tar.gz file
|
1. Download Clouck.dmg
|
||||||
3. Run the Clouck executable
|
2. Open the DMG file
|
||||||
files: |
|
3. Drag Clouck.app to Applications folder
|
||||||
artifacts/Clouck/Clouck.dmg
|
|
||||||
artifacts/Clouck-windows/Clouck-windows.zip
|
### Windows
|
||||||
artifacts/Clouck-linux/Clouck-linux.tar.gz
|
1. Download Clouck-windows.zip
|
||||||
draft: false
|
2. Extract the ZIP file
|
||||||
prerelease: false
|
3. Run Clouck.exe
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
### Linux
|
||||||
|
1. Download Clouck-linux.tar.gz
|
||||||
|
2. Extract the tar.gz file
|
||||||
|
3. Run the Clouck executable
|
||||||
|
|
||||||
|
### Features
|
||||||
|
- Always-on-top functionality across all platforms
|
||||||
|
- Fullscreen mode compatibility
|
||||||
|
- Resizable interface
|
||||||
|
- Context menu with customization options
|
||||||
|
- Native platform integration
|
||||||
|
files: |
|
||||||
|
artifacts/Clouck-macos/Clouck.dmg
|
||||||
|
artifacts/Clouck-windows/Clouck-windows.zip
|
||||||
|
artifacts/Clouck-linux/Clouck-linux.tar.gz
|
||||||
|
draft: false
|
||||||
|
prerelease: false
|
||||||
|
generate_release_notes: true
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
Vendored
+1
@@ -1,3 +1,4 @@
|
|||||||
{
|
{
|
||||||
"cmake.configureOnOpen": false,
|
"cmake.configureOnOpen": false,
|
||||||
|
"C_Cpp.errorSquiggles": "enabled",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,22 +16,27 @@ When on macOS / Linux, the clock on the menu bar is too small to be noticeable,
|
|||||||
|
|
||||||
## ✨ Features
|
## ✨ Features
|
||||||
|
|
||||||
- [ ] **Main Window**
|
- Cross Platform
|
||||||
|
- [x] MacOS
|
||||||
|
- [x] Windows
|
||||||
|
- [ ] Linux
|
||||||
|
- [x] **Main Window**
|
||||||
- [x] Always On Top
|
- [x] Always On Top
|
||||||
- [x] Frameless
|
- [x] Frameless
|
||||||
- [x] Drag and Move
|
- [x] Drag and Move
|
||||||
- [x] Right Click Menu
|
|
||||||
- [x] Resizable
|
- [x] Resizable
|
||||||
- [ ] Show in Fullscreen Mode
|
- [x] Show in Fullscreen Mode
|
||||||
- [x] **Style**
|
- [x] **Style**
|
||||||
|
- [x] Right Click Menu
|
||||||
- [x] Set Background Color
|
- [x] Set Background Color
|
||||||
|
- [ ] Transparent Background
|
||||||
- [x] Set Font Color
|
- [x] Set Font Color
|
||||||
- [x] Set FontSize
|
- [x] Set FontSize
|
||||||
- [x] **Configuration File** (XML)
|
- [x] **Tweakable** (XML)
|
||||||
- [x] Read Settings
|
- [x] Read Settings
|
||||||
- [x] Write Settings
|
- [x] Write Settings
|
||||||
- [x] Reset Settings
|
- [x] Reset Settings
|
||||||
- [ ] **Time**
|
- [ ] **Time Zone**
|
||||||
- [ ] Select Time Zone
|
- [ ] Select Time Zone
|
||||||
|
|
||||||
## Quick Start
|
## Quick Start
|
||||||
@@ -104,8 +109,6 @@ Visit the [Releases](https://github.com/ivaquero/clouck/releases) page to downlo
|
|||||||
|
|
||||||
2. GitHub Actions will automatically build and create a release with binaries for all platforms
|
2. GitHub Actions will automatically build and create a release with binaries for all platforms
|
||||||
|
|
||||||
See [`.github/workflows/`](.github/workflows/) for detailed workflow configuration.
|
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
|
|
||||||
The application now uses XML configuration files instead of QSettings. Configuration is stored in `config.xml` with the following options:
|
The application now uses XML configuration files instead of QSettings. Configuration is stored in `config.xml` with the following options:
|
||||||
|
|||||||
+67
-35
@@ -2,13 +2,20 @@
|
|||||||
|
|
||||||
#ifdef Q_OS_LINUX
|
#ifdef Q_OS_LINUX
|
||||||
|
|
||||||
#include <QWidget>
|
#include <QtWidgets/QWidget>
|
||||||
#include <QGuiApplication>
|
#include <QtGui/QGuiApplication>
|
||||||
#include <qpa/qplatformnativeinterface.h>
|
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
#include <X11/extensions/Xfixes.h>
|
#include <X11/extensions/Xfixes.h>
|
||||||
|
|
||||||
|
// X11 type definitions for compatibility
|
||||||
|
typedef XserverRegion Region;
|
||||||
|
|
||||||
|
// X11 shape constants
|
||||||
|
#define ShapeInput 2
|
||||||
|
#define ShapeBounding 0
|
||||||
|
|
||||||
|
// Qt 6.x compatibility - use only public Qt interfaces
|
||||||
void WindowHelperLinux::setupAlwaysOnTopForFullscreen(QWidget *widget)
|
void WindowHelperLinux::setupAlwaysOnTopForFullscreen(QWidget *widget)
|
||||||
{
|
{
|
||||||
if (!widget)
|
if (!widget)
|
||||||
@@ -30,29 +37,28 @@ void WindowHelperLinux::setupAlwaysOnTopForFullscreen(QWidget *widget)
|
|||||||
// Set window type to utility (similar to macOS panel)
|
// Set window type to utility (similar to macOS panel)
|
||||||
Atom windowType = XInternAtom(display, "_NET_WM_WINDOW_TYPE", False);
|
Atom windowType = XInternAtom(display, "_NET_WM_WINDOW_TYPE", False);
|
||||||
Atom windowTypeUtility = XInternAtom(display, "_NET_WM_WINDOW_TYPE_UTILITY", False);
|
Atom windowTypeUtility = XInternAtom(display, "_NET_WM_WINDOW_TYPE_UTILITY", False);
|
||||||
XChangeProperty(display, windowId, windowType, XA_ATOM, 32,
|
XChangeProperty(display, windowId, windowType, XA_ATOM, 32, PropModeReplace,
|
||||||
PropModeReplace, (unsigned char *)&windowTypeUtility, 1);
|
(unsigned char *)&windowTypeUtility, 1);
|
||||||
|
|
||||||
// Set window state to above
|
// Set window state to above (always on top)
|
||||||
Atom windowState = XInternAtom(display, "_NET_WM_STATE", False);
|
Atom wmState = XInternAtom(display, "_NET_WM_STATE", False);
|
||||||
Atom windowStateAbove = XInternAtom(display, "_NET_WM_STATE_ABOVE", False);
|
Atom wmStateAbove = XInternAtom(display, "_NET_WM_STATE_ABOVE", False);
|
||||||
XChangeProperty(display, windowId, windowState, XA_ATOM, 32,
|
XChangeProperty(display, windowId, wmState, XA_ATOM, 32, PropModeReplace,
|
||||||
PropModeReplace, (unsigned char *)&windowStateAbove, 1);
|
(unsigned char *)&wmStateAbove, 1);
|
||||||
|
|
||||||
// Set window state to skip taskbar
|
// Set window state to sticky (appears on all desktops)
|
||||||
Atom windowStateSkipTaskbar = XInternAtom(display, "_NET_WM_STATE_SKIP_TASKBAR", False);
|
Atom wmStateSticky = XInternAtom(display, "_NET_WM_STATE_STICKY", False);
|
||||||
XChangeProperty(display, windowId, windowState, XA_ATOM, 32,
|
XChangeProperty(display, windowId, wmState, XA_ATOM, 32, PropModeAppend,
|
||||||
PropModeReplace, (unsigned char *)&windowStateSkipTaskbar, 1);
|
(unsigned char *)&wmStateSticky, 1);
|
||||||
|
|
||||||
// Set window state to skip pager
|
// Set window state to skip taskbar and pager
|
||||||
Atom windowStateSkipPager = XInternAtom(display, "_NET_WM_STATE_SKIP_PAGER", False);
|
Atom wmStateSkipTaskbar = XInternAtom(display, "_NET_WM_STATE_SKIP_TASKBAR", False);
|
||||||
XChangeProperty(display, windowId, windowState, XA_ATOM, 32,
|
Atom wmStateSkipPager = XInternAtom(display, "_NET_WM_STATE_SKIP_PAGER", False);
|
||||||
PropModeReplace, (unsigned char *)&windowStateSkipPager, 1);
|
Atom states[] = {wmStateSkipTaskbar, wmStateSkipPager};
|
||||||
|
XChangeProperty(display, windowId, wmState, XA_ATOM, 32, PropModeAppend,
|
||||||
|
(unsigned char *)states, 2);
|
||||||
|
|
||||||
// Set window state to sticky (appear on all workspaces)
|
XFlush(display);
|
||||||
Atom windowStateSticky = XInternAtom(display, "_NET_WM_STATE_STICKY", False);
|
|
||||||
XChangeProperty(display, windowId, windowState, XA_ATOM, 32,
|
|
||||||
PropModeReplace, (unsigned char *)&windowStateSticky, 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void WindowHelperLinux::setWindowAlwaysOnTop(QWidget *widget, bool alwaysOnTop)
|
void WindowHelperLinux::setWindowAlwaysOnTop(QWidget *widget, bool alwaysOnTop)
|
||||||
@@ -60,17 +66,35 @@ void WindowHelperLinux::setWindowAlwaysOnTop(QWidget *widget, bool alwaysOnTop)
|
|||||||
if (!widget)
|
if (!widget)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Qt::WindowFlags flags = widget->windowFlags();
|
QNativeInterface::QX11Application *x11App = qApp->nativeInterface<QNativeInterface::QX11Application>();
|
||||||
|
if (!x11App)
|
||||||
|
return;
|
||||||
|
|
||||||
|
Display *display = x11App->display();
|
||||||
|
if (!display)
|
||||||
|
return;
|
||||||
|
|
||||||
|
WId windowId = widget->winId();
|
||||||
|
if (!windowId)
|
||||||
|
return;
|
||||||
|
|
||||||
if (alwaysOnTop)
|
if (alwaysOnTop)
|
||||||
{
|
{
|
||||||
flags |= Qt::WindowStaysOnTopHint;
|
// Set window state to above (always on top)
|
||||||
|
Atom wmState = XInternAtom(display, "_NET_WM_STATE", False);
|
||||||
|
Atom wmStateAbove = XInternAtom(display, "_NET_WM_STATE_ABOVE", False);
|
||||||
|
XChangeProperty(display, windowId, wmState, XA_ATOM, 32, PropModeReplace,
|
||||||
|
(unsigned char *)&wmStateAbove, 1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
flags &= ~Qt::WindowStaysOnTopHint;
|
// Remove always on top state
|
||||||
|
Atom wmState = XInternAtom(display, "_NET_WM_STATE", False);
|
||||||
|
Atom wmStateAbove = XInternAtom(display, "_NET_WM_STATE_ABOVE", False);
|
||||||
|
XDeleteProperty(display, windowId, wmState);
|
||||||
}
|
}
|
||||||
widget->setWindowFlags(flags);
|
|
||||||
widget->show(); // Required to apply new flags
|
XFlush(display);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WindowHelperLinux::setWindowClickThrough(QWidget *widget, bool clickThrough)
|
void WindowHelperLinux::setWindowClickThrough(QWidget *widget, bool clickThrough)
|
||||||
@@ -78,7 +102,6 @@ void WindowHelperLinux::setWindowClickThrough(QWidget *widget, bool clickThrough
|
|||||||
if (!widget)
|
if (!widget)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Get X11 display from Qt platform interface
|
|
||||||
QNativeInterface::QX11Application *x11App = qApp->nativeInterface<QNativeInterface::QX11Application>();
|
QNativeInterface::QX11Application *x11App = qApp->nativeInterface<QNativeInterface::QX11Application>();
|
||||||
if (!x11App)
|
if (!x11App)
|
||||||
return;
|
return;
|
||||||
@@ -93,21 +116,30 @@ void WindowHelperLinux::setWindowClickThrough(QWidget *widget, bool clickThrough
|
|||||||
|
|
||||||
if (clickThrough)
|
if (clickThrough)
|
||||||
{
|
{
|
||||||
// Set window input shape to empty region
|
// Enable click-through using X11 shape extension
|
||||||
XRectangle rect = {0, 0, 0, 0};
|
XRectangle rect = {0, 0, 1, 1};
|
||||||
XFixesSetWindowShapeRegion(display, windowId, ShapeInput, 0, 0, None);
|
Region region = XFixesCreateRegion(display, &rect, 1);
|
||||||
XFixesSetWindowShapeRegion(display, windowId, ShapeInput, 0, 0,
|
XFixesSetWindowShapeRegion(display, windowId, ShapeInput, 0, 0, region);
|
||||||
XFixesCreateRegion(display, &rect, 1));
|
XFixesSetWindowShapeRegion(display, windowId, ShapeBounding, 0, 0, region);
|
||||||
|
XFixesDestroyRegion(display, region);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Reset window input shape
|
// Disable click-through - restore normal input handling
|
||||||
XFixesSetWindowShapeRegion(display, windowId, ShapeInput, 0, 0, None);
|
XRectangle rect = {0, 0, 0, 0};
|
||||||
|
Region region = XFixesCreateRegion(display, &rect, 1);
|
||||||
|
XFixesSetWindowShapeRegion(display, windowId, ShapeInput, 0, 0, region);
|
||||||
|
XFixesDestroyRegion(display, region);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
XFlush(display);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WindowHelperLinux::setupLinux(QWidget *widget)
|
void WindowHelperLinux::setupLinux(QWidget *widget)
|
||||||
{
|
{
|
||||||
|
if (!widget)
|
||||||
|
return;
|
||||||
|
|
||||||
setupAlwaysOnTopForFullscreen(widget);
|
setupAlwaysOnTopForFullscreen(widget);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user