2 files changed, 57 insertions, 15 deletions

diff --git a/core/launcher/mediummountgui.cpp b/core/launcher/mediummountgui.cpp
index 82c2d66..f193024 100644
--- a/core/launcher/mediummountgui.cpp
+++ b/core/launcher/mediummountgui.cpp
@@ -43,12 +43,13 @@ void MediumMountGui::readConfig(){
   
   cfg.setGroup("mimetypes");
   checkmimeaudio = cfg.readBoolEntry("audio", true);
   checkmimeimage = cfg.readBoolEntry("image", true);
   checkmimetext  = cfg.readBoolEntry("text", true);
   checkmimevideo = cfg.readBoolEntry("video", true);
+  checkmimeall   = cfg.readBoolEntry("all", true);
 
   cfg.setGroup("dirs");
   limittodirs = cfg.readEntry("dirs", "");
 }
 
 bool MediumMountGui::check() {
@@ -65,34 +66,43 @@ void MediumMountGui::writeConfig(bool autocheck) {
   OConfig cfg (mediumPath +"/.opiestorage.cf");
   cfg.setGroup("main");
   cfg.writeEntry("check",  AskBox->isChecked() );
   cfg.writeEntry("autocheck", autocheck );  
 
   cfg.setGroup("mimetypes");
+
   cfg.writeEntry("audio", CheckBoxAudio->isChecked() );
   cfg.writeEntry("image",CheckBoxImage->isChecked() );
   cfg.writeEntry("text",CheckBoxImage->isChecked() );
   cfg.writeEntry("video",CheckBoxVideo->isChecked() );
+  cfg.writeEntry("all",CheckBoxAll->isChecked() );
 
   cfg.setGroup("dirs");
   cfg.writeEntry("dirs", ""); 
 
 
-  if (checkmimeaudio) {
-    mimeTypeList += ("audio//*");
-  }
-  if (checkmimetext) {
-    mimeTypeList += ("text//*");
-  }
-  if (checkmimeaudio) {
-    mimeTypeList += ("video//*");
+  // if all is checked then add only "null" to the list.
+  if (checkmimeall) {
+    mimeTypeList += ("null");
+  } else {
+    if (checkmimeaudio) {
+      mimeTypeList += ("audio//*");
+    }
+    if (checkmimetext) {
+      mimeTypeList += ("text//*");
+    }
+    if (checkmimevideo) {
+      mimeTypeList += ("video//*");
+    }
+    if (checkmimeimage) {
+      mimeTypeList += ("image//*");
+    }
+    if (checkmimeall) {
+    mimeTypeList << ("null");
+    }
   }
-  if (checkmimeaudio) {
-    mimeTypeList += ("image//*");
-  }
- 
 }
 
 void MediumMountGui::startGui() {
 
   QPixmap image = Resource::loadPixmap( "HelpBrowser");
 
@@ -103,13 +113,13 @@ void MediumMountGui::startGui() {
   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, 60 ) ); 
+  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" ) );
  
@@ -121,12 +131,26 @@ void MediumMountGui::startGui() {
   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)" ) );
@@ -169,12 +193,27 @@ void MediumMountGui::startGui() {
   QObject::connect( (QObject*)quit, SIGNAL( clicked() ), this, SLOT(yesPressed() ) );
   QObject::connect( (QObject*)quit_2, SIGNAL( clicked() ), this, SLOT(noPressed() ) );
 
 
 }
 
+
+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);
+}
+
 void MediumMountGui::yesPressed() {
   writeConfig(true);
   // and do something
   accept();
 }
 
diff --git a/core/launcher/mediummountgui.h b/core/launcher/mediummountgui.h
index 9802b29..2e04f94 100644
--- a/core/launcher/mediummountgui.h
+++ b/core/launcher/mediummountgui.h
@@ -31,12 +31,14 @@ protected:
     QLabel* Text;
     QGroupBox* GroupBox1;
     QCheckBox* CheckBoxAudio;
     QCheckBox* CheckBoxImage;
     QCheckBox* CheckBoxText;
     QCheckBox* CheckBoxVideo;
+    QCheckBox* CheckBoxAll;
+    QCheckBox* CheckBoxLink;
     QCheckBox* AskBox;
 
 public:
     bool check();
     QStringList mimeTypes();
     QStringList dirs();
@@ -45,21 +47,22 @@ private:
     void readConfig();
     void writeConfig(bool checkagain);	
 
 private slots:
     void yesPressed();
     void noPressed();
-
-private:
+    void deactivateOthers();
+ private:
     QString mediumPath;
 
     bool checkagain; 
     bool checkmimeaudio;
     bool checkmimeimage;
     bool checkmimetext;
     bool checkmimevideo;
+    bool checkmimeall;
     QString limittodirs;
     QStringList mimeTypeList;
 
 };
 
 #endif