author | zecke <zecke> | 2002-03-22 16:14:18 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-03-22 16:14:18 (UTC) |
commit | f6f0cd02ceec72a971616de253d736a94a730397 (patch) (side-by-side diff) | |
tree | c89241377d61bd568b5381b0880ac9c04a55d1a8 | |
parent | 3e2720971a92079e56f61ad257ef6c2df2a2b0b4 (diff) | |
download | opie-f6f0cd02ceec72a971616de253d736a94a730397.zip opie-f6f0cd02ceec72a971616de253d736a94a730397.tar.gz opie-f6f0cd02ceec72a971616de253d736a94a730397.tar.bz2 |
make something kewl possible
-rw-r--r-- | core/launcher/launcher.pro | 4 | ||||
-rw-r--r-- | core/launcher/mediummountgui.cpp | 15 | ||||
-rw-r--r-- | core/launcher/mediummountgui.h | 5 |
3 files changed, 15 insertions, 9 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,21 +1,22 @@ 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 \ @@ -38,24 +39,25 @@ HEADERS = background.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 \ @@ -98,16 +100,16 @@ 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 @@ -33,56 +33,57 @@ MediumMountGui::MediumMountGui( const QString &path ,QWidget* parent, const cha 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) { @@ -163,28 +164,30 @@ void MediumMountGui::startGui() { 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 @@ -8,25 +8,25 @@ 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; @@ -34,29 +34,30 @@ protected: 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(); + private: QString mediumPath; bool checkagain; bool checkmimeaudio; bool checkmimeimage; bool checkmimetext; bool checkmimevideo; QString limittodirs; QStringList mimeTypeList; }; |