summaryrefslogtreecommitdiff
authorjosef <josef>2002-10-07 10:02:58 (UTC)
committer josef <josef>2002-10-07 10:02:58 (UTC)
commit46171dcd991e8c3bfff8e662b3913f454714560a (patch) (side-by-side diff)
treec596e53f6b308ffef0f2da1ccf538c79693bd5e5
parentd4c3a54affe5497b84e48f52d411391818790cba (diff)
downloadopie-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?)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/configdialog.cpp4
-rw-r--r--noncore/apps/opie-console/opie-console.pro6
-rw-r--r--noncore/apps/opie-console/profileeditordialog.cpp12
-rw-r--r--noncore/apps/opie-console/widget_layer.h4
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
@@ -66,8 +66,10 @@ void ConfigDialog::slotRemove() {
void ConfigDialog::slotEdit() {
Profile p;
+ if(!lstView->currentItem()) return;
+
// Load profile
- // p = currentItem()->profile();
+ p = ((ConfigListItem*)lstView->currentItem())->profile();
ProfileEditorDialog dlg(new MetaFactory(), p);
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
@@ -22,7 +22,8 @@ HEADERS = io_layer.h io_serial.h \
history.h \
screen.h \
keytrans.h \
- widget_layer.h
+ widget_layer.h \
+ transferdialog.h
SOURCES = io_layer.cpp io_serial.cpp \
file_layer.cpp sz_transfer.cpp \
@@ -43,7 +44,8 @@ SOURCES = io_layer.cpp io_serial.cpp \
history.cpp \
screen.cpp \
keytrans.cpp \
- widget_layer.cpp
+ widget_layer.cpp \
+ transferdialog.cpp
INTERFACES = configurebase.ui editbase.ui
INCLUDEPATH += $(OPIEDIR)/include
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
@@ -29,7 +29,7 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
: QTabDialog(0, 0, TRUE), m_fact( 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);
initUI();
@@ -194,8 +194,13 @@ void ProfileEditorDialog::initUI()
setOkButton(QObject::tr("OK"));
setCancelButton(QObject::tr("Cancel"));
- 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)));
}
@@ -231,6 +236,9 @@ void ProfileEditorDialog::accept()
// Save profile and plugin profile
if(plugin_plugin) plugin_plugin->save();
+ // 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
@@ -43,7 +43,7 @@ public:
/**
* sets the image
*/
- virtual void setImage( const Character* const newimg, int lines, int colums );
+ virtual void setImage( const Character* const newimg, int lines, int colums ) = 0;
/**
* annoy the user
@@ -143,7 +143,7 @@ protected:
/**
*
*/
- virtual void calcGeometry();
+ virtual void calcGeometry() = 0;
/**
* makes an empty image