p3.2.2 hotFix to backup OS names with spaces

md typos
3.2.1a update cec_keys
zh_tw updated
Update it.ts
small update to it.ts
Simplify iconsize & force to 40x40
Stop processing partially downloaded metafiles

Author: procount

README_PINN.md

@@ -7,7 +7,7 @@ The latest version of [PINN](http://downloads.sourceforge.net/projects/pinn/pinn
 
 ### - [If you have PINN v2.4.3 - v2.4.4b installed, please manually update to v2.4.4c](https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=142574&start=200#p1239359)
 
-This README relates to v3.1.1
+This README relates to v3.2.2
 
 <sup>(PINN-lite does not include any operating systems at all. It is more akin to `NOOBS-lite` rather than `NOOBS`. For that reason, the filename that you download is called `pinn-lite.zip`. More recently, `pinn.zip` has also been made available for download which includes versions of Raspbian and LibreELEC.)</sup>
 

README_SUM.md

@@ -45,14 +45,21 @@ Please note that in some cases it may extract the files into a folder, if this i
 
 ## Change History
 
+### V3.2.2
+
+- **Backup hotfix** - Fix for OSnames with spaces.
+- **Translations**    - Updated IT & zh_TW
+- **Iconsizes** - fixed to 40x40
+- **Download** - ignore partials
+
 ### V3.2.1
 
 - **Bootselectiondialog** - update for CEC and keyboard
 
 ### V3.2
 
 - **Added Ts & C's dialog** - for Future OSes
-- **Resumable download**    - in case of downloade errors
+- **Resumable download**    - in case of download errors
 - **More robust file transfer** - in case of download errors
 - **Change boot selection order** - Just for aesthetics
 - **Added file checksums** - for download verification

changes.md

@@ -495,7 +495,7 @@ Fixes the incorrect recovery.cmdline bug in v2.5.2.
 ### V3.2
 
 - **Added Ts & C's dialog** - for Future OSes
-- **Resumable download**    - in case of downloade errors
+- **Resumable download**    - in case of download errors
 - **More robust file transfer** - in case of download errors
 - **Change boot selection order** - Just for aesthetics
 - **Added file checksums** - for download verification
@@ -505,3 +505,10 @@ Fixes the incorrect recovery.cmdline bug in v2.5.2.
 ### V3.2.1
 
 - **Bootselectiondialog** - update for CEC and keyboard
+
+### V3.2.2
+
+- **Backup hotfix** - Fix for OSnames with spaces.
+- **Translations**    - Updated IT & zh_TW
+- **Iconsizes** - fixed to 40x40
+- **Download** - ignore partials

history.md

@@ -5,14 +5,21 @@ PINN is a version of the NOOBS Operating System Installer for the Raspberry Pi w
 
 ## Change History
 
+### V3.2.2
+
+- **Backup hotfix** - Fix for OSnames with spaces.
+- **Translations**    - Updated IT & zh_TW
+- **Iconsizes** - fixed to 40x40
+- **Download** - ignore partials
+
 ### V3.2.1
 
 - **Bootselectiondialog** - update for CEC and keyboard
 
 ### V3.2
 
 - **Added Ts & C's dialog** - for Future OSes
-- **Resumable download**    - in case of downloade errors
+- **Resumable download**    - in case of download errors
 - **More robust file transfer** - in case of download errors
 - **Change boot selection order** - Just for aesthetics
 - **Added file checksums** - for download verification

recovery/cec_keys.json

@@ -39,8 +39,6 @@
         "any": {
             "Key_U":        "CEC_User_Control_Number1",
             "Key_D":        "CEC_User_Control_Number2",
-            "Key_Escape":   "CEC_User_Control_Number3",
-            "Key_Enter":    "CEC_User_Control_Number4",
             "Key_Enter":    "CEC_User_Control_Play",
             "Key_Escape":   "CEC_User_Control_Exit",
             "Key_Up":       "CEC_User_Control_ChannelUp",
@@ -54,7 +52,9 @@
             "mouse_right":  "CEC_User_Control_Right",
             "mouse_up":     "CEC_User_Control_Up",
             "mouse_down":   "CEC_User_Control_Down",
-            "mouse_lclick": "CEC_User_Control_Select"
+            "mouse_lclick": "CEC_User_Control_Select",
+            "Key_Left":     "CEC_User_Control_Rewind",
+            "Key_Right":    "CEC_User_Control_FastForward"
         }
     }
 }

recovery/config.h

@@ -2,7 +2,7 @@
 #define CONFIG_H
 
 /* Version number displayed in the title bar */
-#define VERSION_NUMBER "3.2.1"
+#define VERSION_NUMBER "3.2.2"
 
 /* Color of the background */
 // #define BACKGROUND_COLOR  Qt::white

recovery/mainwindow.cpp

@@ -30,10 +30,10 @@
 #include "iconcache.h"
 #include "termsdialog.h"
 
-#define DBG_LOCAL 1
+#define DBG_LOCAL 0
 #define LOCAL_DO_DBG 1
 #define LOCAL_DBG_FUNC 1
-#define LOCAL_DBG_OUT 0
+#define LOCAL_DBG_OUT 1
 #define LOCAL_DBG_MSG 0
 #include "mydebug.h"
 
