-rw-r--r-- | core/launcher/launcher.cpp | 8 | ||||
-rw-r--r-- | core/launcher/mediummountgui.cpp | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index 979eee6..d1df4cc 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -79,37 +79,37 @@ | |||
79 | namespace { | 79 | namespace { |
80 | QStringList configToMime( Config *cfg ){ | 80 | QStringList configToMime( Config *cfg ){ |
81 | QStringList mimes; | 81 | QStringList mimes; |
82 | bool tmpMime; | 82 | bool tmpMime; |
83 | cfg->setGroup("mimetypes" ); | 83 | cfg->setGroup("mimetypes" ); |
84 | tmpMime = cfg->readBoolEntry("all" ,false); | 84 | tmpMime = cfg->readBoolEntry("all" ,false); |
85 | if( tmpMime ){ | 85 | if( tmpMime ){ |
86 | mimes << QString::null; | 86 | mimes << QString::null; |
87 | return mimes; | 87 | return mimes; |
88 | }else{ | 88 | }else{ |
89 | tmpMime = cfg->readBoolEntry("audio", true ); | 89 | tmpMime = cfg->readBoolEntry("audio", true ); |
90 | if(tmpMime ) | 90 | if(tmpMime ) |
91 | mimes.append("audio//*" ); | 91 | mimes.append("audio/*" ); |
92 | 92 | ||
93 | tmpMime = cfg->readBoolEntry("image", true ); | 93 | tmpMime = cfg->readBoolEntry("image", true ); |
94 | if(tmpMime ) | 94 | if(tmpMime ) |
95 | mimes.append("image//*" ); | 95 | mimes.append("image/*" ); |
96 | 96 | ||
97 | tmpMime = cfg->readBoolEntry("text", true ); | 97 | tmpMime = cfg->readBoolEntry("text", true ); |
98 | if(tmpMime ) | 98 | if(tmpMime ) |
99 | mimes.append("text//*"); | 99 | mimes.append("text/*"); |
100 | 100 | ||
101 | tmpMime = cfg->readBoolEntry("video", true ); | 101 | tmpMime = cfg->readBoolEntry("video", true ); |
102 | if(tmpMime ) | 102 | if(tmpMime ) |
103 | mimes.append("video//*" ); | 103 | mimes.append("video/*" ); |
104 | } | 104 | } |
105 | return mimes; | 105 | return mimes; |
106 | } | 106 | } |
107 | 107 | ||
108 | } | 108 | } |
109 | 109 | ||
110 | 110 | ||
111 | CategoryTabWidget::CategoryTabWidget( QWidget* parent ) : | 111 | CategoryTabWidget::CategoryTabWidget( QWidget* parent ) : |
112 | QVBox( parent ) | 112 | QVBox( parent ) |
113 | { | 113 | { |
114 | categoryBar = 0; | 114 | categoryBar = 0; |
115 | stack = 0; | 115 | stack = 0; |
diff --git a/core/launcher/mediummountgui.cpp b/core/launcher/mediummountgui.cpp index f0de85b..e0acf4e 100644 --- a/core/launcher/mediummountgui.cpp +++ b/core/launcher/mediummountgui.cpp | |||
@@ -77,38 +77,34 @@ void MediumMountGui::writeConfig(bool autocheck) { | |||
77 | cfg.writeEntry("all",CheckBoxAll->isChecked() ); | 77 | cfg.writeEntry("all",CheckBoxAll->isChecked() ); |
78 | 78 | ||
79 | cfg.setGroup("dirs"); | 79 | cfg.setGroup("dirs"); |
80 | cfg.writeEntry("dirs", ""); | 80 | cfg.writeEntry("dirs", ""); |
81 | 81 | ||
82 | 82 | ||
83 | // if all is checked then add only "QString::null" to the list. | 83 | // if all is checked then add only "QString::null" to the list. |
84 | if (checkmimeall) { | 84 | if (checkmimeall) { |
85 | mimeTypeList.clear(); | 85 | mimeTypeList.clear(); |
86 | mimeTypeList += QString::null; | 86 | mimeTypeList += QString::null; |
87 | } else { | 87 | } else { |
88 | if (checkmimeaudio) { | 88 | if (checkmimeaudio) { |
89 | mimeTypeList += ("audio//*"); | 89 | mimeTypeList += ("audio/*"); |
90 | } | 90 | } |
91 | if (checkmimetext) { | 91 | if (checkmimetext) { |
92 | mimeTypeList += ("text//*"); | 92 | mimeTypeList += ("text/*"); |
93 | } | 93 | } |
94 | if (checkmimevideo) { | 94 | if (checkmimevideo) { |
95 | mimeTypeList += ("video//*"); | 95 | mimeTypeList += ("video/*"); |
96 | } | 96 | } |
97 | if (checkmimeimage) { | 97 | if (checkmimeimage) { |
98 | mimeTypeList += ("image//*"); | 98 | mimeTypeList += ("image/*"); |
99 | } | ||
100 | if (checkmimeall) { | ||
101 | mimeTypeList.clear(); | ||
102 | mimeTypeList << QString::null; | ||
103 | } | 99 | } |
104 | } | 100 | } |
105 | cfg.write(); // not really needed here but just to be sure | 101 | cfg.write(); // not really needed here but just to be sure |
106 | } | 102 | } |
107 | 103 | ||
108 | void MediumMountGui::startGui() { | 104 | void MediumMountGui::startGui() { |
109 | 105 | ||
110 | QPixmap image = Resource::loadPixmap( "HelpBrowser"); | 106 | QPixmap image = Resource::loadPixmap( "HelpBrowser"); |
111 | 107 | ||
112 | Text_2 = new QLabel( this ); | 108 | Text_2 = new QLabel( this ); |
113 | Text_2->setGeometry( QRect( 10, 15, 40, 40 ) ); | 109 | Text_2->setGeometry( QRect( 10, 15, 40, 40 ) ); |
114 | Text_2->setPixmap( image ); | 110 | Text_2->setPixmap( image ); |