- load profiles correctly when editing them

- save their general values after editing them
- fix compilation of widget_layer (temporary workaround?)

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
@@ -63,14 +63,16 @@ void ConfigDialog::slotRemove() {
     delete item;
 }
 
 void ConfigDialog::slotEdit() {
         Profile p;
 
+        if(!lstView->currentItem()) return;
+
         // Load profile
-        // p = currentItem()->profile();
+        p = ((ConfigListItem*)lstView->currentItem())->profile();
 
         ProfileEditorDialog dlg(new MetaFactory(), p);
 
         dlg.setCaption("Edit Connection Profile");
         dlg.showMaximized();
         int ret = dlg.exec();
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
@@ -19,13 +19,14 @@ HEADERS      = io_layer.h io_serial.h \
                widget.h \
                vt102emulation.h \
                common.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 \
            main.cpp \
                metafactory.cpp \
                session.cpp \
@@ -40,13 +41,14 @@ SOURCES      = io_layer.cpp io_serial.cpp \
                emulation_layer.cpp \
                widget.cpp \
                vt102emulation.cpp \
                history.cpp \
                screen.cpp \
                keytrans.cpp \
-               widget_layer.cpp
+               widget_layer.cpp \
+                   transferdialog.cpp
    
 INTERFACES   = configurebase.ui editbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopie
 TARGET       = opie-console
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
@@ -26,13 +26,13 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact,
 }
 
 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();
 
         // Apply current profile
         // plugin_plugin->load(profile);
 }
@@ -191,14 +191,19 @@ void ProfileEditorDialog::initUI()
         addTab(tabconn, QObject::tr("Connection"));
         addTab(tabterm, QObject::tr("Terminal"));
 
         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)));
 }
 
 ProfileEditorDialog::~ProfileEditorDialog() {
 
 }
@@ -228,12 +233,15 @@ void ProfileEditorDialog::accept()
                 return;
         }
 
         // Save profile and plugin profile
         if(plugin_plugin) plugin_plugin->save();
 
+        // Save general values
+        m_prof.setName(prof_name());
+
         QDialog::accept();
 }
 
 void ProfileEditorDialog::slotCancel()
 {
         reject();
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
@@ -40,13 +40,13 @@ public:
         virtual ~WidgetLayer();
 
 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
          */
         void bell();
 
@@ -140,13 +140,13 @@ protected:
          */
         void propagateSize();
 
         /**
          *
          */
-        virtual void calcGeometry();
+        virtual void calcGeometry() = 0;
 
         /**
          * makes an empty image
          */
         void makeImage();