2 files changed, 28 insertions, 3 deletions

diff --git a/core/launcher/mediummountgui.cpp b/core/launcher/mediummountgui.cpp
index 2454efa..8307eb6 100644
--- a/core/launcher/mediummountgui.cpp
+++ b/core/launcher/mediummountgui.cpp
@@ -26,79 +26,98 @@ MediumMountGui::MediumMountGui( const QString &path ,QWidget* parent,  const cha
 
   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");
   cfg.setGroup("main");
   checkagain = cfg.readBoolEntry("check", false);
   
   cfg.setGroup("mimetypes");
   checkmimeaudio = cfg.readBoolEntry("audio", false);
   checkmimeimage = cfg.readBoolEntry("image", true);
   checkmimetext  = cfg.readBoolEntry("text", true);
   checkmimevideo = cfg.readBoolEntry("video", true);
 
   cfg.setGroup("dirs");
   limittodirs = cfg.readEntry("dirs", "/");
 }
 
 bool MediumMountGui::check() {
   return checkagain;
 }
 
+QStringList MediumMountGui::dirs() {
+  QStringList list = QStringList::split(",", limittodirs );
+  return list;
+}
 
 void MediumMountGui::writeConfig() {
 
   OConfig cfg (mediumPath +"/.opiestorage.cf");
   cfg.setGroup("main");
   cfg.writeEntry("check",  AskBox->isChecked() );
   
   cfg.setGroup("mimetypes");
   cfg.writeEntry("audio", CheckBoxAudio->isChecked() );
   cfg.writeEntry("image",CheckBoxImage->isChecked() );
   cfg.writeEntry("text",CheckBoxImage->isChecked() );
   cfg.writeEntry("video",CheckBoxVideo->isChecked() );
 
   cfg.setGroup("dirs");
-  cfg.writeEntry("dirs", "/");  
+  cfg.writeEntry("dirs", "/"); 
+
+
+  if (checkmimeaudio) {
+    mimeTypeList += ("audio//*");
+  }
+  if (checkmimetext) {
+    mimeTypeList += ("text//*");
+  }
+  if (checkmimeaudio) {
+    mimeTypeList += ("video//*");
+  }
+  if (checkmimeaudio) {
+    mimeTypeList += ("image//*");
+  }
+ 
 }
 
 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, 60 ) ); 
   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" );
@@ -128,39 +147,44 @@ void MediumMountGui::startGui() {
   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);
 
   // 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() ) );
 
 
 }
 
 void MediumMountGui::yesPressed() {
   writeConfig();
   // and do something
 }
 
+
+QStringList MediumMountGui::mimeTypes(){
+  return mimeTypeList;
+}
+
 void MediumMountGui::noPressed() {
   close();
 }
 
 MediumMountGui::~MediumMountGui(){
 }
 
diff --git a/core/launcher/mediummountgui.h b/core/launcher/mediummountgui.h
index 700a922..a7f3701 100644
--- a/core/launcher/mediummountgui.h
+++ b/core/launcher/mediummountgui.h
@@ -9,55 +9,56 @@ class QGridLayout;
 class QCheckBox;
 class QGroupBox;
 class QLabel;
 class QLineEdit;
 class QPushButton;
 
 class MediumMountGui : public QDialog
 { 
     Q_OBJECT
 
 public:
     MediumMountGui( const QString &path = "/tmp/", QWidget* parent = 0, const char* name = 0, bool modal = FALSE    ,WFlags fl = 0 );
     ~MediumMountGui();
 
 protected:    
     QPushButton* quit;
     QPushButton* quit_2;
     QLabel* DirSelectText_2;
     QLineEdit* LineEdit1;
     QPushButton* PushButton3;
     QLabel* DirSelectText;
     QLabel* Text_2;
     QLabel* Text;
     QGroupBox* GroupBox1;
     QCheckBox* CheckBoxAudio;
     QCheckBox* CheckBoxImage;
     QCheckBox* CheckBoxText;
     QCheckBox* CheckBoxVideo;
     QCheckBox* AskBox;
 
 public:
     bool check();
-
+    QStringList mimeTypes();
+    QStringList dirs();
 private:
     void startGui();
     void readConfig();
             void writeConfig();
 
 private slots:
         void yesPressed();
         void noPressed();
 private:
     QString mediumPath;
 
     bool checkagain; 
     bool checkmimeaudio;
     bool checkmimeimage;
     bool checkmimetext;
     bool checkmimevideo;
 QString limittodirs;
-
+QStringList mimeTypeList;
 
 };
 
 #endif 
\ No newline at end of file