1 files changed, 23 insertions, 25 deletions

diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index bd0bb01..2b8ce7f 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -68,85 +68,88 @@ FormatterApp::FormatterApp( QWidget* parent,  const char* name, bool modal, WFla
     FormatterAppLayout->setMargin( 2 );
 
     TabWidget = new QTabWidget( this, "TabWidget" );
 
     tab = new QWidget( TabWidget, "tab" );
     tabLayout = new QGridLayout( tab ); 
-    tabLayout->setSpacing( 6);
-    tabLayout->setMargin( 11);
+    tabLayout->setSpacing( 3);
+    tabLayout->setMargin( 2);
 
     storageComboBox = new QComboBox( FALSE, tab, "storageComboBox" );
+    storageComboBox->setMaximumWidth(220);
 
-    tabLayout->addMultiCellWidget( storageComboBox, 0, 0, 0, 1 );
+    tabLayout->addMultiCellWidget( storageComboBox, 0, 0, 0, 0 );
 
     TextLabel4 = new QLabel( tab, "TextLabel4" );
     TextLabel4->setText( tr( "Storage Type" ) );
 
-    tabLayout->addMultiCellWidget( TextLabel4, 1, 1, 0, 1 );
+    tabLayout->addMultiCellWidget( TextLabel4, 1, 1, 0, 0 );
 
     TextLabel2 = new QLabel( tab, "TextLabel2" );
     TextLabel2->setText( tr( "File Systems" ) );
 
-    tabLayout->addMultiCellWidget( TextLabel2, 4, 4, 0, 1 );
+    tabLayout->addMultiCellWidget( TextLabel2, 4, 4, 0, 0 );
 
     fileSystemsCombo = new QComboBox( FALSE, tab, "fileSystemsCombo" );
+    fileSystemsCombo->setMaximumWidth(220);
 
-    tabLayout->addMultiCellWidget( fileSystemsCombo, 3, 3, 0, 1 );
-    QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    tabLayout->addItem( spacer, 2, 1 );
+    tabLayout->addMultiCellWidget( fileSystemsCombo, 3, 3, 0, 0 );
+    QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum );
+    tabLayout->addItem( spacer, 2, 0 );
 
     formatPushButton = new QPushButton( tab, "formatPushButton" );
     formatPushButton->setText( tr( "Format" ) );
+    formatPushButton->setMaximumWidth(170);
 
-    tabLayout->addMultiCellWidget( formatPushButton, 6, 6, 0, 1 );
-    QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
+    tabLayout->addMultiCellWidget( formatPushButton, 6, 6, 0, 0 );
+    QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum );
     tabLayout->addItem( spacer_2, 5, 0 );
     TabWidget->insertTab( tab, tr( "Main" ) );
 
     tab_2 = new QWidget( TabWidget, "tab_2" );
     tabLayout_2 = new QGridLayout( tab_2 ); 
-    tabLayout_2->setSpacing( 6);
-    tabLayout_2->setMargin( 11);
+    tabLayout_2->setSpacing(3);
+    tabLayout_2->setMargin(2);
 
     mountPointLineEdit = new QLineEdit( tab_2, "mountPointLineEdit" );
 
-    tabLayout_2->addMultiCellWidget( mountPointLineEdit, 0, 0, 0, 1 );
+    tabLayout_2->addMultiCellWidget( mountPointLineEdit, 0, 0, 0, 0 );
 
     deviceComboBox = new QComboBox( FALSE, tab_2, "deviceComboBox" );
 
-    tabLayout_2->addMultiCellWidget( deviceComboBox, 3, 3, 0, 1 );
+    tabLayout_2->addMultiCellWidget( deviceComboBox, 3, 3, 0, 0 );
 
     TextLabel5 = new QLabel( tab_2, "TextLabel5" );
     TextLabel5->setText( tr( "CAUTION:\n"
                              "Changing parameters on this \n"
                              "page may cause your system \n"
                              "to stop functioning properly!!" ) );//idiot message
 
-    tabLayout_2->addMultiCellWidget( TextLabel5, 6, 6, 0, 1 );
+    tabLayout_2->addMultiCellWidget( TextLabel5, 6, 6, 0, 0 );
 
     editPushButton = new QPushButton( tab_2, "editPushButton" );
     editPushButton->setText( tr( "Edit fstab" ) );
 
     tabLayout_2->addMultiCellWidget( editPushButton, 7, 7, 0, 0 );
 
     fsckButton = new QPushButton( tab_2, "fsckPushButton" );
     fsckButton->setText( tr( "Check Disk" ) );
 
-    tabLayout_2->addMultiCellWidget( fsckButton, 7, 7, 1, 1 );
+    tabLayout_2->addMultiCellWidget( fsckButton, 7, 7, 1, 0 );
 
     TextLabel3 = new QLabel( tab_2, "TextLabel3" );
     TextLabel3->setText( tr( "Device" ) );
 
-    tabLayout_2->addMultiCellWidget( TextLabel3, 4, 4, 0, 1 );
+    tabLayout_2->addMultiCellWidget( TextLabel3, 4, 4, 0, 0 );
     QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
     tabLayout_2->addItem( spacer_3, 5, 0 );
 
     TextLabel1 = new QLabel( tab_2, "TextLabel1" );
     TextLabel1->setText( tr( "Mount Point" ) );
 
-    tabLayout_2->addMultiCellWidget( TextLabel1, 1, 1, 0, 1 );
+    tabLayout_2->addMultiCellWidget( TextLabel1, 1, 1, 0, 0 );
     QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
     tabLayout_2->addItem( spacer_4, 2, 1 );
     TabWidget->insertTab( tab_2, tr( "Advanced" ) );
 
     FormatterAppLayout->addWidget( TabWidget, 0, 0 );
 
@@ -159,18 +162,13 @@ FormatterApp::FormatterApp( QWidget* parent,  const char* name, bool modal, WFla
     connect( deviceComboBox,SIGNAL(activated(int)),this,SLOT( deviceComboSelected(int ) ));
 
     
     fillCombos();
 }
 
-/*  
- *  Destroys the object and frees any allocated resources
- frickin no duh?!?
- */
-FormatterApp::~FormatterApp()
-{
+FormatterApp::~FormatterApp() {
 
 }
 
 void FormatterApp::doFormat() {
     int err=0;
     Output *outDlg;
@@ -388,13 +386,13 @@ void FormatterApp::deviceComboSelected(int index) {
             usedS.sprintf(tr("Used: %1 kB ( %d mB)\n").arg(used) ,usedMb);
             avS.sprintf( tr("Available: %1 kB ( %d mB)").arg(avail), availMb );
         }
     }
     fsType = getFileSystemType((const QString &)selectedText);
 
-    TextLabel5->setText("Type: "+ nameS+" Formatted with "+ fsType + " \n" + totalS + usedS + avS);
+    TextLabel5->setText("Type: "+ nameS+"\nFormatted with "+ fsType + " \n" + totalS + usedS + avS);
 //     storageComboSelected(0);
 }
 
 void FormatterApp::cleanUp() {
 
 }