diff --git a/.github/scripts/smartctl b/.github/scripts/smartctl new file mode 100644 index 0000000..f8c72a1 Binary files /dev/null and b/.github/scripts/smartctl differ diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 54908ec..b63f0d3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,11 +28,11 @@ jobs: - name: Install dependencies for glibc run: | sudo apt update - sudo apt install -y qt6-base-dev libgl1-mesa-dev libxkbcommon-dev libvulkan-dev qmake6 smartmontools + sudo apt install -y qt6-base-dev qt6-svg-dev libgl1-mesa-dev libxkbcommon-dev libvulkan-dev qmake6 smartmontools if: ${{ matrix.clib == 'glibc' }} - name: Install dependencies for musl run: | - apk add git cmake make gcc g++ curl gcompat qt6-qtbase-dev qt6-qtbase-x11 smartmontools + apk add git cmake make gcc g++ curl gcompat qt6-qtbase-dev qt6-qtbase-x11 qt6-qtsvg breeze smartmontools git config --global --add safe.directory '*' if: ${{ matrix.clib == 'musl' }} @@ -50,7 +50,7 @@ jobs: mkdir -p AppDir/usr/bin cp build/KDiskInfo AppDir/usr/bin/ - cp /usr/sbin/smartctl AppDir/usr/bin/ + cp .github/scripts/smartctl AppDir/usr/bin/ cp .github/scripts/KDiskInfo.desktop AppDir/ cp icon.svg AppDir/KDiskInfo.svg diff --git a/mainwindow.ui b/mainwindow.ui index d5df511..17f95fc 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -3,7 +3,7 @@ MainWindow - Qt::WindowModality::NonModal + Qt::NonModal @@ -22,6 +22,10 @@ KDiskInfo + + + :/icons/icon.svg:/icons/icon.svg + @@ -38,9 +42,6 @@ false - - QFrame::Shadow::Raised - true @@ -57,15 +58,13 @@ - + + .. - - Qt::Orientation::Horizontal - 40 @@ -83,9 +82,6 @@ - - Qt::Orientation::Horizontal - 40 @@ -100,7 +96,8 @@ - + + .. @@ -326,7 +323,7 @@ 0 0 800 - 30 + 22 @@ -366,7 +363,8 @@ - + + .. &Save JSON @@ -374,18 +372,20 @@ - + + .. &Quit - QAction::MenuRole::QuitRole + QAction::NoRole - + + .. &Refresh Devices @@ -393,7 +393,8 @@ - + + .. &GitHub @@ -401,13 +402,14 @@ - + + .. &About - QAction::MenuRole::AboutRole + QAction::NoRole @@ -440,6 +442,8 @@ - + + +