summaryrefslogtreecommitdiff
authorjosef <josef>2002-10-07 10:02:58 (UTC)
committer josef <josef>2002-10-07 10:02:58 (UTC)
commit46171dcd991e8c3bfff8e662b3913f454714560a (patch) (unidiff)
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
@@ -63,14 +63,16 @@ void ConfigDialog::slotRemove() {
63 delete item; 63 delete item;
64} 64}
65 65
66void ConfigDialog::slotEdit() { 66void 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);
73 75
74 dlg.setCaption("Edit Connection Profile"); 76 dlg.setCaption("Edit Connection Profile");
75 dlg.showMaximized(); 77 dlg.showMaximized();
76 int ret = dlg.exec(); 78 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 \
19 widget.h \ 19 widget.h \
20 vt102emulation.h \ 20 vt102emulation.h \
21 common.h \ 21 common.h \
22 history.h \ 22 history.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
27SOURCES = io_layer.cpp io_serial.cpp \ 28SOURCES = io_layer.cpp io_serial.cpp \
28 file_layer.cpp sz_transfer.cpp \ 29 file_layer.cpp sz_transfer.cpp \
29 main.cpp \ 30 main.cpp \
30 metafactory.cpp \ 31 metafactory.cpp \
31 session.cpp \ 32 session.cpp \
@@ -40,13 +41,14 @@ SOURCES = io_layer.cpp io_serial.cpp \
40 emulation_layer.cpp \ 41 emulation_layer.cpp \
41 widget.cpp \ 42 widget.cpp \
42 vt102emulation.cpp \ 43 vt102emulation.cpp \
43 history.cpp \ 44 history.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
48INTERFACES = configurebase.ui editbase.ui 50INTERFACES = configurebase.ui editbase.ui
49INCLUDEPATH += $(OPIEDIR)/include 51INCLUDEPATH += $(OPIEDIR)/include
50DEPENDPATH += $(OPIEDIR)/include 52DEPENDPATH += $(OPIEDIR)/include
51LIBS += -lqpe -lopie 53LIBS += -lqpe -lopie
52TARGET = opie-console 54TARGET = 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,
26} 26}
27 27
28ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact ) 28ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
29 : QTabDialog(0, 0, TRUE), m_fact( fact ) 29 : QTabDialog(0, 0, TRUE), m_fact( 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();
35 35
36 // Apply current profile 36 // Apply current profile
37 // plugin_plugin->load(profile); 37 // plugin_plugin->load(profile);
38} 38}
@@ -191,14 +191,19 @@ void ProfileEditorDialog::initUI()
191 addTab(tabconn, QObject::tr("Connection")); 191 addTab(tabconn, QObject::tr("Connection"));
192 addTab(tabterm, QObject::tr("Terminal")); 192 addTab(tabterm, QObject::tr("Terminal"));
193 193
194 setOkButton(QObject::tr("OK")); 194 setOkButton(QObject::tr("OK"));
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}
201 206
202ProfileEditorDialog::~ProfileEditorDialog() { 207ProfileEditorDialog::~ProfileEditorDialog() {
203 208
204} 209}
@@ -228,12 +233,15 @@ void ProfileEditorDialog::accept()
228 return; 233 return;
229 } 234 }
230 235
231 // Save profile and plugin profile 236 // Save profile and plugin profile
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}
236 244
237void ProfileEditorDialog::slotCancel() 245void ProfileEditorDialog::slotCancel()
238{ 246{
239 reject(); 247 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:
40 virtual ~WidgetLayer(); 40 virtual ~WidgetLayer();
41 41
42public: 42public:
43 /** 43 /**
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 /**
49 * annoy the user 49 * annoy the user
50 */ 50 */
51 void bell(); 51 void bell();
52 52
@@ -140,13 +140,13 @@ protected:
140 */ 140 */
141 void propagateSize(); 141 void propagateSize();
142 142
143 /** 143 /**
144 * 144 *
145 */ 145 */
146 virtual void calcGeometry(); 146 virtual void calcGeometry() = 0;
147 147
148 /** 148 /**
149 * makes an empty image 149 * makes an empty image
150 */ 150 */
151 void makeImage(); 151 void makeImage();
152 152