-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 | |||
@@ -67,6 +67,8 @@ void ConfigDialog::slotEdit() { | |||
67 | Profile p; | 67 | Profile p; |
68 | 68 | ||
69 | if(!lstView->currentItem()) return; | ||
70 | |||
69 | // Load profile | 71 | // Load profile |
70 | // p = currentItem()->profile(); | 72 | p = ((ConfigListItem*)lstView->currentItem())->profile(); |
71 | 73 | ||
72 | ProfileEditorDialog dlg(new MetaFactory(), p); | 74 | 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 | |||
@@ -23,5 +23,6 @@ HEADERS = io_layer.h io_serial.h \ | |||
23 | screen.h \ | 23 | screen.h \ |
24 | keytrans.h \ | 24 | keytrans.h \ |
25 | widget_layer.h | 25 | widget_layer.h \ |
26 | transferdialog.h | ||
26 | 27 | ||
27 | SOURCES = io_layer.cpp io_serial.cpp \ | 28 | SOURCES = io_layer.cpp io_serial.cpp \ |
@@ -44,5 +45,6 @@ SOURCES = io_layer.cpp io_serial.cpp \ | |||
44 | screen.cpp \ | 45 | screen.cpp \ |
45 | keytrans.cpp \ | 46 | keytrans.cpp \ |
46 | widget_layer.cpp | 47 | widget_layer.cpp \ |
48 | transferdialog.cpp | ||
47 | 49 | ||
48 | INTERFACES = configurebase.ui editbase.ui | 50 | INTERFACES = configurebase.ui editbase.ui |
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 | |||
@@ -30,5 +30,5 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) | |||
30 | { | 30 | { |
31 | // Default profile | 31 | // Default profile |
32 | m_prof = Profile("serial", QString::null, Profile::Black, Profile::White, Profile::VT102); | 32 | m_prof = Profile(QString::null, "serial", Profile::Black, Profile::White, Profile::VT102); |
33 | 33 | ||
34 | initUI(); | 34 | initUI(); |
@@ -195,6 +195,11 @@ void ProfileEditorDialog::initUI() | |||
195 | setCancelButton(QObject::tr("Cancel")); | 195 | setCancelButton(QObject::tr("Cancel")); |
196 | 196 | ||
197 | connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel())); | 197 | // load profile values |
198 | |||
199 | name_line->setText(m_prof.name()); | ||
200 | |||
201 | // signals | ||
198 | 202 | ||
203 | connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel())); | ||
199 | connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int))); | 204 | connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int))); |
200 | } | 205 | } |
@@ -232,4 +237,7 @@ void ProfileEditorDialog::accept() | |||
232 | if(plugin_plugin) plugin_plugin->save(); | 237 | if(plugin_plugin) plugin_plugin->save(); |
233 | 238 | ||
239 | // Save general values | ||
240 | m_prof.setName(prof_name()); | ||
241 | |||
234 | QDialog::accept(); | 242 | QDialog::accept(); |
235 | } | 243 | } |
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 | |||
@@ -44,5 +44,5 @@ public: | |||
44 | * sets the image | 44 | * sets the image |
45 | */ | 45 | */ |
46 | virtual void setImage( const Character* const newimg, int lines, int colums ); | 46 | virtual void setImage( const Character* const newimg, int lines, int colums ) = 0; |
47 | 47 | ||
48 | /** | 48 | /** |
@@ -144,5 +144,5 @@ protected: | |||
144 | * | 144 | * |
145 | */ | 145 | */ |
146 | virtual void calcGeometry(); | 146 | virtual void calcGeometry() = 0; |
147 | 147 | ||
148 | /** | 148 | /** |