Rename imagingutility -> rpi-imager

CMakeLists.txt

@@ -6,7 +6,7 @@ if (APPLE)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "" FORCE)
 endif()
 
-project(imagingutility LANGUAGES CXX)
+project(rpi-imager LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
@@ -18,16 +18,16 @@ set(HEADERS config.h imagewriter.h networkaccessmanagerfactory.h nan.h drivelist
 
 # Add 3rd-party dependencies
 if (APPLE)
-set_source_files_properties("icons/imagingutility.icns" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+set_source_files_properties("icons/rpi-imager.icns" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 set(DEPENDENCIES mac/macfile.cpp mac/macfile.h dependencies/mountutils/src/darwin/functions.cpp
-    dependencies/drivelist/src/darwin/list.mm dependencies/drivelist/src/darwin/REDiskList.m icons/imagingutility.icns)
+    dependencies/drivelist/src/darwin/list.mm dependencies/drivelist/src/darwin/REDiskList.m icons/rpi-imager.icns)
 enable_language(OBJC C)
 elseif (UNIX)
 set(DEPENDENCIES dependencies/mountutils/src/linux/functions.cpp linux/linuxdrivelist.cpp linux/udisks2api.cpp linux/udisks2api.h)
 elseif (WIN32)
 set(DEPENDENCIES dependencies/mountutils/src/windows/functions.cpp dependencies/drivelist/src/windows/list.cpp
     windows/winfile.cpp windows/winfile.h
-    windows/imagingutility.rc)
+    windows/rpi-imager.rc)
 set(EXTRALIBS setupapi)
 endif()
 
@@ -140,12 +140,12 @@ if (WIN32)
     add_custom_command(TARGET ${PROJECT_NAME}
         POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy
-            "${CMAKE_CURRENT_SOURCE_DIR}/windows/imagingutility.nsi"
+            "${CMAKE_CURRENT_SOURCE_DIR}/windows/rpi-imager.nsi"
             "${CMAKE_BINARY_DIR}")
 
     add_custom_command(TARGET ${PROJECT_NAME}
         POST_BUILD
-        COMMAND "${WINDEPLOYQT}" --no-translations --no-webkit2 --no-opengl-sw --angle --qmldir "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/deploy/imagingutility.exe")
+        COMMAND "${WINDEPLOYQT}" --no-translations --no-webkit2 --no-opengl-sw --angle --qmldir "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/deploy/rpi-imager.exe")
 
     # Remove excess files
     add_custom_command(TARGET ${PROJECT_NAME}
@@ -186,7 +186,7 @@ elseif(APPLE)
     set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE YES
         MACOSX_BUNDLE_BUNDLE_NAME "Raspberry Pi Imager"
         MACOSX_BUNDLE_GUI_IDENTIFIER "org.raspberrypi.imagingutility"
-        MACOSX_BUNDLE_ICON_FILE "imagingutility.icns")
+        MACOSX_BUNDLE_ICON_FILE "rpi-imager.icns")
 
     find_program(MACDEPLOYQT "macdeployqt" PATHS "${Qt5_DIR}/../../../bin")
     if (NOT MACDEPLOYQT)
@@ -203,9 +203,9 @@ else()
     find_package(Qt5 COMPONENTS DBus)
     set(EXTRALIBS Qt5::DBus)
 
-    install(TARGETS imagingutility DESTINATION bin)
+    install(TARGETS rpi-imager DESTINATION bin)
-    install(FILES icons/imagingutility.png DESTINATION share/pixmaps)
+    install(FILES icons/rpi-imager.png DESTINATION share/pixmaps)
-    install(FILES linux/imagingutility.desktop DESTINATION share/applications)
+    install(FILES linux/rpi-imager.desktop DESTINATION share/applications)
 endif()
 
 include_directories(${CURL_INCLUDE_DIR} ${LibArchive_INCLUDE_DIR})

README.md

@@ -1,4 +1,4 @@
-# imagingutility
+# rpi-imager
 
 Raspberry Pi Imaging Utility
 
@@ -39,7 +39,7 @@ Can install it with apt:
 
 ```
 cd ..
-sudo apt install ./imagingutility*.deb
+sudo apt install ./rpi-imager*.deb
 ```
 
 It should create an icon in the start menu under "Utilities" or "Accessories".
