summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.pro4
-rw-r--r--core/launcher/mediummountgui.cpp17
-rw-r--r--core/launcher/mediummountgui.h15
3 files changed, 21 insertions, 15 deletions
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 29eaea7..146fffd 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -7,6 +7,7 @@ DESTDIR = $(OPIEDIR)/bin
7 HEADERS = background.h \ 7 HEADERS = background.h \
8 desktop.h \ 8 desktop.h \
9 qprocess.h \ 9 qprocess.h \
10 mediummountgui.h \
10 info.h \ 11 info.h \
11 appicons.h \ 12 appicons.h \
12 taskbar.h \ 13 taskbar.h \
@@ -47,6 +48,7 @@ HEADERS = background.h \
47 48
48 SOURCES = background.cpp \ 49 SOURCES = background.cpp \
49 desktop.cpp \ 50 desktop.cpp \
51 mediummountgui.cpp \
50 qprocess.cpp qprocess_unix.cpp \ 52 qprocess.cpp qprocess_unix.cpp \
51 info.cpp \ 53 info.cpp \
52 appicons.cpp \ 54 appicons.cpp \
@@ -107,7 +109,7 @@ DEPENDPATH += $(OPIEDIR)/rsync
107 109
108 TARGET = qpe 110 TARGET = qpe
109 111
110 LIBS += -lqpe -lcrypt 112 LIBS += -lqpe -lcrypt -lopie
111 113
112TRANSLATIONS = ../i18n/de/qpe.ts 114TRANSLATIONS = ../i18n/de/qpe.ts
113TRANSLATIONS += ../i18n/pt_BR/qpe.ts 115TRANSLATIONS += ../i18n/pt_BR/qpe.ts
diff --git a/core/launcher/mediummountgui.cpp b/core/launcher/mediummountgui.cpp
index 8307eb6..82c2d66 100644
--- a/core/launcher/mediummountgui.cpp
+++ b/core/launcher/mediummountgui.cpp
@@ -42,13 +42,13 @@ void MediumMountGui::readConfig(){
42 checkagain = cfg.readBoolEntry("check", false); 42 checkagain = cfg.readBoolEntry("check", false);
43 43
44 cfg.setGroup("mimetypes"); 44 cfg.setGroup("mimetypes");
45 checkmimeaudio = cfg.readBoolEntry("audio", false); 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 49
50 cfg.setGroup("dirs"); 50 cfg.setGroup("dirs");
51 limittodirs = cfg.readEntry("dirs", "/"); 51 limittodirs = cfg.readEntry("dirs", "");
52} 52}
53 53
54bool MediumMountGui::check() { 54bool MediumMountGui::check() {
@@ -60,12 +60,13 @@ QStringList MediumMountGui::dirs() {
60 return list; 60 return list;
61} 61}
62 62
63void MediumMountGui::writeConfig() { 63void MediumMountGui::writeConfig(bool autocheck) {
64 64
65 OConfig cfg (mediumPath +"/.opiestorage.cf"); 65 OConfig cfg (mediumPath +"/.opiestorage.cf");
66 cfg.setGroup("main"); 66 cfg.setGroup("main");
67 cfg.writeEntry("check", AskBox->isChecked() ); 67 cfg.writeEntry("check", AskBox->isChecked() );
68 68 cfg.writeEntry("autocheck", autocheck );
69
69 cfg.setGroup("mimetypes"); 70 cfg.setGroup("mimetypes");
70 cfg.writeEntry("audio", CheckBoxAudio->isChecked() ); 71 cfg.writeEntry("audio", CheckBoxAudio->isChecked() );
71 cfg.writeEntry("image",CheckBoxImage->isChecked() ); 72 cfg.writeEntry("image",CheckBoxImage->isChecked() );
@@ -73,7 +74,7 @@ void MediumMountGui::writeConfig() {
73 cfg.writeEntry("video",CheckBoxVideo->isChecked() ); 74 cfg.writeEntry("video",CheckBoxVideo->isChecked() );
74 75
75 cfg.setGroup("dirs"); 76 cfg.setGroup("dirs");
76 cfg.writeEntry("dirs", "/"); 77 cfg.writeEntry("dirs", "");
77 78
78 79
79 if (checkmimeaudio) { 80 if (checkmimeaudio) {
@@ -172,8 +173,9 @@ void MediumMountGui::startGui() {
172} 173}
173 174
174void MediumMountGui::yesPressed() { 175void MediumMountGui::yesPressed() {
175 writeConfig(); 176 writeConfig(true);
176 // and do something 177 // and do something
178 accept();
177} 179}
178 180
179 181
@@ -182,7 +184,8 @@ QStringList MediumMountGui::mimeTypes(){
182} 184}
183 185
184void MediumMountGui::noPressed() { 186void MediumMountGui::noPressed() {
185 close(); 187 writeConfig(false);
188 reject();
186} 189}
187 190
188MediumMountGui::~MediumMountGui(){ 191MediumMountGui::~MediumMountGui(){
diff --git a/core/launcher/mediummountgui.h b/core/launcher/mediummountgui.h
index a7f3701..9802b29 100644
--- a/core/launcher/mediummountgui.h
+++ b/core/launcher/mediummountgui.h
@@ -17,7 +17,7 @@ class MediumMountGui : public QDialog
17 Q_OBJECT 17 Q_OBJECT
18 18
19public: 19public:
20 MediumMountGui( const QString &path = "/tmp/", QWidget* parent = 0, const char* name = 0, bool modal = FALSE ,WFlags fl = 0 ); 20 MediumMountGui( const QString &path = "tmp/", QWidget* parent = 0, const char* name = 0, bool modal = FALSE ,WFlags fl = 0 );
21 ~MediumMountGui(); 21 ~MediumMountGui();
22 22
23protected: 23protected:
@@ -43,11 +43,12 @@ public:
43private: 43private:
44 void startGui(); 44 void startGui();
45 void readConfig(); 45 void readConfig();
46 void writeConfig(); 46 void writeConfig(bool checkagain);
47 47
48private slots: 48private slots:
49 void yesPressed(); 49 void yesPressed();
50 void noPressed(); 50 void noPressed();
51
51private: 52private:
52 QString mediumPath; 53 QString mediumPath;
53 54
@@ -56,9 +57,9 @@ private:
56 bool checkmimeimage; 57 bool checkmimeimage;
57 bool checkmimetext; 58 bool checkmimetext;
58 bool checkmimevideo; 59 bool checkmimevideo;
59QString limittodirs; 60 QString limittodirs;
60QStringList mimeTypeList; 61 QStringList mimeTypeList;
61 62
62}; 63};
63 64
64#endif \ No newline at end of file 65#endif