@@ -231,7 +231,10 @@ MainWindow::MainWindow(const QString &drive, const QString &defaultDisplay, KSpl
 
     ug = new OsGroup(this, ui, !cmdline.contains("no_group"));
 
-    ug->list->setIconSize(QSize(40,40)); //ALL?? set each list?
+    _currentsize = QSize(40,40);
+    ug->list->setIconSize(_currentsize); //ALL?? set each list?
+    ug->listInstalled->setIconSize(_currentsize); //ALL?? set each list?
+
     connect(ug->list, SIGNAL(currentRowChanged(int)), this, SLOT(on_list_currentRowChanged(void)));
     connect(ug->list, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(on_list_doubleClicked(const QModelIndex&)));
     connect(ug->list, SIGNAL(itemChanged(QListWidgetItem *)), this, SLOT(on_list_itemChanged(QListWidgetItem *)));
@@ -722,7 +725,7 @@ void MainWindow::repopulate()
 {
     TRACE
     QMap<QString,QVariantMap> images;
-    _currentsize = ug->list->iconSize();
+
     QIcon localIcon(":/icons/hdd.png");
 
     if ( _sdimages )
@@ -2451,7 +2454,6 @@ void MainWindow::assignPixmap(QString originalurl, QPixmap &pix)
     for (int i=0; i<ug->count(); i++)
     {
         QVariantMap m = all.value(i)->data(Qt::UserRole).toMap();
-        ug->list->setIconSize(QSize(40,40)); //ALL??
         if (m.value("icon") == originalurl)
         {
             all.value(i)->setIcon(icon);
@@ -3154,19 +3156,24 @@ void MainWindow::startImageDownload()
             }
 
             /* Insert tarball download URL information into partition_info.json to allow download */
-            QVariantMap json = Json::loadFromFile(folder+"/partitions.json").toMap();
-            QVariantList partitions = json["partitions"].toList();
-            int i=0;
-            QStringList tarballs = entry.value("tarballs").toStringList();
-            foreach (QString tarball, tarballs)
+            if (QFile::exists(folder+"/partitions.json"))
             {
-                QVariantMap partition = partitions[i].toMap();
-                partition.insert("download", tarball);
-                partitions[i] = partition;
-                i++;
+                QVariantMap json = Json::loadFromFile(folder+"/partitions.json").toMap();
+                QVariantList partitions = json["partitions"].toList();
+                int i=0;
+                QStringList tarballs = entry.value("tarballs").toStringList();
+                foreach (QString tarball, tarballs)
+                {
+                    QVariantMap partition = partitions[i].toMap();
+                    partition.insert("download", tarball);
+                    partitions[i] = partition;
+                    i++;
+                }
+                json["partitions"] = partitions;
+                Json::saveToFile(folder+"/partitions.json", json);
             }
-            json["partitions"] = partitions;
-            Json::saveToFile(folder+"/partitions.json", json);
+            else
+                continue;
 
             slidesFolder.clear();
             if (QFile::exists(folder+"/slides_vga"))
@@ -3175,13 +3182,18 @@ void MainWindow::startImageDownload()
             }
 
             /* Insert download_size into os.json to allow correct use of download size */
-            json = Json::loadFromFile(folder+"/os.json").toMap();
-            if (! json.contains("download_size"))
+            if (QFile::exists(folder+"/os.json"))
             {
-                quint64 downloadSize= entry.value("download_size").toULongLong();
-                json.insert("download_size",downloadSize);
-                Json::saveToFile(folder+"/os.json", json);
+                QVariantMap json = Json::loadFromFile(folder+"/os.json").toMap();
+                if (! json.contains("download_size"))
+                {
+                    quint64 downloadSize= entry.value("download_size").toULongLong();
+                    json.insert("download_size",downloadSize);
+                    Json::saveToFile(folder+"/os.json", json);
+                }
             }
+            else
+                continue;
 
             QString sTerms(folder+"/terms");
             bool allowContinue=true;
@@ -3856,18 +3868,6 @@ void MainWindow::addImage(QVariantMap& m, QIcon &icon, bool &bInstalled)
                 /* Icon file corrupt */
                 iconos = QIcon();
             }
-            else
-            {
-                QSize iconsize = avs.first();
-
-                if (iconsize.width() > _currentsize.width() || iconsize.height() > _currentsize.height())
-                {
-                    /* Make all icons as large as the largest icon we have */
-                    _currentsize = QSize(qMax(iconsize.width(), _currentsize.width()),qMax(iconsize.height(), _currentsize.height()));
-                    ug->list->setIconSize(_currentsize);
-                    ug->listInstalled->setIconSize(_currentsize);
-                }
-            }
             witem->setIcon(iconos);
         }
         if (bInstalled)
@@ -4741,7 +4741,7 @@ void MainWindow::on_actionBackup_triggered()
                         iconfilename = entry.value("icon").toString();
                     else
                         iconfilename = settingsFolder+"/icon.png";
-                    cmd = "cp "+ iconfilename+" "+backupFolder+"/"+CORE(backupName)+".png";
+                    cmd = "cp "+ iconfilename+" "+backupFolder+"/"+CORE(backupName).replace(' ', '_')+".png";
                     errors += QProcess::execute(cmd);
 
                     //- [Copy release_notes.txt?]