[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeutils/kfloppy
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2004-08-20 10:14:50
Message-ID: 20040820101450.EA0E324FF () office ! kde ! org
[Download RAW message or body]

CVS commit by goutte: 

Cleanly select the filesystem (by name)
(Now someone with BSD could implement formatting as ext2 under BSD.)


  M +22 -12    floppy.cpp   1.69


--- kdeutils/kfloppy/floppy.cpp  #1.68:1.69
@@ -97,4 +97,5 @@ FloppyData::FloppyData(QWidget * parent,
         g1->addWidget( filesystemComboBox, 2, 1, AlignLeft );
 
+        // If you modify the user visible string, change them also (far) below
         filesystemComboBox->insertItem(i18n("DOS"));
 #ifdef ANY_LINUX
@@ -397,5 +398,5 @@ void FloppyData::format(){
         }
 
-        if (filesystemComboBox->currentItem() == 0)
+        if ( filesystemComboBox->currentText() == i18n("DOS") )
         {
                 FATFilesystem *f = new FATFilesystem(this);
@@ -410,19 +411,28 @@ void FloppyData::format(){
                 formatActions->queue(f);
         }
-        else if (filesystemComboBox->currentItem() == 1)
-        {
-                FloppyAction *f = 0L;
 #ifdef ANY_LINUX
-                Ext2Filesystem *e2f = new Ext2Filesystem(this);
-                e2f->configure(verifylabel->isChecked(),
+        else if ( filesystemComboBox->currentText() == i18n("ext2") )
+        {
+                Ext2Filesystem *f = new Ext2Filesystem(this);
+                f->configure(verifylabel->isChecked(),
                         labellabel->isChecked(),
                         lineedit->text());
-                f=e2f;
-#else
-#ifdef ANY_BSD
-                f = new UFSFilesystem(this);
-#endif
+                if (f)
+                {
+                        connect(f,SIGNAL(status(const QString &,int)),
+                                this,SLOT(formatStatus(const QString &,int)));
+                        connect(f,SIGNAL(done(KFAction *,bool)),
+                                this,SLOT(reset()));
+                        f->configureDevice(drive,blocks);
+                        formatActions->queue(f);
+                }
+        }
 #endif
 
+#ifdef ANY_BSD
+        else if ( filesystemComboBox->currentText() == i18n("UFS") )
+        {
+                FloppyAction *f = new UFSFilesystem(this);
+
                 if (f)
                 {
@@ -435,5 +445,5 @@ void FloppyData::format(){
                 }
         }
-
+#endif
 
 


[prev in list] [next in list] [prev in thread] [next in thread]