author | josef <josef> | 2002-10-07 10:02:58 (UTC) |
---|---|---|
committer | josef <josef> | 2002-10-07 10:02:58 (UTC) |
commit | 46171dcd991e8c3bfff8e662b3913f454714560a (patch) (side-by-side diff) | |
tree | c596e53f6b308ffef0f2da1ccf538c79693bd5e5 /noncore/apps/opie-console | |
parent | d4c3a54affe5497b84e48f52d411391818790cba (diff) | |
download | opie-46171dcd991e8c3bfff8e662b3913f454714560a.zip opie-46171dcd991e8c3bfff8e662b3913f454714560a.tar.gz opie-46171dcd991e8c3bfff8e662b3913f454714560a.tar.bz2 |
- load profiles correctly when editing them
- save their general values after editing them
- fix compilation of widget_layer (temporary workaround?)
-rw-r--r-- | noncore/apps/opie-console/configdialog.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/opie-console.pro | 6 | ||||
-rw-r--r-- | noncore/apps/opie-console/profileeditordialog.cpp | 12 | ||||
-rw-r--r-- | noncore/apps/opie-console/widget_layer.h | 4 |
4 files changed, 19 insertions, 7 deletions
diff --git a/noncore/apps/opie-console/configdialog.cpp b/noncore/apps/opie-console/configdialog.cpp index 23e94b1..655d649 100644 --- a/noncore/apps/opie-console/configdialog.cpp +++ b/noncore/apps/opie-console/configdialog.cpp @@ -68,4 +68,6 @@ void ConfigDialog::slotEdit() { + if(!lstView->currentItem()) return; + // Load profile - // p = currentItem()->profile(); + p = ((ConfigListItem*)lstView->currentItem())->profile(); diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro index 6d70dfd..768e453 100644 --- a/noncore/apps/opie-console/opie-console.pro +++ b/noncore/apps/opie-console/opie-console.pro @@ -24,3 +24,4 @@ HEADERS = io_layer.h io_serial.h \ keytrans.h \ - widget_layer.h + widget_layer.h \ + transferdialog.h @@ -45,3 +46,4 @@ SOURCES = io_layer.cpp io_serial.cpp \ keytrans.cpp \ - widget_layer.cpp + widget_layer.cpp \ + transferdialog.cpp diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp index fbe0f23..fc95e56 100644 --- a/noncore/apps/opie-console/profileeditordialog.cpp +++ b/noncore/apps/opie-console/profileeditordialog.cpp @@ -31,3 +31,3 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) // Default profile - m_prof = Profile("serial", QString::null, Profile::Black, Profile::White, Profile::VT102); + m_prof = Profile(QString::null, "serial", Profile::Black, Profile::White, Profile::VT102); @@ -196,4 +196,9 @@ void ProfileEditorDialog::initUI() - connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel())); + // load profile values + + name_line->setText(m_prof.name()); + + // signals + connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel())); connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int))); @@ -233,2 +238,5 @@ void ProfileEditorDialog::accept() + // Save general values + m_prof.setName(prof_name()); + QDialog::accept(); diff --git a/noncore/apps/opie-console/widget_layer.h b/noncore/apps/opie-console/widget_layer.h index 3cdd6aa..07ec12a 100644 --- a/noncore/apps/opie-console/widget_layer.h +++ b/noncore/apps/opie-console/widget_layer.h @@ -45,3 +45,3 @@ public: */ - virtual void setImage( const Character* const newimg, int lines, int colums ); + virtual void setImage( const Character* const newimg, int lines, int colums ) = 0; @@ -145,3 +145,3 @@ protected: */ - virtual void calcGeometry(); + virtual void calcGeometry() = 0; |