summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/launcher.cpp8
-rw-r--r--core/launcher/mediummountgui.cpp12
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
@@ -43,109 +43,109 @@
#include <qlayout.h>
#include <qstyle.h>
#include <qpushbutton.h>
#include <qtabbar.h>
#include <qwidgetstack.h>
#include <qlayout.h>
#include <qregexp.h>
#include <qmessagebox.h>
#include <qframe.h>
#include <qpainter.h>
#include <qlabel.h>
#include <qtextstream.h>
#include "launcherview.h"
#include "launcher.h"
#include "syncdialog.h"
#include "desktop.h"
#include <qpe/lnkproperties.h>
#include "mrulist.h"
#include "qrsync.h"
#include <stdlib.h>
#include <unistd.h>
#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
#include <stdio.h>
#include <sys/vfs.h>
#include <mntent.h>
#endif
#include <qpe/storage.h>
#include "mediummountgui.h"
//#define SHOW_ALL
// uidGen
// uidGen
namespace {
QStringList configToMime( Config *cfg ){
QStringList mimes;
bool tmpMime;
cfg->setGroup("mimetypes" );
tmpMime = cfg->readBoolEntry("all" ,false);
if( tmpMime ){
mimes << QString::null;
return mimes;
}else{
tmpMime = cfg->readBoolEntry("audio", true );
if(tmpMime )
- mimes.append("audio//*" );
+ mimes.append("audio/*" );
tmpMime = cfg->readBoolEntry("image", true );
if(tmpMime )
- mimes.append("image//*" );
+ mimes.append("image/*" );
tmpMime = cfg->readBoolEntry("text", true );
if(tmpMime )
- mimes.append("text//*");
+ mimes.append("text/*");
tmpMime = cfg->readBoolEntry("video", true );
if(tmpMime )
- mimes.append("video//*" );
+ mimes.append("video/*" );
}
return mimes;
}
}
CategoryTabWidget::CategoryTabWidget( QWidget* parent ) :
QVBox( parent )
{
categoryBar = 0;
stack = 0;
}
void CategoryTabWidget::prevTab()
{
if ( categoryBar ) {
int n = categoryBar->count();
int tab = categoryBar->currentTab();
if ( tab >= 0 )
categoryBar->setCurrentTab( (tab - 1 + n)%n );
}
}
void CategoryTabWidget::nextTab()
{
if ( categoryBar ) {
int n = categoryBar->count();
int tab = categoryBar->currentTab();
categoryBar->setCurrentTab( (tab + 1)%n );
}
}
void CategoryTabWidget::addItem( const QString& linkfile )
{
int i=0;
AppLnk *app = new AppLnk(linkfile);
if ( !app->isValid() ) {
delete app;
return;
}
if ( !app->file().isEmpty() ) {
// A document
delete app;
app = new DocLnk(linkfile);
((LauncherView*)(stack->widget(ids.count()-1)))->addItem(app);
return;
}
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
@@ -41,110 +41,106 @@ void MediumMountGui::readConfig(){
cfg.setGroup("main");
checkagain = cfg.readBoolEntry("check", false);
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() {
return !checkagain;
}
QStringList MediumMountGui::dirs() {
QStringList list = QStringList::split(",", limittodirs );
return list;
}
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 all is checked then add only "QString::null" to the list.
if (checkmimeall) {
mimeTypeList.clear();
mimeTypeList += QString::null;
} else {
if (checkmimeaudio) {
- mimeTypeList += ("audio//*");
+ mimeTypeList += ("audio/*");
}
if (checkmimetext) {
- mimeTypeList += ("text//*");
+ mimeTypeList += ("text/*");
}
if (checkmimevideo) {
- mimeTypeList += ("video//*");
+ mimeTypeList += ("video/*");
}
if (checkmimeimage) {
- mimeTypeList += ("image//*");
- }
- if (checkmimeall) {
- mimeTypeList.clear();
- mimeTypeList << QString::null;
+ mimeTypeList += ("image/*");
}
}
cfg.write(); // not really needed here but just to be sure
}
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, 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" ) );
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" );
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" ) );