Remove overscan/piwiz supression options

- Remove overscan and piwiz supression option - Change wifi -> wireless LAN - Bump version
raspberrypi · Mar 24, 2022 · 8d943ce · 8d943ce
1 parent 93811df
commit 8d943ce
Show file tree

Hide file tree

Showing 15 changed files with 1,557 additions and 1,642 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,13 @@
+rpi-imager (1.7.2) unstable; urgency=medium
+
+  * Remove overscan/piwiz supression advanced options
+  * gz/xz/zstd custom images: pad if image size is not dividable by 512 byte
+  * Store saved wifi password hashed
+  * Make buttons blue on keyboard navigation
+  * Add Japan, Korean translations
+
+ -- Floris Bos <bos@je-eigen-domein.nl>  Thu, 24 Mar 2022 17:58:52 +0100
+
 rpi-imager (1.7.1) unstable; urgency=medium
 
   * Fix advanced settings being broken if there are saved wifi

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -12,8 +12,8 @@ OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON)
 project(rpi-imager LANGUAGES CXX C)
 set(IMAGER_VERSION_MAJOR 1)
 set(IMAGER_VERSION_MINOR 7)
-set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.1")
-set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},1,0")
+set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.2")
+set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},2,0")
 add_definitions(-DIMAGER_VERSION_STR="${IMAGER_VERSION_STR}")
 add_definitions(-DIMAGER_VERSION_CSV=${IMAGER_VERSION_CSV})
 

diff --git a/src/OptionsPopup.qml b/src/OptionsPopup.qml
@@ -113,10 +113,6 @@ Popup {
                 ColumnLayout {
                     spacing: -10
 
-                    ImCheckBox {
-                        id: chkOverscan
-                        text: qsTr("Disable overscan")
-                    }
                     RowLayout {
                         ImCheckBox {
                             id: chkHostname
@@ -262,7 +258,7 @@ Popup {
 
                     ImCheckBox {
                         id: chkWifi
-                        text: qsTr("Configure wifi")
+                        text: qsTr("Configure wireless LAN")
                         onCheckedChanged: {
                             if (checked) {
                                 if (!fieldWifiSSID.length) {
@@ -322,7 +318,7 @@ Popup {
                         }
 
                         Text {
-                            text: qsTr("Wifi country:")
+                            text: qsTr("Wireless LAN country:")
                             color: parent.enabled ? "black" : "grey"
                         }
                         ComboBox {
@@ -361,10 +357,6 @@ Popup {
                             editable: true
                             Layout.minimumWidth: 200
                         }
-                        ImCheckBox {
-                            id: chkSkipFirstUse
-                            text: qsTr("Skip first-run wizard")
-                        }
                     }
                 }
             }
@@ -458,9 +450,6 @@ Popup {
             comboSaveSettings.currentIndex = 1
             hasSavedSettings = true
         }
-        if ('disableOverscan' in settings) {
-            chkOverscan.checked = true
-        }
         if ('hostname' in settings) {
             fieldHostname.text = settings.hostname
             chkHostname.checked = true
@@ -548,9 +537,6 @@ Popup {
                 }
             }
         }
-        if ('skipFirstUse' in settings) {
-            chkSkipFirstUse.checked = true
-        }
 
         if (imageWriter.isEmbeddedMode()) {
             /* For some reason there is no password mask character set by default on Embedded edition */
@@ -607,9 +593,6 @@ Popup {
         cloudinitwrite = ""
         cloudinitnetwork = ""
 
-        if (chkOverscan.checked) {
-            addConfig("disable_overscan=1")
-        }
         if (chkHostname.checked && fieldHostname.length) {
             addFirstRun("CURRENT_HOSTNAME=`cat /etc/hostname | tr -d \" \\t\\n\\r\"`")
             addFirstRun("echo "+fieldHostname.text+" >/etc/hostname")
@@ -743,11 +726,6 @@ Popup {
             addCloudInitRun("sed -i 's/^\s*REGDOMAIN=\S*/REGDOMAIN="+fieldWifiCountry.editText+"/' /etc/default/crda || true")
         }
         if (chkLocale.checked) {
-            if (chkSkipFirstUse.checked) {
-                addFirstRun("rm -f /etc/xdg/autostart/piwiz.desktop")
-                addCloudInitRun("rm -f /etc/xdg/autostart/piwiz.desktop")
-            }
-
             var kbdconfig = "XKBMODEL=\"pc105\"\n"
             kbdconfig += "XKBLAYOUT=\""+fieldKeyboardLayout.editText+"\"\n"
             kbdconfig += "XKBVARIANT=\"\"\n"
@@ -793,9 +771,6 @@ Popup {
         if (comboSaveSettings.currentIndex == 1) {
             hasSavedSettings = true
             var settings = { };
-            if (chkOverscan.checked) {
-                settings.disableOverscan = true
-            }
             if (chkHostname.checked && fieldHostname.length) {
                 settings.hostname = fieldHostname.text
             }
@@ -819,9 +794,6 @@ Popup {
             if (chkLocale.checked) {
                 settings.timezone = fieldTimezone.editText
                 settings.keyboardLayout = fieldKeyboardLayout.editText
-                if (chkSkipFirstUse.checked) {
-                    settings.skipFirstUse = true
-                }
             }
 
             imageWriter.setSavedCustomizationSettings(settings)