@@ -68,10 +68,10 @@ Building can be done manually using the command-line, using "cmake", "make", etc
 - Open CMakeLists.txt in Qt creator.
 - For builds you distribute to others, make sure you choose "Release" in the toolchain settings and not the debug flavour.
 - Menu "Build" -> "Build all"
-- Result will be in ../build_imagingutility_someversion
+- Result will be in ../build_rpi-imager_someversion
 - Go to the BUILD folder, right click on the .nsi script "Compile NSIS script", to create installer.
 
-Note: the CMake integration in Qt Creator is a bit flaky at times. If you made any custom changes to the CMakeLists.txt file and it subsequently gets in an endless loop where it never finishes the "configures" stage while re-processing the file, delete "build_imagingutility_someversion" directory and try again.
+Note: the CMake integration in Qt Creator is a bit flaky at times. If you made any custom changes to the CMakeLists.txt file and it subsequently gets in an endless loop where it never finishes the "configures" stage while re-processing the file, delete "build_rpi-imager_someversion" directory and try again.
 
 ### Mac OS X
 
@@ -87,15 +87,15 @@ During installation, choose a Qt 5.x edition and CMake.
 - Download source .zip from github and extract it to a folder on disk
 - Start Qt Creator (may need to start "finder" navigate to home folder using the "Go" menu, and find Qt folder to start it manually as it may not have created icon in Applications), and open CMakeLists.txt
 - Menu "Build" -> "Build all"
