- 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
@@ -61,18 +61,20 @@ void ConfigDialog::slotRemove() {
 
     lstView->takeItem( item );
     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();
 
 	if(ret == QDialog::Accepted)
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
@@ -17,17 +17,18 @@ HEADERS      = io_layer.h io_serial.h \
 			   profileeditorplugins.h \
                emulation_layer.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 \
 	       mainwindow.cpp \
 	       profile.cpp \
@@ -38,16 +39,17 @@ SOURCES      = io_layer.cpp io_serial.cpp \
 	       profileeditordialog.cpp \
 		   profileeditorplugins.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
@@ -24,17 +24,17 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact,
 	// plugin_plugin->load(profile);
 	// ... (reset profile name line edit etc.)
 }
 
 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);
 }
 
 Profile ProfileEditorDialog::profile() const
@@ -189,18 +189,23 @@ void ProfileEditorDialog::initUI()
 
 	addTab(tabprof, QObject::tr("Profile"));
 	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() {
 
 }
 
 void ProfileEditorDialog::slotDevice(int id)
@@ -226,16 +231,19 @@ void ProfileEditorDialog::accept()
 			QObject::tr("Invalid profile"),
 			QObject::tr("Please enter a profile name."));
 		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
@@ -38,17 +38,17 @@ public:
 	 * destructor
 	 */
 	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();
 
 	/**
 	 * return the lines count
@@ -138,17 +138,17 @@ protected:
 	 * changes image, to suit new size
 	 * TODO: find meaningful name!
 	 */
 	void propagateSize();
 
 	/**
 	 *
 	 */
-	virtual void calcGeometry();
+	virtual void calcGeometry() = 0;
 
 	/**
 	 * makes an empty image
 	 */
 	void makeImage();
 
 	/**
 	 * clears the image