some name changes

This commit is contained in:
cmclark00 2024-10-13 20:33:13 -04:00
parent 4d008ac052
commit 6760ba778f
4 changed files with 25 additions and 25 deletions

View file

@ -8,10 +8,10 @@ OPTION (DRIVELIST_FILTER_SYSTEM_DRIVES "Filter System drives from displayed driv
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "Which macOS architectures to build for")
project(rpi-imager LANGUAGES CXX C)
set(IMAGER_VERSION_MAJOR 1)
set(IMAGER_VERSION_MINOR 9)
set(IMAGER_VERSION_PATCH 2)
project(retro-imager LANGUAGES CXX C)
set(IMAGER_VERSION_MAJOR 0)
set(IMAGER_VERSION_MINOR 3)
set(IMAGER_VERSION_PATCH 0)
set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.${IMAGER_VERSION_PATCH}")
set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},${IMAGER_VERSION_PATCH},0")
add_definitions(-DIMAGER_VERSION_STR="${IMAGER_VERSION_STR}")
@ -384,12 +384,12 @@ if (WIN32)
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}.exe" "${CMAKE_BINARY_DIR}/dependencies/fat32format/fat32format.exe"
"${CMAKE_SOURCE_DIR}/../license.txt" "${CMAKE_SOURCE_DIR}/windows/rpi-imager-cli.cmd"
"${CMAKE_SOURCE_DIR}/../license.txt" "${CMAKE_SOURCE_DIR}/windows/retro-imager-cli.cmd"
"${CMAKE_BINARY_DIR}/deploy")
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/windows/rpi-imager.nsi.in"
"${CMAKE_CURRENT_BINARY_DIR}/rpi-imager.nsi"
"${CMAKE_CURRENT_SOURCE_DIR}/windows/retro-imager.nsi.in"
"${CMAKE_CURRENT_BINARY_DIR}/retro-imager.nsi"
@ONLY)
add_custom_command(TARGET ${PROJECT_NAME}

View file

@ -26,7 +26,7 @@ ApplicationWindow {
minimumWidth: imageWriter.isEmbeddedMode() ? -1 : 680
minimumHeight: imageWriter.isEmbeddedMode() ? -1 : 450
title: qsTr("Retro Imager v0.1")
title: qsTr("Retro Imager v%1").arg(imageWriter.constantVersion())
FontLoader {id: roboto; source: "fonts/Roboto-Regular.ttf"}
FontLoader {id: robotoLight; source: "fonts/Roboto-Light.ttf"}
FontLoader {id: robotoBold; source: "fonts/Roboto-Bold.ttf"}

View file

@ -4,20 +4,20 @@
# by Vlasis K. Barkas aka Red Wine red_wine@freemail.gr Sep 2006
############################################################################################
!define APP_NAME "Raspberry Pi Imager"
!define COMP_NAME "Raspberry Pi Ltd"
!define APP_NAME "Retro Imager"
!define COMP_NAME "coreymclark"
!define VERSION "@IMAGER_VERSION_STR@"
!define INSTALLER_NAME "imager-${VERSION}.exe"
!define INSTALLER_NAME "retro-imager-${VERSION}.exe"
!define COPYRIGHT "Raspberry Pi Ltd"
!define DESCRIPTION "Raspberry Pi Imager"
!define MAIN_APP_EXE "rpi-imager.exe"
!define DESCRIPTION "Retro Imager"
!define MAIN_APP_EXE "retro-imager.exe"
!define INSTALL_TYPE "SetShellVarContext current"
!define REG_ROOT "HKCU"
!define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_EXE}"
!define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
# Window to close if running
!define EXE_TO_TERMINATE "rpi-imager.exe"
!define EXE_TO_TERMINATE "retro-imager.exe"
######################################################################
@ -38,7 +38,7 @@ OutFile "${INSTALLER_NAME}"
BrandingText "${APP_NAME}"
XPStyle on
InstallDirRegKey "${REG_ROOT}" "${REG_APP_PATH}" ""
InstallDir "$PROGRAMFILES\Raspberry Pi Imager"
InstallDir "$PROGRAMFILES\Retro Imager"
######################################################################
@ -89,7 +89,7 @@ InstallDir "$PROGRAMFILES\Raspberry Pi Imager"
!ifdef REG_START_MENU
!define MUI_STARTMENUPAGE_NODISABLE
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Raspberry Pi"
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Retro Imager"
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${REG_ROOT}"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "${UNINSTALL_PATH}"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${REG_START_MENU}"
@ -256,8 +256,8 @@ File "deploy\libgcc_s_seh-1.dll"
File "deploy\libstdc++-6.dll"
File "deploy\libwinpthread-1.dll"
File "deploy\license.txt"
File "deploy\rpi-imager-cli.cmd"
File "deploy\rpi-imager.exe"
File "deploy\retro-imager-cli.cmd"
File "deploy\retro-imager.exe"
SetOutPath "$INSTDIR\generic"
File "deploy\generic\qtuiotouchplugin.dll"
SetOutPath "$INSTDIR\iconengines"
@ -1699,11 +1699,11 @@ RmDir "$SMPROGRAMS\$SM_Folder"
!endif
!ifndef REG_START_MENU
Delete "$SMPROGRAMS\Raspberry Pi\${APP_NAME}.lnk"
Delete "$SMPROGRAMS\Retro Imager${APP_NAME}.lnk"
!ifdef WEB_SITE
Delete "$SMPROGRAMS\Raspberry Pi\${APP_NAME} Website.lnk"
Delete "$SMPROGRAMS\Retro Imager\${APP_NAME} Website.lnk"
!endif
RmDir "$SMPROGRAMS\Raspberry Pi"
RmDir "$SMPROGRAMS\Retro Imager"
!endif
DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}"
@ -1719,10 +1719,10 @@ DeleteRegKey SHCTX "Software\Classes\RPI_IMAGINGUTILITY"
DeleteRegKey ${REG_ROOT} ""
RMDir /r "$APPDATA\Raspberry Pi\Imager"
RMDir "$APPDATA\Raspberry Pi"
RMDir /r "$LOCALAPPDATA\Raspberry Pi\Imager"
RMDir "$LOCALAPPDATA\Raspberry Pi"
RMDir /r "$APPDATA\Retro Imager\Imager"
RMDir "$APPDATA\Retro Imager"
RMDir /r "$LOCALAPPDATA\Retro Imager\Imager"
RMDir "$LOCALAPPDATA\Retro Imager"
SectionEnd