summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/mediummountgui.cpp47
-rw-r--r--core/launcher/mediummountgui.h5
2 files changed, 47 insertions, 5 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
@@ -45,8 +45,9 @@ void MediumMountGui::readConfig(){
45 checkmimeaudio = cfg.readBoolEntry("audio", true); 45 checkmimeaudio = cfg.readBoolEntry("audio", true);
46 checkmimeimage = cfg.readBoolEntry("image", true); 46 checkmimeimage = cfg.readBoolEntry("image", true);
47 checkmimetext = cfg.readBoolEntry("text", true); 47 checkmimetext = cfg.readBoolEntry("text", true);
48 checkmimevideo = cfg.readBoolEntry("video", true); 48 checkmimevideo = cfg.readBoolEntry("video", true);
49 checkmimeall = cfg.readBoolEntry("all", true);
49 50
50 cfg.setGroup("dirs"); 51 cfg.setGroup("dirs");
51 limittodirs = cfg.readEntry("dirs", ""); 52 limittodirs = cfg.readEntry("dirs", "");
52} 53}
@@ -67,30 +68,39 @@ void MediumMountGui::writeConfig(bool autocheck) {
67 cfg.writeEntry("check", AskBox->isChecked() ); 68 cfg.writeEntry("check", AskBox->isChecked() );
68 cfg.writeEntry("autocheck", autocheck ); 69 cfg.writeEntry("autocheck", autocheck );
69 70
70 cfg.setGroup("mimetypes"); 71 cfg.setGroup("mimetypes");
72
71 cfg.writeEntry("audio", CheckBoxAudio->isChecked() ); 73 cfg.writeEntry("audio", CheckBoxAudio->isChecked() );
72 cfg.writeEntry("image",CheckBoxImage->isChecked() ); 74 cfg.writeEntry("image",CheckBoxImage->isChecked() );
73 cfg.writeEntry("text",CheckBoxImage->isChecked() ); 75 cfg.writeEntry("text",CheckBoxImage->isChecked() );
74 cfg.writeEntry("video",CheckBoxVideo->isChecked() ); 76 cfg.writeEntry("video",CheckBoxVideo->isChecked() );
77 cfg.writeEntry("all",CheckBoxAll->isChecked() );
75 78
76 cfg.setGroup("dirs"); 79 cfg.setGroup("dirs");
77 cfg.writeEntry("dirs", ""); 80 cfg.writeEntry("dirs", "");
78 81
79 82
83 // if all is checked then add only "null" to the list.
84 if (checkmimeall) {
85 mimeTypeList += ("null");
86 } else {
80 if (checkmimeaudio) { 87 if (checkmimeaudio) {
81 mimeTypeList += ("audio//*"); 88 mimeTypeList += ("audio//*");
82 } 89 }
83 if (checkmimetext) { 90 if (checkmimetext) {
84 mimeTypeList += ("text//*"); 91 mimeTypeList += ("text//*");
85 } 92 }
86 if (checkmimeaudio) { 93 if (checkmimevideo) {
87 mimeTypeList += ("video//*"); 94 mimeTypeList += ("video//*");
88 } 95 }
89 if (checkmimeaudio) { 96 if (checkmimeimage) {
90 mimeTypeList += ("image//*"); 97 mimeTypeList += ("image//*");
91 } 98 }
92 99 if (checkmimeall) {
100 mimeTypeList << ("null");
101 }
102 }
93} 103}
94 104
95void MediumMountGui::startGui() { 105void MediumMountGui::startGui() {
96 106
@@ -105,9 +115,9 @@ void MediumMountGui::startGui() {
105 Text->setText( tr( "A <b>storage medium</b> was inserted. Should it be scanned for media files?" ) ); 115 Text->setText( tr( "A <b>storage medium</b> was inserted. Should it be scanned for media files?" ) );
106 116
107 // media box 117 // media box
108 GroupBox1 = new QGroupBox( this, "GroupBox1" ); 118 GroupBox1 = new QGroupBox( this, "GroupBox1" );
109 GroupBox1->setGeometry( QRect( 10, 80, (this->width())-25, 60 ) ); 119 GroupBox1->setGeometry( QRect( 10, 80, (this->width())-25, 80 ) );
110 GroupBox1->setTitle( tr( "Which media files" ) ); 120 GroupBox1->setTitle( tr( "Which media files" ) );
111 121
112 CheckBoxAudio = new QCheckBox( GroupBox1, "CheckBoxAudio" ); 122 CheckBoxAudio = new QCheckBox( GroupBox1, "CheckBoxAudio" );
113 CheckBoxAudio->setGeometry( QRect( 10, 15, (GroupBox1->width()/2)-15 , 15 ) ); 123 CheckBoxAudio->setGeometry( QRect( 10, 15, (GroupBox1->width()/2)-15 , 15 ) );
@@ -124,8 +134,22 @@ void MediumMountGui::startGui() {
124 CheckBoxVideo = new QCheckBox( GroupBox1, "CheckBoxVideo" ); 134 CheckBoxVideo = new QCheckBox( GroupBox1, "CheckBoxVideo" );
125 CheckBoxVideo->setGeometry( QRect( (GroupBox1->width()/2), 35, (GroupBox1->width()/2)-15, 15 ) ); 135 CheckBoxVideo->setGeometry( QRect( (GroupBox1->width()/2), 35, (GroupBox1->width()/2)-15, 15 ) );
126 CheckBoxVideo->setText( tr( "Video" ) ); 136 CheckBoxVideo->setText( tr( "Video" ) );
127 137
138 CheckBoxAll = new QCheckBox ( GroupBox1);
139 CheckBoxAll->setGeometry( QRect( 10, 55, (GroupBox1->width()/2)-15, 15 ) );
140 CheckBoxAll->setText( tr( "All" ) );
141 QObject::connect( (QObject*)CheckBoxAll, SIGNAL( clicked() ), this, SLOT( deactivateOthers()) );
142
143
144
145 CheckBoxLink = new QCheckBox ( GroupBox1);
146 CheckBoxLink->setGeometry( QRect( (GroupBox1->width()/2), 55, (GroupBox1->width()/2)-15, 15 ) );
147 CheckBoxLink->setText( tr( "Link apps" ) );
148 // as long as the feature is not supported
149 CheckBoxLink->setEnabled(false);
150
151
128 // select dirs 152 // select dirs
129 153
130 DirSelectText = new QLabel( this, "DirSelectText" ); 154 DirSelectText = new QLabel( this, "DirSelectText" );
131 DirSelectText->setGeometry( QRect( 10, 160,this->width() , 20 ) ); 155 DirSelectText->setGeometry( QRect( 10, 160,this->width() , 20 ) );
@@ -171,8 +195,23 @@ void MediumMountGui::startGui() {
171 195
172 196
173} 197}
174 198
199
200void MediumMountGui::deactivateOthers() {
201 bool mod = !(CheckBoxAll->isChecked());
202
203 //if (!CheckBoxVideo->isChecked()){
204 // mod = false;
205 //} else {
206 // mod = true;
207 //}
208 CheckBoxVideo->setEnabled(mod);
209 CheckBoxAudio->setEnabled(mod);
210 CheckBoxText->setEnabled(mod);
211 CheckBoxImage->setEnabled(mod);
212}
213
175void MediumMountGui::yesPressed() { 214void MediumMountGui::yesPressed() {
176 writeConfig(true); 215 writeConfig(true);
177 // and do something 216 // and do something
178 accept(); 217 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
@@ -33,8 +33,10 @@ protected:
33 QCheckBox* CheckBoxAudio; 33 QCheckBox* CheckBoxAudio;
34 QCheckBox* CheckBoxImage; 34 QCheckBox* CheckBoxImage;
35 QCheckBox* CheckBoxText; 35 QCheckBox* CheckBoxText;
36 QCheckBox* CheckBoxVideo; 36 QCheckBox* CheckBoxVideo;
37 QCheckBox* CheckBoxAll;
38 QCheckBox* CheckBoxLink;
37 QCheckBox* AskBox; 39 QCheckBox* AskBox;
38 40
39public: 41public:
40 bool check(); 42 bool check();
@@ -47,17 +49,18 @@ private:
47 49
48private slots: 50private slots:
49 void yesPressed(); 51 void yesPressed();
50 void noPressed(); 52 void noPressed();
51 53 void deactivateOthers();
52private: 54private:
53 QString mediumPath; 55 QString mediumPath;
54 56
55 bool checkagain; 57 bool checkagain;
56 bool checkmimeaudio; 58 bool checkmimeaudio;
57 bool checkmimeimage; 59 bool checkmimeimage;
58 bool checkmimetext; 60 bool checkmimetext;
59 bool checkmimevideo; 61 bool checkmimevideo;
62 bool checkmimeall;
60 QString limittodirs; 63 QString limittodirs;
61 QStringList mimeTypeList; 64 QStringList mimeTypeList;
62 65
63}; 66};