added specialized version for EeePCLinuxOS

.bzrignore

@@ -15,6 +15,7 @@ src/unetbootin/upx
 src/unetbootin/sevenzip.exe
 src/unetbootin/qrc_unetbootin.cpp
 src/unetbootin/qrc_unetbootin-linux.cpp
+src/unetbootin/qrc_unetbootin-eeepclos.cpp
 src/unetbootin/sevnz.dll
 src/unetbootin/sevnz.exe
 src/unetbootin/asgd.img

src/unetbootin/build-asgd

@@ -10,6 +10,11 @@ make
 $mingwb-strip --strip-all release/unetbootin.exe
 mv release/unetbootin.exe release/unetbootin-autosupergrubdisk-$rvern.exe
 ./upx --lzma release/unetbootin-autosupergrubdisk-$rvern.exe
+#./qmake-linux "DEFINES += AUTOSUPERGRUBDISK" "RESOURCES += unetbootin-autosupergrubdisk.qrc unetbootin-linux.qrc"
+#make
+#$mingwb-strip --strip-all unetbootin
+#mv unetbootin release/unetbootin-autosupergrubdisk-$rvern
+#./upx --lzma release/unetbootin-autosupergrubdisk-$rvern
 qmake -spec linux-g++-32 "RESOURCES += unetbootin-linux.qrc"
 printf "UNetbootin Source Revision $rvern\r\nCopyright Geza Kovacs\r\nHomepage at http://unetbootin.sourceforge.net\r\nLicensed under the GNU GPL v2 and above, components from other projects are licensed under their respective licenses\r\nBuild generated on $(date)\r\nDownload using bzr: bzr checkout http://bazaar.launchpad.net/~gezakovacs/unetbootin/devel-new -r$rvern\r\n" > README.TXT
 zip release/unetbootin-source-$rvern.zip README.TXT $(bzr ls --versioned)

