summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -1,73 +1,75 @@
TEMPLATE = app
CONFIG = qt warn_on release
DESTDIR = $(OPIEDIR)/bin
HEADERS = background.h \
desktop.h \
qprocess.h \
+ mediummountgui.h \
info.h \
appicons.h \
taskbar.h \
sidething.h \
mrulist.h \
stabmon.h \
inputmethods.h \
systray.h \
wait.h \
shutdownimpl.h \
launcher.h \
launcherview.h \
../calibrate/calibrate.h \
startmenu.h \
transferserver.h \
qcopbridge.h \
packageslave.h \
irserver.h \
$(OPIEDIR)/rsync/buf.h \
$(OPIEDIR)/rsync/checksum.h \
$(OPIEDIR)/rsync/command.h \
$(OPIEDIR)/rsync/emit.h \
$(OPIEDIR)/rsync/job.h \
$(OPIEDIR)/rsync/netint.h \
$(OPIEDIR)/rsync/protocol.h \
$(OPIEDIR)/rsync/prototab.h \
$(OPIEDIR)/rsync/rsync.h \
$(OPIEDIR)/rsync/search.h \
$(OPIEDIR)/rsync/stream.h \
$(OPIEDIR)/rsync/sumset.h \
$(OPIEDIR)/rsync/trace.h \
$(OPIEDIR)/rsync/types.h \
$(OPIEDIR)/rsync/util.h \
$(OPIEDIR)/rsync/whole.h \
$(OPIEDIR)/rsync/config_rsync.h \
$(OPIEDIR)/rsync/qrsync.h
# quicklauncher.h \
SOURCES = background.cpp \
desktop.cpp \
+ mediummountgui.cpp \
qprocess.cpp qprocess_unix.cpp \
info.cpp \
appicons.cpp \
taskbar.cpp \
sidething.cpp \
mrulist.cpp \
stabmon.cpp \
inputmethods.cpp \
systray.cpp \
wait.cpp \
shutdownimpl.cpp \
launcher.cpp \
launcherview.cpp \
$(OPIEDIR)/calibrate/calibrate.cpp \
transferserver.cpp \
packageslave.cpp \
irserver.cpp \
qcopbridge.cpp \
startmenu.cpp \
main.cpp \
$(OPIEDIR)/rsync/base64.c \
$(OPIEDIR)/rsync/buf.c \
$(OPIEDIR)/rsync/checksum.c \
$(OPIEDIR)/rsync/command.c \
@@ -86,28 +88,28 @@ SOURCES = background.cpp \
$(OPIEDIR)/rsync/search.c \
$(OPIEDIR)/rsync/stats.c \
$(OPIEDIR)/rsync/stream.c \
$(OPIEDIR)/rsync/sumset.c \
$(OPIEDIR)/rsync/trace.c \
$(OPIEDIR)/rsync/tube.c \
$(OPIEDIR)/rsync/util.c \
$(OPIEDIR)/rsync/version.c \
$(OPIEDIR)/rsync/whole.c \
$(OPIEDIR)/rsync/qrsync.cpp
INTERFACES = shutdown.ui syncdialog.ui
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include .
INCLUDEPATH += $(OPIEDIR)/calibrate
DEPENDPATH += $(OPIEDIR)/calibrate
INCLUDEPATH += $(OPIEDIR)/rsync
DEPENDPATH += $(OPIEDIR)/rsync
TARGET = qpe
-LIBS += -lqpe -lcrypt
+LIBS += -lqpe -lcrypt -lopie
TRANSLATIONS = ../i18n/de/qpe.ts
TRANSLATIONS += ../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
@@ -21,80 +21,81 @@
MediumMountGui::MediumMountGui( const QString &path ,QWidget* parent, const char* name, bool modal, WFlags fl )
: QDialog( parent, name, modal, fl ) {
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);
+ checkmimeaudio = cfg.readBoolEntry("audio", true);
checkmimeimage = cfg.readBoolEntry("image", true);
checkmimetext = cfg.readBoolEntry("text", true);
checkmimevideo = cfg.readBoolEntry("video", true);
cfg.setGroup("dirs");
- limittodirs = cfg.readEntry("dirs", "/");
+ limittodirs = cfg.readEntry("dirs", "");
}
bool MediumMountGui::check() {
return checkagain;
}
QStringList MediumMountGui::dirs() {
QStringList list = QStringList::split(",", limittodirs );
return list;
}
-void MediumMountGui::writeConfig() {
+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.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 );
@@ -151,40 +152,42 @@ void MediumMountGui::startGui() {
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();
+ writeConfig(true);
// and do something
+ accept();
}
QStringList MediumMountGui::mimeTypes(){
return mimeTypeList;
}
void MediumMountGui::noPressed() {
- close();
+ writeConfig(false);
+ reject();
}
MediumMountGui::~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
@@ -1,64 +1,65 @@
#ifndef MEDIUMMOUNTGUI_H
#define MEDIUMMOUNTGUI_H
#include <qvariant.h>
#include <qdialog.h>
class QVBoxLayout;
class QHBoxLayout;
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( 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();
+ void writeConfig(bool checkagain);
private slots:
- void yesPressed();
- void noPressed();
+ void yesPressed();
+ void noPressed();
+
private:
QString mediumPath;
bool checkagain;
bool checkmimeaudio;
bool checkmimeimage;
bool checkmimetext;
bool checkmimevideo;
-QString limittodirs;
-QStringList mimeTypeList;
+ QString limittodirs;
+ QStringList mimeTypeList;
};
-#endif \ No newline at end of file
+#endif