- 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
@@ -57,26 +57,28 @@ Profile::ValueList ConfigDialog::list()const {
 void ConfigDialog::slotRemove() {
     ConfigListItem* item = (ConfigListItem*)lstView->currentItem();
     if (!item )
         return;
 
     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)
 	{
 		// if(listView->current()) delete lstView->current(); ...
 		// use dlg.terminal()!
 		new ConfigListItem(lstView, Profile(dlg.prof_name(), dlg.prof_type(), Profile::White, Profile::Black, Profile::VT102));
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
@@ -13,41 +13,43 @@ HEADERS      = io_layer.h io_serial.h \
 	       configwidget.h \
 	       tabwidget.h \
 	       configdialog.h \
                profileeditordialog.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 \
 	       profileconfig.cpp \
 	       profilemanager.cpp  \
 	       tabwidget.cpp \
 	       configdialog.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
@@ -20,25 +20,25 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact,
 {
     initUI();
 
 	// Apply current profile
 	// 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
 {
 	return m_prof;
 }
 
@@ -185,26 +185,31 @@ void ProfileEditorDialog::initUI()
 	vbox2->add(options);
 	QHBoxLayout *hbox4 = new QHBoxLayout(vbox2, 2);
 	hbox4->add(option_wrap);
 	hbox4->add(option_echo);
 
 	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)
 {
 	delete plugin_plugin;
 
 	plugin_plugin = m_fact->newConfigPlugin(prof_type(), plugin_base, m_prof);
@@ -222,24 +227,27 @@ void ProfileEditorDialog::accept()
 {
 	if(prof_name().isEmpty())
 	{
 		QMessageBox::information(this,
 			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();
 }
 
 QString ProfileEditorDialog::prof_name()
 {
 	return name_line->text();
 }
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
@@ -34,25 +34,25 @@ public:
 	 */
 	WidgetLayer( QObject *parent=0, const char *name=0 );
 
 	/**
 	 * 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
 	 */
 	int lines()	{ return m_lines; }
 	
 	/**
@@ -134,25 +134,25 @@ protected:
 	
 	// image operations
 
 	/**
 	 * 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
 	 */
 	void clearImage();
 	
 protected slots: