Skip to content

Commit a7f1500

Browse files
committed
Rename resources to ease override
1 parent 140a12e commit a7f1500

11 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ jobs:
102102
mkdir -p "$APPDIR/usr/share/icons/hicolor/256x256/apps"
103103
104104
cp "build/${APP_NAME}" "$APPDIR/usr/bin/"
105-
cp "resources/${APP_NAME}.png" "$APPDIR/${APP_NAME}.png"
106-
convert "resources/${APP_NAME}.ico" -resize 256x256 "$APPDIR/usr/share/icons/hicolor/256x256/apps/${APP_NAME}.png"
105+
cp "resources/mainwindow.png" "$APPDIR/${APP_NAME}.png"
106+
convert "resources/mainwindow.ico" -resize 256x256 "$APPDIR/usr/share/icons/hicolor/256x256/apps/${APP_NAME}.png"
107107
108108
cat <<EOF > "$APPDIR/usr/share/applications/${APP_NAME}.desktop"
109109
[Desktop Entry]

resources/icons.qrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<file>media-skip-forward.svg</file>
1111
<file>preferences-desktop.svg</file>
1212
<file>system-shutdown.svg</file>
13-
<file>subtivals.svg</file>
13+
<file>mainwindow.svg</file>
1414
<file>auto-hide.svg</file>
1515
<file>show-calibration.svg</file>
1616
<file>show-preview.svg</file>

resources/main.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DI_ICON1 ICON DISCARDABLE "mainwindow.ico"

resources/subtivals.rc

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/mainwindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ void MainWindow::openRecentFile() {
536536

537537
void MainWindow::actionShowWizard() {
538538
Wizard wizard;
539-
wizard.setPixmap(Wizard::LogoPixmap, QPixmap(":/icons/subtivals.svg"));
539+
wizard.setPixmap(Wizard::LogoPixmap, QPixmap(":/icons/mainwindow.svg"));
540540
wizard.setWizardStyle(QWizard::ClassicStyle);
541541
wizard.exec();
542542
}

src/mainwindow.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</property>
1616
<property name="windowIcon">
1717
<iconset resource="../resources/icons.qrc">
18-
<normaloff>:/icons/subtivals.svg</normaloff>:/icons/subtivals.svg</iconset>
18+
<normaloff>:/icons/mainwindow.svg</normaloff>:/icons/mainwindow.svg</iconset>
1919
</property>
2020
<widget class="QWidget" name="centralWidget">
2121
<layout class="QGridLayout" name="gridLayout_2">

0 commit comments

Comments
 (0)