cleanups and gui redo with layouts

2 files changed, 177 insertions, 194 deletions

diff --git a/core/launcher/mediummountgui.cpp b/core/launcher/mediummountgui.cpp
index eb2308e..6d60ce4 100644
--- a/core/launcher/mediummountgui.cpp
+++ b/core/launcher/mediummountgui.cpp
@@ -3,3 +3,2 @@
 
-#include <qvariant.h>
 #include <qcheckbox.h>
@@ -10,6 +9,6 @@
 #include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
 #include <qimage.h>
 #include <qpixmap.h>
+#include <qvbox.h>
+#include <qhbox.h>
 
@@ -18,7 +17,2 @@
 
-#include <qpe/config.h>
-
-
-#include <qapplication.h>
-
 
@@ -26,79 +20,74 @@ MediumMountGui::MediumMountGui( Config *cfg, const QString &path ,QWidget* paren
   : QDialog( parent, name, true ) {
- 
-  m_cfg = cfg;
-  QWidget *d = QApplication::desktop();
-  int w=d->width();
-  int h=d->height();
-  resize( w , h );
-  setCaption( tr( "Medium inserted" ) );
-
-  mediumPath = path;
-  readConfig();
-  startGui();
-}
 
-void MediumMountGui::readConfig(){
-
-  //OConfig cfg (mediumPath +"/.opiestorage.cf");
-  m_cfg->setGroup("main");
-  checkagain = m_cfg->readBoolEntry("check", false);
-  
-  m_cfg->setGroup("mimetypes");
-  checkmimeaudio = m_cfg->readBoolEntry("audio", true );
-  checkmimeimage = m_cfg->readBoolEntry("image", true );
-  checkmimetext  = m_cfg->readBoolEntry("text" , true );
-  checkmimevideo = m_cfg->readBoolEntry("video", true );
-  checkmimeall   = m_cfg->readBoolEntry("all"  , false);
-
-  m_cfg->setGroup("dirs");
-  limittodirs = m_cfg->readEntry("dirs", "");
-}
+    m_cfg = cfg;
+    setCaption( tr( "Medium inserted" ) );
 
-bool MediumMountGui::check() {
-  return !checkagain;
-}
-
-QStringList MediumMountGui::dirs() {
-  QStringList list = QStringList::split(",", limittodirs );
-  return list;
+    mediumPath = path;
+    readConfig();
+    startGui();
+    showMaximized();
 }
 
-void MediumMountGui::writeConfig(bool autocheck) {
+void MediumMountGui::readConfig() {
 
-  //OConfig cfg (mediumPath +"/.opiestorage.cf");
-  m_cfg->setGroup("main");
-  m_cfg->writeEntry("check",  AskBox->isChecked() );
-  m_cfg->writeEntry("autocheck", autocheck );  
+    //OConfig cfg (mediumPath +"/.opiestorage.cf");
+    m_cfg->setGroup( "main" );
+    checkagain = m_cfg->readBoolEntry( "check", false );
 
-  m_cfg->setGroup("mimetypes");
+    m_cfg->setGroup( "mimetypes" );
+    checkmimeaudio = m_cfg->readBoolEntry( "audio", true );
+    checkmimeimage = m_cfg->readBoolEntry( "image", true );
+    checkmimetext  = m_cfg->readBoolEntry( "text" , true );
+    checkmimevideo = m_cfg->readBoolEntry( "video", true );
+    checkmimeall   = m_cfg->readBoolEntry( "all"  , false );
 
-  m_cfg->writeEntry("audio", CheckBoxAudio->isChecked() );
-  m_cfg->writeEntry("image",CheckBoxImage->isChecked() );
-  m_cfg->writeEntry("text",CheckBoxImage->isChecked() );
-  m_cfg->writeEntry("video",CheckBoxVideo->isChecked() );
-  m_cfg->writeEntry("all",CheckBoxAll->isChecked() );
+    m_cfg->setGroup( "dirs" );
+    limittodirs = m_cfg->readEntry( "dirs", "" );
+}
 
-  m_cfg->setGroup("dirs");
-  m_cfg->writeEntry("dirs", ""); 
+bool MediumMountGui::check() {
+    return !checkagain;
+}
 
+QStringList MediumMountGui::dirs() {
+    return QStringList::split( ",", limittodirs );
+}
 
-  // if all is checked then add only "QString::null" to the list.
-  if (checkmimeall) {
-    mimeTypeList.clear();
-    mimeTypeList += QString::null;
-  } else {
-    if (checkmimeaudio) {
-      mimeTypeList += ("audio/*");
+void MediumMountGui::writeConfig( bool autocheck ) {
+
+    //OConfig cfg (mediumPath +"/.opiestorage.cf");
+    m_cfg->setGroup( "main" );
+    m_cfg->writeEntry( "check", AskBox->isChecked() );
+    m_cfg->writeEntry( "autocheck", autocheck );
+
+    m_cfg->setGroup( "mimetypes" );
+
+    m_cfg->writeEntry( "audio", CheckBoxAudio->isChecked() );
+    m_cfg->writeEntry( "image", CheckBoxImage->isChecked() );
+    m_cfg->writeEntry( "text", CheckBoxImage->isChecked() );
+    m_cfg->writeEntry( "video", CheckBoxVideo->isChecked() );
+    m_cfg->writeEntry( "all", CheckBoxAll->isChecked() );
+
+    m_cfg->setGroup( "dirs" );
+    m_cfg->writeEntry( "dirs", "" );
+
+    // if all is checked then add only "QString::null" to the list.
+    if ( checkmimeall ) {
+        mimeTypeList.clear();
+        mimeTypeList += QString::null;
+    } else {
+        if ( checkmimeaudio ) {
+            mimeTypeList += ( "audio/*" );
+        }
+        if ( checkmimetext ) {
+            mimeTypeList += ( "text/*" );
+        }
+        if ( checkmimevideo ) {
+            mimeTypeList += ( "video/*" );
+        }
+        if ( checkmimeimage ) {
+            mimeTypeList += ( "image/*" );
+        }
     }
-    if (checkmimetext) {
-      mimeTypeList += ("text/*");
-    }
-    if (checkmimevideo) {
-      mimeTypeList += ("video/*");
-    }
-    if (checkmimeimage) {
-      mimeTypeList += ("image/*");
-    }
-  }
-  m_cfg->write(); // not really needed here but just to be sure
+    m_cfg->write(); // not really needed here but just to be sure
 }
@@ -107,93 +96,93 @@ void MediumMountGui::startGui() {
 
-  QPixmap image = Resource::loadPixmap( "HelpBrowser");
-
-  Text_2 = new QLabel( this );
-  Text_2->setGeometry( QRect( 10, 15, 40, 40 ) ); 
-  Text_2->setPixmap( image );
-  
-  Text = new QLabel( this, "Text" );
-  Text->setGeometry( QRect( 55, 11, this->width()-50, 50 ) ); 
-  Text->setText( tr( "A <b>storage medium</b> was inserted. Should it be scanned for media files?" ) );
-  
-  // media box
-  GroupBox1 = new QGroupBox( this, "GroupBox1" );
-  GroupBox1->setGeometry( QRect( 10, 80, (this->width())-25, 80 ) ); 
-  GroupBox1->setTitle( tr( "Which media files" ) );
-  
-  CheckBoxAudio = new QCheckBox( GroupBox1, "CheckBoxAudio" );
-  CheckBoxAudio->setGeometry( QRect( 10, 15, (GroupBox1->width()/2)-15 , 15 ) ); 
-  CheckBoxAudio->setText( tr( "Audio" ) );
- 
-  CheckBoxImage = new QCheckBox( GroupBox1, "CheckBoxImage" );
-  CheckBoxImage->setGeometry( QRect( 10, 35,(GroupBox1->width()/2)-15, 15 ) ); 
-  CheckBoxImage->setText( tr( "Image" ) );
-
-  CheckBoxText = new QCheckBox( GroupBox1, "CheckBoxText" );
-  CheckBoxText->setGeometry( QRect((GroupBox1->width()/2) , 15, (GroupBox1->width()/2)-15, 15 ) ); 
-  CheckBoxText->setText( tr( "Text" ) );
-
-  CheckBoxVideo = new QCheckBox( GroupBox1, "CheckBoxVideo" );
-  CheckBoxVideo->setGeometry( QRect( (GroupBox1->width()/2), 35, (GroupBox1->width()/2)-15, 15 ) ); 
-  CheckBoxVideo->setText( tr( "Video" ) );
-
-  CheckBoxAll = new QCheckBox ( GroupBox1);
-  CheckBoxAll->setGeometry( QRect( 10, 55, (GroupBox1->width()/2)-15, 15 ) ); 
-  CheckBoxAll->setText( tr( "All" ) );
-  QObject::connect( (QObject*)CheckBoxAll, SIGNAL( clicked() ), this, SLOT( deactivateOthers()) );
-   
-  
-   
-  CheckBoxLink = new QCheckBox ( GroupBox1);
-  CheckBoxLink->setGeometry( QRect( (GroupBox1->width()/2), 55, (GroupBox1->width()/2)-15, 15 ) ); 
-  CheckBoxLink->setText( tr( "Link apps" ) );
-  // as long as the feature is not supported
-  CheckBoxLink->setEnabled(false);
-
-  
-  // select dirs
-
-  DirSelectText = new QLabel( this, "DirSelectText" );
-  DirSelectText->setGeometry( QRect( 10, 160,this->width() , 20 ) ); 
-  DirSelectText->setText( tr( "Limit search to dir: (not used yet)" ) );
-  
-  LineEdit1 = new QLineEdit( this );
-  LineEdit1->setGeometry( QRect( 10, 180, (this->width())-60, 20 ) ); 
-  
-  PushButton3 = new QPushButton( this );
-  PushButton3->setGeometry( QRect( (this->width())-40, 180, 30, 20 ) ); 
-  PushButton3->setText( tr( "Add" ) );
-  
-
-  // decision
-  DirSelectText_2 = new QLabel( this );
-  DirSelectText_2->setGeometry( QRect( 10,240,this->width(), 15 ) ); 
-  DirSelectText_2->setText( tr( "Your decision will be stored on the medium." ) );
-  
-  // ask again
-  AskBox = new QCheckBox( this );
-  AskBox->setGeometry( QRect( 10, 215, (this->width())-15 , 15 ) ); 
-  AskBox->setText( tr( "Do not ask again for this medium" ) );
-  
-
-  AskBox->setChecked(checkagain);
-  CheckBoxAudio->setChecked(checkmimeaudio);
-  CheckBoxImage->setChecked(checkmimeimage);
-  CheckBoxText->setChecked(checkmimetext);
-  CheckBoxVideo->setChecked(checkmimevideo);
-  CheckBoxAll->setChecked( checkmimeall );
-  deactivateOthers();
-  // buttons
-  quit = new QPushButton( this );
-  quit->setGeometry( QRect( (this->width()/2)- 90 , 260, 80, 22 ) ); 
-  quit->setFocus();
-  quit->setText( tr( "Yes" ) );
-  
-  quit_2 = new QPushButton( this );
-  quit_2->setGeometry( QRect((this->width()/2) , 260, 80, 22 ) ); 
-  quit_2->setText( tr( "No" ) );
-
-  QObject::connect( (QObject*)quit, SIGNAL( clicked() ), this, SLOT(yesPressed() ) );
-  QObject::connect( (QObject*)quit_2, SIGNAL( clicked() ), this, SLOT(noPressed() ) );
-
-
+    QVBoxLayout* mainLayout = new QVBoxLayout( this );
+
+    QHBoxLayout * titelBox = new QHBoxLayout( mainLayout );
+    Text_2 = new QLabel( this );
+    // FIXME needs an image
+    Text_2->setPixmap( Resource::loadPixmap( "mediummount/mediummount" ) );
+
+    Text = new QLabel( this, "Text" );
+    Text->setText( tr( "A <b>storage medium</b> was inserted. Should it be scanned for media files?" ) );
+    titelBox->addWidget( Text_2 );
+    titelBox->setStretchFactor( Text_2, 2 );
+    titelBox->addWidget( Text );
+    titelBox->setStretchFactor( Text, 8 );
+
+    // media box
+    GroupBox1 = new QGroupBox( this, "GroupBox1" );
+    GroupBox1->setTitle( tr( "Which media files" ) );
+
+    QGridLayout *mimeLayout = new QGridLayout( GroupBox1, 3, 2, 10 );
+
+    CheckBoxAudio = new QCheckBox( GroupBox1, "CheckBoxAudio" );
+    CheckBoxAudio->setText( tr( "Audio" ) );
+
+    CheckBoxImage = new QCheckBox( GroupBox1, "CheckBoxImage" );
+    CheckBoxImage->setText( tr( "Image" ) );
+
+    CheckBoxText = new QCheckBox( GroupBox1, "CheckBoxText" );
+    CheckBoxText->setText( tr( "Text" ) );
+
+    CheckBoxVideo = new QCheckBox( GroupBox1, "CheckBoxVideo" );
+    CheckBoxVideo->setText( tr( "Video" ) );
+
+    CheckBoxAll = new QCheckBox ( GroupBox1 );
+    CheckBoxAll->setText( tr( "All" ) );
+
+    CheckBoxLink = new QCheckBox ( GroupBox1 );
+    CheckBoxLink->setText( tr( "Link apps" ) );
+    // as long as the feature is not supported
+    CheckBoxLink->setEnabled( false );
+
+    mimeLayout->addWidget( CheckBoxAudio, 0, 0 );
+    mimeLayout->addWidget( CheckBoxImage, 0, 1 );
+    mimeLayout->addWidget( CheckBoxText , 1, 0 );
+    mimeLayout->addWidget( CheckBoxVideo, 1, 1 );
+    mimeLayout->addWidget( CheckBoxAll, 2, 0 );
+    mimeLayout->addWidget( CheckBoxLink, 2, 1 );
+
+    connect( CheckBoxAll, SIGNAL( clicked() ), this, SLOT( deactivateOthers() ) );
+
+    QVBox* dirBox = new QVBox( this );
+    dirBox->setMargin( 4 );
+
+    // select dirs
+    DirSelectText = new QLabel( dirBox, "DirSelectText" );
+    DirSelectText->setText( tr( "Limit search to dir: (not used yet)" ) );
+
+    QHBox* dirLineBox = new QHBox( dirBox );
+    LineEdit1 = new QLineEdit( dirLineBox );
+    PushButton3 = new QPushButton( dirLineBox );
+    PushButton3->setText( tr( "Add" ) );
+
+    // decision
+    DirSelectText_2 = new QLabel( dirBox );
+    DirSelectText_2->setText( tr( "Your decision will be stored on the medium." ) );
+
+    // ask again
+    AskBox = new QCheckBox( dirBox );
+    AskBox->setText( tr( "Do not ask again for this medium" ) );
+
+    AskBox->setChecked( checkagain );
+    CheckBoxAudio->setChecked( checkmimeaudio );
+    CheckBoxImage->setChecked( checkmimeimage );
+    CheckBoxText->setChecked( checkmimetext );
+    CheckBoxVideo->setChecked( checkmimevideo );
+    CheckBoxAll->setChecked( checkmimeall );
+    deactivateOthers();
+
+    QHBox* buttonBox = new QHBox( this );
+    // buttons
+    quit = new QPushButton( buttonBox );
+    quit->setFocus();
+    quit->setText( tr( "Yes" ) );
+    quit_2 = new QPushButton( buttonBox );
+    quit_2->setText( tr( "No" ) );
+
+    mainLayout->addWidget( GroupBox1 );
+    mainLayout->addWidget( dirBox );
+    mainLayout->addWidget( buttonBox );
+
+    connect( quit, SIGNAL( clicked() ), this, SLOT( yesPressed() ) );
+    connect( quit_2, SIGNAL( clicked() ), this, SLOT( noPressed() ) );
 }
@@ -202,13 +191,7 @@ void MediumMountGui::startGui() {
 void MediumMountGui::deactivateOthers() {
-  bool mod = !(CheckBoxAll->isChecked());
-
-  //if (!CheckBoxVideo->isChecked()){
-  //  mod = false;
-  //} else {
-  //  mod = true;
-  //}
-  CheckBoxVideo->setEnabled(mod);
-  CheckBoxAudio->setEnabled(mod);
-  CheckBoxText->setEnabled(mod);
-  CheckBoxImage->setEnabled(mod);
+    bool mod = !( CheckBoxAll->isChecked() );
+    CheckBoxVideo->setEnabled( mod );
+    CheckBoxAudio->setEnabled( mod );
+    CheckBoxText->setEnabled( mod );
+    CheckBoxImage->setEnabled( mod );
 }
@@ -216,5 +199,5 @@ void MediumMountGui::deactivateOthers() {
 void MediumMountGui::yesPressed() {
-  writeConfig(true);
-  // and do something
-  accept();
+    writeConfig( true );
+    // and do something
+    accept();
 }
@@ -222,4 +205,4 @@ void MediumMountGui::yesPressed() {
 
-QStringList MediumMountGui::mimeTypes(){
-  return mimeTypeList;
+QStringList MediumMountGui::mimeTypes() {
+    return mimeTypeList;
 }
@@ -227,7 +210,7 @@ QStringList MediumMountGui::mimeTypes(){
 void MediumMountGui::noPressed() {
-  writeConfig(false);
-  reject();
+    writeConfig( false );
+    reject();
 }
 
-MediumMountGui::~MediumMountGui(){
+MediumMountGui::~MediumMountGui() {
 }
diff --git a/core/launcher/mediummountgui.h b/core/launcher/mediummountgui.h
index 8292c3a..39f9a52 100644
--- a/core/launcher/mediummountgui.h
+++ b/core/launcher/mediummountgui.h
@@ -5,5 +5,6 @@
 #include <qdialog.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
+
+class QVBoxLayout;
+class QHBoxLayout;
+class QGridLayout;
 class QCheckBox;
@@ -15,4 +16,3 @@ class Config;
 
-class MediumMountGui : public QDialog
-{ 
+class MediumMountGui : public QDialog {
     Q_OBJECT
@@ -23,3 +23,3 @@ public:
 
-protected:    
+protected:
     QPushButton* quit;
@@ -40,3 +40,3 @@ protected:
     QCheckBox* AskBox;
-   
+
 
@@ -49,3 +49,3 @@ private:
     void readConfig();
-    void writeConfig(bool checkagain);	
+    void writeConfig( bool checkagain );
 
@@ -58,3 +58,3 @@ private slots:
 
-    bool checkagain:1; 
+    bool checkagain:1;
     bool checkmimeaudio:1;
@@ -70,2 +70,2 @@ private slots:
 
-#endif 
+#endif