src/unetbootin/build-eeepclos

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+mingwb="i586-mingw32msvc"
+rvern="$(bzr version-info | grep revno | sed 's/revno: //')"
+rm release/*
+lupdate unetbootin.pro
+lrelease unetbootin.pro
+./qmake-windows "DEFINES += EEEPCLOS" "RESOURCES += unetbootin-eeepclos.qrc"
+make
+$mingwb-strip --strip-all release/unetbootin.exe
+mv release/unetbootin.exe release/unetbootin-eeepclos-$rvern.exe
+./upx --lzma release/unetbootin-eeepclos-$rvern.exe
+./qmake-linux "DEFINES += EEEPCLOS" "RESOURCES += unetbootin-eeepclos.qrc unetbootin-linux.qrc"
+make
+$mingwb-strip --strip-all unetbootin
+mv unetbootin release/unetbootin-eeepclos-$rvern
+./upx --lzma release/unetbootin-eeepclos-$rvern
+qmake -spec linux-g++-32 "RESOURCES += unetbootin-linux.qrc"
+printf "UNetbootin Source Revision $rvern\r\nCopyright Geza Kovacs\r\nHomepage at http://unetbootin.sourceforge.net\r\nLicensed under the GNU GPL v2 and above, components from other projects are licensed under their respective licenses\r\nBuild generated on $(date)\r\nDownload using bzr: bzr checkout http://bazaar.launchpad.net/~gezakovacs/unetbootin/devel-new -r$rvern\r\n" > README.TXT
+zip release/unetbootin-source-$rvern.zip README.TXT $(bzr ls --versioned)
+

src/unetbootin/distrolst.cpp

@@ -21,6 +21,16 @@ if (nameDistro == "Auto Super Grub Disk")
 
 #endif
 
+#ifdef EEEPCLOS
+
+if (nameDistro == "EeePCLinuxOS")
+{
+	downloadfile(QString("http://lubi.sourceforge.net/eeepclos-%1.iso").arg(relname), isotmpf);
+	extractiso(isotmpf, targetPath);
+}
+
+#endif
+
 #ifdef STDUNETBOOTIN
 
 if (nameDistro == "Arch Linux")

src/unetbootin/ui_unetbootin.h

@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading ui file 'unetbootin.ui'
 **
-** Created: Sun Jun 22 20:47:46 2008
+** Created: Sun Jun 29 15:52:27 2008
 **      by: Qt User Interface Compiler version 4.4.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -43,9 +43,11 @@ class Ui_unetbootinui
     QComboBox *dverselect;
     QTextBrowser *intromessage;
     QWidget *optionslayer;
+    QWidget *diskimagelayer;
     QPushButton *FloppyFileSelector;
     QComboBox *diskimagetypeselect;
     QLineEdit *FloppyPath;
+    QWidget *customlayer;
     QLineEdit *KernelPath;
     QPushButton *KernelFileSelector;
     QLabel *labelkernel;
@@ -93,7 +95,7 @@ class Ui_unetbootinui
     radioDistro->setChecked(true);
     radioFloppy = new QRadioButton(firstlayer);
     radioFloppy->setObjectName(QString::fromUtf8("radioFloppy"));
-    radioFloppy->setGeometry(QRect(10, 180, 81, 25));
+    radioFloppy->setGeometry(QRect(10, 180, 87, 25));
     radioManual = new QRadioButton(firstlayer);
     radioManual->setObjectName(QString::fromUtf8("radioManual"));
     radioManual->setGeometry(QRect(10, 220, 81, 25));
@@ -132,46 +134,52 @@ class Ui_unetbootinui
     optionslayer->setObjectName(QString::fromUtf8("optionslayer"));
     optionslayer->setEnabled(false);
     optionslayer->setGeometry(QRect(100, 170, 521, 121));
-    FloppyFileSelector = new QPushButton(optionslayer);
+    diskimagelayer = new QWidget(optionslayer);
+    diskimagelayer->setObjectName(QString::fromUtf8("diskimagelayer"));
+    diskimagelayer->setGeometry(QRect(0, 0, 521, 40));
+    FloppyFileSelector = new QPushButton(diskimagelayer);
     FloppyFileSelector->setObjectName(QString::fromUtf8("FloppyFileSelector"));
     FloppyFileSelector->setGeometry(QRect(388, 10, 25, 25));
     FloppyFileSelector->setAcceptDrops(false);
-    diskimagetypeselect = new QComboBox(optionslayer);
+    diskimagetypeselect = new QComboBox(diskimagelayer);
     diskimagetypeselect->setObjectName(QString::fromUtf8("diskimagetypeselect"));
     diskimagetypeselect->setGeometry(QRect(0, 10, 51, 25));
-    FloppyPath = new QLineEdit(optionslayer);
+    FloppyPath = new QLineEdit(diskimagelayer);
     FloppyPath->setObjectName(QString::fromUtf8("FloppyPath"));
     FloppyPath->setGeometry(QRect(60, 10, 321, 25));
-    KernelPath = new QLineEdit(optionslayer);
+    customlayer = new QWidget(optionslayer);
+    customlayer->setObjectName(QString::fromUtf8("customlayer"));
+    customlayer->setGeometry(QRect(0, 40, 521, 81));
+    KernelPath = new QLineEdit(customlayer);
     KernelPath->setObjectName(QString::fromUtf8("KernelPath"));
-    KernelPath->setGeometry(QRect(60, 50, 111, 25));
-    KernelFileSelector = new QPushButton(optionslayer);
+    KernelPath->setGeometry(QRect(60, 10, 111, 25));
+    KernelFileSelector = new QPushButton(customlayer);
     KernelFileSelector->setObjectName(QString::fromUtf8("KernelFileSelector"));
-    KernelFileSelector->setGeometry(QRect(180, 50, 25, 25));
+    KernelFileSelector->setGeometry(QRect(180, 10, 25, 25));
     KernelFileSelector->setAcceptDrops(false);
-    labelkernel = new QLabel(optionslayer);
+    labelkernel = new QLabel(customlayer);
     labelkernel->setObjectName(QString::fromUtf8("labelkernel"));
-    labelkernel->setGeometry(QRect(0, 50, 51, 25));
-    labelinitrd = new QLabel(optionslayer);
+    labelkernel->setGeometry(QRect(0, 10, 51, 25));
+    labelinitrd = new QLabel(customlayer);
     labelinitrd->setObjectName(QString::fromUtf8("labelinitrd"));
-    labelinitrd->setGeometry(QRect(230, 50, 41, 25));
-    InitrdFileSelector = new QPushButton(optionslayer);
+    labelinitrd->setGeometry(QRect(230, 10, 41, 25));
+    InitrdFileSelector = new QPushButton(customlayer);
     InitrdFileSelector->setObjectName(QString::fromUtf8("InitrdFileSelector"));
-    InitrdFileSelector->setGeometry(QRect(388, 50, 25, 25));
+    InitrdFileSelector->setGeometry(QRect(388, 10, 25, 25));
     InitrdFileSelector->setAcceptDrops(false);
-    InitrdPath = new QLineEdit(optionslayer);
+    InitrdPath = new QLineEdit(customlayer);
     InitrdPath->setObjectName(QString::fromUtf8("InitrdPath"));
-    InitrdPath->setGeometry(QRect(270, 50, 111, 25));
-    CfgFileSelector = new QPushButton(optionslayer);
+    InitrdPath->setGeometry(QRect(270, 10, 111, 25));
+    CfgFileSelector = new QPushButton(customlayer);
     CfgFileSelector->setObjectName(QString::fromUtf8("CfgFileSelector"));
-    CfgFileSelector->setGeometry(QRect(388, 90, 25, 25));
+    CfgFileSelector->setGeometry(QRect(388, 50, 25, 25));
     CfgFileSelector->setAcceptDrops(false);
-    OptionEnter = new QLineEdit(optionslayer);
+    OptionEnter = new QLineEdit(customlayer);
     OptionEnter->setObjectName(QString::fromUtf8("OptionEnter"));
-    OptionEnter->setGeometry(QRect(60, 90, 321, 25));
-    labeloption = new QLabel(optionslayer);
+    OptionEnter->setGeometry(QRect(60, 50, 321, 25));
+    labeloption = new QLabel(customlayer);
     labeloption->setObjectName(QString::fromUtf8("labeloption"));
-    labeloption->setGeometry(QRect(0, 90, 61, 25));
+    labeloption->setGeometry(QRect(0, 50, 61, 25));
     showalldrivescheckbox = new QCheckBox(firstlayer);
     showalldrivescheckbox->setObjectName(QString::fromUtf8("showalldrivescheckbox"));
     showalldrivescheckbox->setGeometry(QRect(10, 295, 251, 25));

src/unetbootin/unetbootin-eeepclos.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>eeepclos.png</file>
+    </qresource>
+</RCC>

src/unetbootin/unetbootin.cpp

@@ -107,6 +107,25 @@ void unetbootin::ubninitialize()
 	asgdDescS.readAll() << 
 	"1.0"));
 	#endif
+	#ifdef EEEPCLOS
+	optionslayer->setEnabled(true);
+	optionslayer->show();
+	customlayer->setEnabled(false);
+	customlayer->hide();
+	radioManual->setEnabled(false);
+	radioManual->hide();
+	diskimagelayer->move(diskimagelayer->x(), diskimagelayer->y() + 80);
+	radioFloppy->move(radioFloppy->x(), radioFloppy->y() + 80);
+	intromessage->resize(intromessage->width(), intromessage->height() + 80);
+	distroselect->addItem("EeePCLinuxOS", (QStringList() << "pre2008_Live" << 
+	tr("<img src=\":/eeepclos.png\" /><br/>"
+		"<b>Homepage:</b> <a href=\"http://www.eeepclinuxos.com/\">http://www.eeepclinuxos.com</a><br/>"
+		"<b>Description:</b> EeePCLinuxOS is a user-friendly PCLinuxOS based distribution for the EeePC.<br/>"
+		"<b>Install Notes:</b> Make sure install media is empty and formatted before proceeding with install.") << 
+	"pre2008_Live"));
+	if (diskimagetypeselect->findText("Floppy") != -1)
+		diskimagetypeselect->removeItem(diskimagetypeselect->findText("Floppy"));
+	#endif
 	#ifdef STDUNETBOOTIN
 	optionslayer->setEnabled(true);
 	optionslayer->show();
@@ -260,11 +279,17 @@ void unetbootin::ubninitialize()
 	ubntmpf = QDir::toNativeSeparators(QString("%1/").arg(QDir::tempPath()));
 	#endif
 	#ifdef AUTOSUPERGRUBDISK
-	typeselect->setCurrentIndex(typeselect->findText("Hard Disk"));
+	if (typeselect->findText("Hard Disk") != -1)
+		typeselect->setCurrentIndex(typeselect->findText("Hard Disk"));
 	driveselect->addItem(QDir::toNativeSeparators(QDir::rootPath()).toUpper());
 	#endif
+	#ifdef EEEPCLOS
+	if (typeselect->findText("USB Drive") != -1)
+		typeselect->setCurrentIndex(typeselect->findText("USB Drive"));
+	#endif
 	#ifdef STDUNETBOOTIN
-	typeselect->setCurrentIndex(typeselect->findText("USB Drive"));
+	if (typeselect->findText("USB Drive") != -1)
+		typeselect->setCurrentIndex(typeselect->findText("USB Drive"));
 	#endif
 }
 
@@ -276,7 +301,8 @@ void unetbootin::on_distroselect_currentIndexChanged(int distroselectIndex)
 	{
 		dverselect->addItem(dverL.at(i));
 	}
-	dverselect->setCurrentIndex(dverselect->findText(dverL.at(0)));
+	if (dverselect->findText(dverL.at(0)) != -1)
+		dverselect->setCurrentIndex(dverselect->findText(dverL.at(0)));
 	intromessage->setText(dverL.at(1));
 	radioDistro->setChecked(true);
 }
@@ -397,11 +423,13 @@ void unetbootin::on_FloppyFileSelector_clicked()
 	QString nameFloppy = QDir::toNativeSeparators(QFileDialog::getOpenFileName(this, tr("Open Disk Image File"), QDir::homePath()));
 	if (QFileInfo(nameFloppy).completeSuffix().contains("iso", Qt::CaseInsensitive))
 	{
-		diskimagetypeselect->setCurrentIndex(diskimagetypeselect->findText("ISO"));
+		if (diskimagetypeselect->findText("ISO") != -1)
+			diskimagetypeselect->setCurrentIndex(diskimagetypeselect->findText("ISO"));
 	}
 	if (QFileInfo(nameFloppy).completeSuffix().contains("img", Qt::CaseInsensitive) || QFileInfo(nameFloppy).completeSuffix().contains("flp", Qt::CaseInsensitive))
 	{
-		diskimagetypeselect->setCurrentIndex(diskimagetypeselect->findText("Floppy"));
+		if (diskimagetypeselect->findText("Floppy") != -1)
+			diskimagetypeselect->setCurrentIndex(diskimagetypeselect->findText("Floppy"));
 	}
 	FloppyPath->clear();
 	FloppyPath->insert(nameFloppy);

src/unetbootin/unetbootin.h

@@ -27,6 +27,10 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 #define UNETBOOTINB "Auto Super Grub Disk"
 #endif
 
+#ifdef EEEPCLOS
+#define UNETBOOTINB "UNetbootin-EeePCLinuxOS"
+#endif
+
 #ifndef UNETBOOTINB
 #define STDUNETBOOTIN
 #define UNETBOOTINB "UNetbootin"