-- Result will be in ../build_imagingutility_someversion
+- Result will be in ../build_rpi-imager_someversion
 - For distribution to others: code sign the .app, create a DMG, code sign the DMG, submit it for notarization to Apple and staple the notarization ticket to the DMG.
 
 E.g.:
 
 ```
-cd build-imagingutility-Desktop_Qt_5_14_1_clang_64bit-Release/
+cd build-rpi-imager-Desktop_Qt_5_14_1_clang_64bit-Release/
-codesign --deep --force --verify --verbose --sign "YOUR KEYID" --options runtime imagingutility.app
+codesign --deep --force --verify --verbose --sign "YOUR KEYID" --options runtime rpi-imager.app
-mv imagingutility.app "Raspberry Pi Imager.app"
+mv rpi-imager.app "Raspberry Pi Imager.app"
 create-dmg Raspberry\ Pi\ Imager.app
 mv Raspberry\ Pi\ Imager\ .dmg imager.dmg
 xcrun altool --notarize-app -t osx -f imager.dmg --primary-bundle-id="org.raspberrypi.imagingutility" -u YOUR-EMAIL-ADDRESS -p YOUR-APP-SPECIFIC-APPLE-PASSWORD -itc_provider TEAM-ID-IF-APPLICABLE
@@ -111,5 +111,5 @@ On Windows start the application with the command-line option --debug to let it
 
 ### Custom repository
 
-If the application is started with "--repo <your own URL>" it will use a custom image repository.
+If the application is started with "--repo [your own URL]" it will use a custom image repository.
 So can simply create another 'start menu shortcut' to the application with that parameter to use the application with your own images.

debian/changelog

@@ -1,4 +1,4 @@
-imagingutility (1.0) unstable; urgency=medium
+rpi-imager (1.0) unstable; urgency=medium
 
   * Initial Release.
 

debian/control

@@ -1,4 +1,4 @@
-Source: imagingutility
+Source: rpi-imager
 Section: admin
 Priority: optional
 Maintainer: Floris Bos <bos@je-eigen-domein.nl>
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 10), cmake, libarchive-dev, libcurl4-openssl-dev |
 Standards-Version: 4.1.2
 Homepage: https://www.raspberrypi.org/
 
-Package: imagingutility
+Package: rpi-imager
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, 
  qml-module-qtquick2, qml-module-qtquick-controls2, qml-module-qt-labs-settings, qml-module-qtquick-layouts, qml-module-qtquick-templates2, qml-module-qtquick-window2, qml-module-qtgraphicaleffects,

debian/copyright

@@ -1,5 +1,5 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: imagingutility
+Upstream-Name: rpi-imager
 Source: 
 
 Files: *

linux/rpi-imager.desktop

@@ -3,7 +3,7 @@ Type=Application
 Version=1.0
 Name=Imager
 Comment=Raspberry Pi Imager
-Icon=imagingutility
+Icon=rpi-imager
-Exec=imagingutility
+Exec=rpi-imager
 Categories=Utility
 StartupNotify=false

main.cpp

@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
     app.setOrganizationName("Raspberry Pi");
     app.setOrganizationDomain("raspberrypi.org");
     app.setApplicationName("Imager");
-    app.setWindowIcon(QIcon(":/icons/imagingutility.ico"));
+    app.setWindowIcon(QIcon(":/icons/rpi-imager.ico"));
     ImageWriter imageWriter;
     NetworkAccessManagerFactory namf;
     QQmlApplicationEngine engine;

qml.qrc

@@ -2,7 +2,7 @@
     <qresource prefix="/">
         <file>main.qml</file>
         <file>qtquickcontrols2.conf</file>
-        <file>icons/imagingutility.ico</file>
+        <file>icons/rpi-imager.ico</file>
         <file>icons/rpi2.png</file>
         <file>fonts/Roboto-Bold.ttf</file>
         <file>fonts/Roboto-Light.ttf</file>

windows/rpi-imager.nsi

@@ -15,7 +15,7 @@
 !define VERSION "00.00.00.01"
 !define COPYRIGHT "Raspberry Pi"
 !define DESCRIPTION "Raspberry Pi Imager"
-!define MAIN_APP_EXE "imagingutility.exe"
+!define MAIN_APP_EXE "rpi-imager.exe"
 !define INSTALL_TYPE "SetShellVarContext current"
 !define REG_ROOT "HKCU"
 !define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_EXE}"
@@ -136,7 +136,7 @@ File "deploy\Qt5QuickControls2.dll"
 File "deploy\Qt5QuickTemplates2.dll"
 File "deploy\Qt5Svg.dll"
 File "deploy\Qt5Widgets.dll"
-File "deploy\imagingutility.exe"
+File "deploy\rpi-imager.exe"
 SetOutPath "$INSTDIR\styles"
 File "deploy\styles\qwindowsvistastyle.dll"
 SetOutPath "$INSTDIR\QtQuick.2"
@@ -559,7 +559,7 @@ WriteRegStr SHCTX "Software\Classes\.gz\OpenWithProgIds" "RPI_IMAGINGUTILITY" ""
 WriteRegStr SHCTX "Software\Classes\.xz\OpenWithProgIds" "RPI_IMAGINGUTILITY" ""
 WriteRegStr SHCTX "Software\Classes\.img\OpenWithProgIds" "RPI_IMAGINGUTILITY" ""
 WriteRegStr SHCTX "Software\Classes\RPI_IMAGINGUTILITY\shell\open" "FriendlyAppName" "Raspberry Pi Imager"
-WriteRegStr SHCTX "Software\Classes\RPI_IMAGINGUTILITY\shell\open\command" "" '"$INSTDIR\imagingutility.exe" "%1"'
+WriteRegStr SHCTX "Software\Classes\RPI_IMAGINGUTILITY\shell\open\command" "" '"$INSTDIR\rpi-imager.exe" "%1"'
 
 SectionEnd
 
@@ -589,7 +589,9 @@ Delete "$INSTDIR\Qt5QuickControls2.dll"
 Delete "$INSTDIR\Qt5QuickTemplates2.dll"
 Delete "$INSTDIR\Qt5Svg.dll"
 Delete "$INSTDIR\Qt5Widgets.dll"
+# Old name
 Delete "$INSTDIR\imagingutility.exe"
+Delete "$INSTDIR\rpi-imager.exe"
 Delete "$INSTDIR\styles\qwindowsvistastyle.dll"
 Delete "$INSTDIR\QtQuick.2\plugins.qmltypes"
 Delete "$INSTDIR\QtQuick.2\qmldir"

windows/rpi-imager.rc

@@ -1,7 +1,7 @@
 #include <windows.h>
 
-IDI_ICON1 ICON DISCARDABLE "../icons/imagingutility.ico"
+IDI_ICON1 ICON DISCARDABLE "../icons/rpi-imager.ico"
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "imagingutility.manifest"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "rpi-imager.manifest"
 
 1 VERSIONINFO
 FILEVERSION 1,0,0,0