author | josef <josef> | 2002-10-06 14:45:20 (UTC) |
---|---|---|
committer | josef <josef> | 2002-10-06 14:45:20 (UTC) |
commit | 24393565a48df6bb65516c25c124280724af9a75 (patch) (side-by-side diff) | |
tree | 368ae33e55b6e11d895b2f0988b16eb381fa840c /noncore/apps/opie-console | |
parent | fb0027ea0649aa5bf4c3880dc84df459425c0642 (diff) | |
download | opie-24393565a48df6bb65516c25c124280724af9a75.zip opie-24393565a48df6bb65516c25c124280724af9a75.tar.gz opie-24393565a48df6bb65516c25c124280724af9a75.tar.bz2 |
- more factorization
- use QDialog::accept() instead of applyButtonPressed()
- prepare plugin-specific load/save of data
-rw-r--r-- | noncore/apps/opie-console/configdialog.cpp | 31 | ||||
-rw-r--r-- | noncore/apps/opie-console/profileeditordialog.cpp | 92 | ||||
-rw-r--r-- | noncore/apps/opie-console/profileeditordialog.h | 11 |
3 files changed, 65 insertions, 69 deletions
diff --git a/noncore/apps/opie-console/configdialog.cpp b/noncore/apps/opie-console/configdialog.cpp index d09cec3..23e94b1 100644 --- a/noncore/apps/opie-console/configdialog.cpp +++ b/noncore/apps/opie-console/configdialog.cpp @@ -66,3 +66,8 @@ void ConfigDialog::slotRemove() { void ConfigDialog::slotEdit() { - ProfileEditorDialog dlg(new MetaFactory()); + Profile p; + + // Load profile + // p = currentItem()->profile(); + + ProfileEditorDialog dlg(new MetaFactory(), p); @@ -82,4 +87,2 @@ void ConfigDialog::slotEdit() { void ConfigDialog::slotAdd() { - qWarning("ConfigDialog::slotAdd"); - ProfileEditorDialog dlg(new MetaFactory()); @@ -92,19 +95,9 @@ void ConfigDialog::slotAdd() { { - // defaults - int profile = Profile::VT102; - + // TODO: Move into general profile save part // assignments - QString type = dlg.term_type(); - if(type == "VT102") profile = Profile::VT102; - - // new profile - Profile p(dlg.prof_name(), dlg.prof_type(), Profile::White, Profile::Black, profile); - - // special settings - p.writeEntry("Device", dlg.conn_device()); - p.writeEntry("Baud", dlg.conn_baud()); - p.writeEntry("Parity", dlg.conn_parity()); - p.writeEntry("DataBits", dlg.conn_databits()); - p.writeEntry("StopBits", dlg.conn_stopbits()); - p.writeEntry("Flow", dlg.conn_flow()); + //QString type = dlg.term_type(); + //if(type == "VT102") profile = Profile::VT102; + + // get profile from editor + Profile p = dlg.profile(); diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp index 374844e..aee4051 100644 --- a/noncore/apps/opie-console/profileeditordialog.cpp +++ b/noncore/apps/opie-console/profileeditordialog.cpp @@ -67,2 +67,14 @@ static QWidget *factory_modem(QWidget *parent) +// Something like that must be called upon plugin_plugin->save() +//void save_modem() +//{ +// // special settings +// p.writeEntry("Device", dlg.conn_device()); +// p.writeEntry("Baud", dlg.conn_baud()); +// p.writeEntry("Parity", dlg.conn_parity()); +// p.writeEntry("DataBits", dlg.conn_databits()); +// p.writeEntry("StopBits", dlg.conn_stopbits()); +// p.writeEntry("Flow", dlg.conn_flow()); +//} + ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact, @@ -71,5 +83,7 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact, { -// initUI(); - /* now set the widgets */ + initUI(); + // Apply current profile + // plugin_plugin->load(profile); + // ... (reset profile name line edit etc.) } @@ -79,2 +93,18 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) { + // Default profile + m_prof = Profile("serial", QString::null, Profile::Black, Profile::White, Profile::VT102); + + initUI(); + + // Apply current profile + // plugin_plugin->load(profile); +} + +Profile ProfileEditorDialog::profile() const +{ + return m_prof; +} + +void ProfileEditorDialog::initUI() +{ QWidget *tabterm, *tabconn, *tabprof; @@ -176,2 +206,4 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) + size_small->setChecked(true); + // layouting @@ -227,3 +259,3 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) - connect(this, SIGNAL(applyButtonPressed()), SLOT(slotOk())); + //connect(this, SIGNAL(applyButtonPressed()), SLOT(slotOk())); connect(this, SIGNAL(defaultButtonPressed()), SLOT(slotOk())); @@ -245,6 +277,11 @@ void ProfileEditorDialog::slotDevice(int id) + // Reload profile associated to device, including e.g. conn_device() + // m_prof = plugin_plugin->profile() + // or, keeping the profile name: m_prof->reload(plugin_plugin->profile()) + plugin_plugin->show(); + // This would be: plugin_plugin->widget()->show(); } -void ProfileEditorDialog::slotOk() +void ProfileEditorDialog::accept() { @@ -258,3 +295,6 @@ void ProfileEditorDialog::slotOk() - accept(); + // Save profile and plugin profile + //if(plugin_plugin) plugin_plugin->save(); + + QDialog::accept(); } @@ -273,14 +313,5 @@ QString ProfileEditorDialog::prof_type() { - switch(device_box->currentItem()) - { - case 0: - return "serial"; - break; - case 1: - return "irda"; - break; - case 2: - return "modem"; - break; - } + QStringList w = m_fact->configWidgets(); + for(QStringList::Iterator it = w.begin(); it != w.end(); it++) + if(device_box->currentText() == m_fact->name((*it))) return (*it); @@ -292,28 +323,3 @@ QString ProfileEditorDialog::conn_device() //return frame_device_line->text(); - return "serial"; -} - -int ProfileEditorDialog::conn_baud() -{ - return speed_box->currentText().toInt(); -} - -int ProfileEditorDialog::conn_parity() -{ - return 0; -} - -int ProfileEditorDialog::conn_databits() -{ - return 0; -} - -int ProfileEditorDialog::conn_stopbits() -{ - return 0; -} - -int ProfileEditorDialog::conn_flow() -{ - return 0; + return "/dev/ttyS0"; } diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h index 00f3c99..8ebfba1 100644 --- a/noncore/apps/opie-console/profileeditordialog.h +++ b/noncore/apps/opie-console/profileeditordialog.h @@ -28,7 +28,2 @@ public: QString conn_device(); - int conn_baud(); - int conn_parity(); - int conn_databits(); - int conn_stopbits(); - int conn_flow(); @@ -37,3 +32,4 @@ public: public slots: - void slotOk(); + void accept(); + //void slotOk(); void slotCancel(); @@ -43,3 +39,4 @@ public slots: private: - //void initUI(); + void initUI(); + MetaFactory* m_fact; |