File kfloppy.dif of Package kdeutils3
diff -u -r ../kdeutils-2.91.2002012412.orig/kfloppy/floppy.cpp ./kfloppy/floppy.cpp
--- ../kdeutils-2.91.2002012412.orig/kfloppy/floppy.cpp Thu Jan 31 10:13:48 2002
+++ ./kfloppy/floppy.cpp Thu Jan 31 10:55:27 2002
@@ -87,8 +87,9 @@
filesystemComboBox = new QComboBox( FALSE, this, "ComboBox_2" );
g1->addWidget( filesystemComboBox, 2, 1, AlignLeft );
- filesystemComboBox->insertItem("DOS");
- filesystemComboBox->insertItem("ext2");
+ filesystemComboBox->insertItem(i18n("Dos"));
+ filesystemComboBox->insertItem(i18n("FreeDOS BootDisk"));
+ filesystemComboBox->insertItem(i18n("ext2"));
v1->addSpacing( 10 );
@@ -293,6 +294,7 @@
fdformat = KGlobal::dirs()->findExe("fdformat", path);
mke2fs = KGlobal::dirs()->findExe("mke2fs", path);
mkdosfs = KGlobal::dirs()->findExe("mkdosfs", path);
+ dosbootdisk = KGlobal::dirs()->findExe("dosbootdisk", path);
QString str = "";
if (fdformat.isEmpty()) {
str = i18n("Cannot find fdformat.");
@@ -306,6 +308,10 @@
str = i18n("Cannot find mkdosfs");
}
+ if (dosbootdisk.isEmpty()) {
+ str = i18n("Cannot find dosbootdisk");
+ }
+
if (str != "") {
formatbutton->setEnabled(FALSE);
KMessageBox::error(this, str);
@@ -629,6 +635,15 @@
pos++;
}
+ if (fserrstring.isEmpty() && strncmp(mybuffer, "dosbootdisk", 11) == 0)
+ {
+ pos = QString(mybuffer).find('\n');
+ //printf("pos=%d, len=%d\n", pos, amount);
+ if (pos+1 == amount)
+ return;
+ pos++;
+ }
+
printf("ERR: <%s>\n", mybuffer);
printf("pos=%d, len=%d\n", pos, amount);
@@ -744,14 +759,22 @@
}
else{
- *proc << mke2fs;
- *proc << "-q";
- if(labellabel->isChecked())
- *proc << "-L" <<lineedit->text();
- if (verifylabel->isChecked()) {
- *proc << "-c";
+ if (filesystemComboBox->currentText() == i18n("FreeDOS BootDisk")){
+
+ *proc << dosbootdisk;
+ *proc << device;
+ }
+ else{
+
+ *proc << mke2fs;
+ *proc << "-q";
+ if(labellabel->isChecked())
+ *proc << "-L" <<lineedit->text();
+ if (verifylabel->isChecked()) {
+ *proc << "-c";
+ }
+ *proc << device;
}
- *proc << device;
}
diff -u -r ../kdeutils-2.91.2002012412.orig/kfloppy/floppy.h ./kfloppy/floppy.h
--- ../kdeutils-2.91.2002012412.orig/kfloppy/floppy.h Thu Jan 31 10:13:48 2002
+++ ./kfloppy/floppy.h Thu Jan 31 10:14:14 2002
@@ -92,7 +92,7 @@
private:
- QString fdformat, mke2fs, mkdosfs;
+ QString fdformat, mke2fs, mkdosfs, dosbootdisk;
int verifyconfig;
int labelconfig;