-rw-r--r-- | noncore/apps/opie-console/MyPty.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/opie-console/configdialog.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/emulation_handler.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/opie-console/filereceive.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/filetransfer.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_bt.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_irda.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_serial.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/opie-console/iolayerbase.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/opie-console/metafactory.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/procctl.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/profile.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/profileconfig.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/profileeditordialog.cpp | 7 | ||||
-rw-r--r-- | noncore/apps/opie-console/profilemanager.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/session.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/tabwidget.cpp | 1 |
18 files changed, 3 insertions, 55 deletions
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp index ae01392..b6ae1d9 100644 --- a/noncore/apps/opie-console/MyPty.cpp +++ b/noncore/apps/opie-console/MyPty.cpp | |||
@@ -113,9 +113,8 @@ void MyPty::donePty() | |||
113 | 113 | ||
114 | ::close(m_fd); | 114 | ::close(m_fd); |
115 | 115 | ||
116 | if (m_cpid) { | 116 | if (m_cpid) { |
117 | qWarning("killing!!!"); | ||
118 | kill(m_cpid, SIGHUP); | 117 | kill(m_cpid, SIGHUP); |
119 | //waitpid(m_cpid, &status, 0); | 118 | //waitpid(m_cpid, &status, 0); |
120 | delete m_sn_e; | 119 | delete m_sn_e; |
121 | m_sn_e = 0l; | 120 | m_sn_e = 0l; |
@@ -133,9 +132,8 @@ const char* MyPty::deviceName() | |||
133 | 132 | ||
134 | 133 | ||
135 | void MyPty::error() | 134 | void MyPty::error() |
136 | { | 135 | { |
137 | qWarning("error"); | ||
138 | // This is code from the Qt DumbTerminal example | 136 | // This is code from the Qt DumbTerminal example |
139 | donePty(); | 137 | donePty(); |
140 | } | 138 | } |
141 | 139 | ||
@@ -267,9 +265,8 @@ void MyPty::reload( const Profile& ) { | |||
267 | } | 265 | } |
268 | /*! sends len bytes through the line */ | 266 | /*! sends len bytes through the line */ |
269 | void MyPty::send(const QByteArray& ar) | 267 | void MyPty::send(const QByteArray& ar) |
270 | { | 268 | { |
271 | qWarning("sending!"); | ||
272 | #ifdef VERBOSE_DEBUG | 269 | #ifdef VERBOSE_DEBUG |
273 | // verbose debug | 270 | // verbose debug |
274 | printf("sending bytes:\n"); | 271 | printf("sending bytes:\n"); |
275 | for (uint i = 0; i < ar.count(); i++) | 272 | for (uint i = 0; i < ar.count(); i++) |
@@ -282,17 +279,14 @@ void MyPty::send(const QByteArray& ar) | |||
282 | 279 | ||
283 | /*! indicates that a block of data is received */ | 280 | /*! indicates that a block of data is received */ |
284 | void MyPty::readPty() | 281 | void MyPty::readPty() |
285 | { | 282 | { |
286 | qWarning("read"); | ||
287 | QByteArray buf(4096); | 283 | QByteArray buf(4096); |
288 | 284 | ||
289 | int len = ::read( m_fd, buf.data(), 4096 ); | 285 | int len = ::read( m_fd, buf.data(), 4096 ); |
290 | 286 | ||
291 | if (len == -1 || len == 0) { | 287 | if (len == -1 || len == 0) { |
292 | qWarning("donePty!!! now!"); | ||
293 | donePty(); | 288 | donePty(); |
294 | qWarning("return %s", sender()->className() ); | ||
295 | delete sender(); | 289 | delete sender(); |
296 | return; | 290 | return; |
297 | } | 291 | } |
298 | 292 | ||
diff --git a/noncore/apps/opie-console/configdialog.cpp b/noncore/apps/opie-console/configdialog.cpp index 8745305..0bc6588 100644 --- a/noncore/apps/opie-console/configdialog.cpp +++ b/noncore/apps/opie-console/configdialog.cpp | |||
@@ -91,9 +91,8 @@ void ConfigDialog::slotEdit() { | |||
91 | } | 91 | } |
92 | 92 | ||
93 | 93 | ||
94 | void ConfigDialog::slotAdd() { | 94 | void ConfigDialog::slotAdd() { |
95 | qWarning("slotAdd"); | ||
96 | ProfileEditorDialog dlg(m_fact); | 95 | ProfileEditorDialog dlg(m_fact); |
97 | 96 | ||
98 | dlg.setCaption("New Connection"); | 97 | dlg.setCaption("New Connection"); |
99 | dlg.showMaximized(); | 98 | dlg.showMaximized(); |
diff --git a/noncore/apps/opie-console/emulation_handler.cpp b/noncore/apps/opie-console/emulation_handler.cpp index 836a05b..b2cd348 100644 --- a/noncore/apps/opie-console/emulation_handler.cpp +++ b/noncore/apps/opie-console/emulation_handler.cpp | |||
@@ -36,13 +36,11 @@ void EmulationHandler::load( const Profile& prof) { | |||
36 | setColor( foreColor(num), backColor(num) ); | 36 | setColor( foreColor(num), backColor(num) ); |
37 | m_teWid->setBackgroundColor(backColor(num) ); | 37 | m_teWid->setBackgroundColor(backColor(num) ); |
38 | } | 38 | } |
39 | void EmulationHandler::recv( const QByteArray& ar) { | 39 | void EmulationHandler::recv( const QByteArray& ar) { |
40 | qWarning("received in EmulationHandler!"); | ||
41 | m_teEmu->onRcvBlock(ar.data(), ar.count() ); | 40 | m_teEmu->onRcvBlock(ar.data(), ar.count() ); |
42 | } | 41 | } |
43 | void EmulationHandler::recvEmulation(const char* src, int len ) { | 42 | void EmulationHandler::recvEmulation(const char* src, int len ) { |
44 | qWarning("received from te "); | ||
45 | QByteArray ar(len); | 43 | QByteArray ar(len); |
46 | 44 | ||
47 | memcpy(ar.data(), src, sizeof(char) * len ); | 45 | memcpy(ar.data(), src, sizeof(char) * len ); |
48 | 46 | ||
@@ -98,14 +96,12 @@ QColor EmulationHandler::foreColor(int col) { | |||
98 | /* we need to switch it */ | 96 | /* we need to switch it */ |
99 | switch( col ) { | 97 | switch( col ) { |
100 | default: | 98 | default: |
101 | case Profile::White: | 99 | case Profile::White: |
102 | qWarning("Foreground black"); | ||
103 | /* color is black */ | 100 | /* color is black */ |
104 | co = Qt::white; | 101 | co = Qt::white; |
105 | break; | 102 | break; |
106 | case Profile::Black: | 103 | case Profile::Black: |
107 | qWarning("Foreground white"); | ||
108 | co = Qt::black; | 104 | co = Qt::black; |
109 | break; | 105 | break; |
110 | case Profile::Green: | 106 | case Profile::Green: |
111 | qWarning("Foreground green"); | 107 | qWarning("Foreground green"); |
@@ -125,14 +121,12 @@ QColor EmulationHandler::backColor(int col ) { | |||
125 | /* we need to switch it */ | 121 | /* we need to switch it */ |
126 | switch( col ) { | 122 | switch( col ) { |
127 | default: | 123 | default: |
128 | case Profile::White: | 124 | case Profile::White: |
129 | qWarning("Background white"); | ||
130 | /* color is white */ | 125 | /* color is white */ |
131 | co = Qt::black; | 126 | co = Qt::black; |
132 | break; | 127 | break; |
133 | case Profile::Black: | 128 | case Profile::Black: |
134 | qWarning("Background black"); | ||
135 | co = Qt::white; | 129 | co = Qt::white; |
136 | break; | 130 | break; |
137 | case Profile::Green: | 131 | case Profile::Green: |
138 | qWarning("Background black"); | 132 | qWarning("Background black"); |
diff --git a/noncore/apps/opie-console/filereceive.cpp b/noncore/apps/opie-console/filereceive.cpp index 26b3dec..e517862 100644 --- a/noncore/apps/opie-console/filereceive.cpp +++ b/noncore/apps/opie-console/filereceive.cpp | |||
@@ -134,15 +134,13 @@ void FileReceive::setupChild() { | |||
134 | } | 134 | } |
135 | void FileReceive::slotRead() { | 135 | void FileReceive::slotRead() { |
136 | QByteArray ar(4096); | 136 | QByteArray ar(4096); |
137 | int len = read(m_comm[0], ar.data(), 4096 ); | 137 | int len = read(m_comm[0], ar.data(), 4096 ); |
138 | qWarning("slot read %d", len); | ||
139 | for (int i = 0; i < len; i++ ) { | 138 | for (int i = 0; i < len; i++ ) { |
140 | // printf("%c", ar[i] ); | 139 | // printf("%c", ar[i] ); |
141 | } | 140 | } |
142 | ar.resize( len ); | 141 | ar.resize( len ); |
143 | QString str( ar ); | 142 | QString str( ar ); |
144 | qWarning(str.simplifyWhiteSpace() ); | ||
145 | } | 143 | } |
146 | void FileReceive::slotExec() { | 144 | void FileReceive::slotExec() { |
147 | char buf[2]; | 145 | char buf[2]; |
148 | ::read(m_term[0], buf, 1 ); | 146 | ::read(m_term[0], buf, 1 ); |
diff --git a/noncore/apps/opie-console/filetransfer.cpp b/noncore/apps/opie-console/filetransfer.cpp index 8ca0df2..b81c2a2 100644 --- a/noncore/apps/opie-console/filetransfer.cpp +++ b/noncore/apps/opie-console/filetransfer.cpp | |||
@@ -52,9 +52,8 @@ void FileTransfer::sendFile( const QString& file ) { | |||
52 | slotExec(); | 52 | slotExec(); |
53 | break; | 53 | break; |
54 | case 0:{ | 54 | case 0:{ |
55 | setupChild(); | 55 | setupChild(); |
56 | qWarning("output:"+file ); | ||
57 | /* exec */ | 56 | /* exec */ |
58 | char* verbose = "-vv"; | 57 | char* verbose = "-vv"; |
59 | char* binray = "-b"; | 58 | char* binray = "-b"; |
60 | 59 | ||
@@ -165,21 +164,18 @@ void FileTransfer::setupChild() { | |||
165 | */ | 164 | */ |
166 | void FileTransfer::slotRead() { | 165 | void FileTransfer::slotRead() { |
167 | QByteArray ar(4096); | 166 | QByteArray ar(4096); |
168 | int len = read(m_comm[0], ar.data(), 4096 ); | 167 | int len = read(m_comm[0], ar.data(), 4096 ); |
169 | qWarning("slot read %d", len); | ||
170 | for (int i = 0; i < len; i++ ) { | 168 | for (int i = 0; i < len; i++ ) { |
171 | // printf("%c", ar[i] ); | 169 | // printf("%c", ar[i] ); |
172 | } | 170 | } |
173 | ar.resize( len ); | 171 | ar.resize( len ); |
174 | QString str( ar ); | 172 | QString str( ar ); |
175 | qWarning(str.simplifyWhiteSpace() ); | ||
176 | QStringList lis = QStringList::split(' ', str ); | 173 | QStringList lis = QStringList::split(' ', str ); |
177 | /* | 174 | /* |
178 | * Transfer finished.. either complete or incomplete | 175 | * Transfer finished.. either complete or incomplete |
179 | */ | 176 | */ |
180 | if ( lis[0].simplifyWhiteSpace() == "Transfer" ) { | 177 | if ( lis[0].simplifyWhiteSpace() == "Transfer" ) { |
181 | qWarning("sent!!!!"); | ||
182 | return; | 178 | return; |
183 | } | 179 | } |
184 | /* | 180 | /* |
185 | * do progress reading | 181 | * do progress reading |
@@ -213,9 +209,8 @@ void FileTransfer::slotProgress( const QStringList& list ) { | |||
213 | if (!complete || total == 0) { | 209 | if (!complete || total == 0) { |
214 | return; | 210 | return; |
215 | } | 211 | } |
216 | 212 | ||
217 | qWarning("%s, %d, %d", progi.join("/").latin1(), sent, total ); | ||
218 | 213 | ||
219 | double pro = (double)sent/total; | 214 | double pro = (double)sent/total; |
220 | int prog = pro * 100; | 215 | int prog = pro * 100; |
221 | 216 | ||
@@ -239,9 +234,8 @@ void FileTransfer::cancel() { | |||
239 | if(m_pid > 0) ::kill(m_pid,9 ); | 234 | if(m_pid > 0) ::kill(m_pid,9 ); |
240 | 235 | ||
241 | } | 236 | } |
242 | void FileTransfer::slotExec() { | 237 | void FileTransfer::slotExec() { |
243 | qWarning("exited!"); | ||
244 | char buf[2]; | 238 | char buf[2]; |
245 | ::read(m_term[0], buf, 1 ); | 239 | ::read(m_term[0], buf, 1 ); |
246 | delete m_proc; | 240 | delete m_proc; |
247 | delete m_not; | 241 | delete m_not; |
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp index 8bff4df..0831faf 100644 --- a/noncore/apps/opie-console/io_bt.cpp +++ b/noncore/apps/opie-console/io_bt.cpp | |||
@@ -35,8 +35,9 @@ bool IOBt::open() { | |||
35 | IOSerial::open(); | 35 | IOSerial::open(); |
36 | } else { | 36 | } else { |
37 | qWarning("could not attach to device"); | 37 | qWarning("could not attach to device"); |
38 | delete m_attach; | 38 | delete m_attach; |
39 | m_attach = 0; | ||
39 | } | 40 | } |
40 | } | 41 | } |
41 | 42 | ||
42 | void IOBt::reload( const Profile &config ) { | 43 | void IOBt::reload( const Profile &config ) { |
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp index 8e31e82..56a373c 100644 --- a/noncore/apps/opie-console/io_irda.cpp +++ b/noncore/apps/opie-console/io_irda.cpp | |||
@@ -31,10 +31,12 @@ bool IOIrda::open() { | |||
31 | 31 | ||
32 | if ( m_attach->start() ) { | 32 | if ( m_attach->start() ) { |
33 | IOSerial::open(); | 33 | IOSerial::open(); |
34 | } else { | 34 | } else { |
35 | // emit error!!! | ||
35 | qWarning("could not attach to device"); | 36 | qWarning("could not attach to device"); |
36 | delete m_attach; | 37 | delete m_attach; |
38 | m_attach = 0l; | ||
37 | } | 39 | } |
38 | } | 40 | } |
39 | 41 | ||
40 | void IOIrda::reload( const Profile &config ) { | 42 | void IOIrda::reload( const Profile &config ) { |
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp index 03f1b1a..a4a6f0b 100644 --- a/noncore/apps/opie-console/io_serial.cpp +++ b/noncore/apps/opie-console/io_serial.cpp | |||
@@ -26,9 +26,8 @@ void IOSerial::send(const QByteArray &data) { | |||
26 | } | 26 | } |
27 | } | 27 | } |
28 | 28 | ||
29 | void IOSerial::close() { | 29 | void IOSerial::close() { |
30 | qWarning("closing!"); | ||
31 | if (m_fd) { | 30 | if (m_fd) { |
32 | delete m_read; | 31 | delete m_read; |
33 | delete m_error; | 32 | delete m_error; |
34 | ::close(m_fd); | 33 | ::close(m_fd); |
@@ -38,24 +37,20 @@ void IOSerial::close() { | |||
38 | } | 37 | } |
39 | } | 38 | } |
40 | 39 | ||
41 | bool IOSerial::open() { | 40 | bool IOSerial::open() { |
42 | qWarning("open"); | ||
43 | if (!m_fd) { | 41 | if (!m_fd) { |
44 | qWarning("going to open %s", m_device.latin1()); | ||
45 | struct termios tty; | 42 | struct termios tty; |
46 | m_fd = ::open(m_device, O_RDWR | O_NOCTTY | O_NONBLOCK); | 43 | m_fd = ::open(m_device, O_RDWR | O_NOCTTY | O_NONBLOCK); |
47 | if (m_fd < 0) { | 44 | if (m_fd < 0) { |
48 | qWarning(" fd < 0 "); | ||
49 | emit error(CouldNotOpen, strerror(errno)); | 45 | emit error(CouldNotOpen, strerror(errno)); |
50 | return FALSE; | 46 | return FALSE; |
51 | } | 47 | } |
52 | tcgetattr(m_fd, &tty); | 48 | tcgetattr(m_fd, &tty); |
53 | 49 | ||
54 | /* Baud rate */ | 50 | /* Baud rate */ |
55 | int speed = baud(m_baud); | 51 | int speed = baud(m_baud); |
56 | if (speed == -1) { | 52 | if (speed == -1) { |
57 | qWarning("speed -1"); | ||
58 | emit error(Refuse, tr("Invalid baud rate")); | 53 | emit error(Refuse, tr("Invalid baud rate")); |
59 | } | 54 | } |
60 | cfsetospeed(&tty, speed); | 55 | cfsetospeed(&tty, speed); |
61 | cfsetispeed(&tty, speed); | 56 | cfsetispeed(&tty, speed); |
@@ -117,19 +112,16 @@ bool IOSerial::open() { | |||
117 | connect(m_read, SIGNAL(activated(int)), this, SLOT(dataArrived())); | 112 | connect(m_read, SIGNAL(activated(int)), this, SLOT(dataArrived())); |
118 | connect(m_error, SIGNAL(activated(int)), this, SLOT(errorOccured())); | 113 | connect(m_error, SIGNAL(activated(int)), this, SLOT(errorOccured())); |
119 | return TRUE; | 114 | return TRUE; |
120 | } else { | 115 | } else { |
121 | qWarning(" already opened"); | ||
122 | emit error(Refuse, tr("Device is already connected")); | 116 | emit error(Refuse, tr("Device is already connected")); |
123 | m_fd = 0; | 117 | m_fd = 0; |
124 | return FALSE; | 118 | return FALSE; |
125 | } | 119 | } |
126 | } | 120 | } |
127 | 121 | ||
128 | void IOSerial::reload(const Profile &config) { | 122 | void IOSerial::reload(const Profile &config) { |
129 | m_device = config.readEntry("Device", SERIAL_DEFAULT_DEVICE); | 123 | m_device = config.readEntry("Device", SERIAL_DEFAULT_DEVICE); |
130 | qWarning( "Dev" +m_device ); | ||
131 | qWarning( "Conf:" +config.readEntry("Device") ); | ||
132 | m_baud = config.readNumEntry("Speed", SERIAL_DEFAULT_BAUD); | 124 | m_baud = config.readNumEntry("Speed", SERIAL_DEFAULT_BAUD); |
133 | m_parity = config.readNumEntry("Parity", SERIAL_DEFAULT_PARITY); | 125 | m_parity = config.readNumEntry("Parity", SERIAL_DEFAULT_PARITY); |
134 | m_dbits = config.readNumEntry("DataBits", SERIAL_DEFAULT_DBITS); | 126 | m_dbits = config.readNumEntry("DataBits", SERIAL_DEFAULT_DBITS); |
135 | m_sbits = config.readNumEntry("StopBits", SERIAL_DEFAULT_SBITS); | 127 | m_sbits = config.readNumEntry("StopBits", SERIAL_DEFAULT_SBITS); |
diff --git a/noncore/apps/opie-console/iolayerbase.cpp b/noncore/apps/opie-console/iolayerbase.cpp index 49ed284..b0df02d 100644 --- a/noncore/apps/opie-console/iolayerbase.cpp +++ b/noncore/apps/opie-console/iolayerbase.cpp | |||
@@ -128,15 +128,12 @@ void IOLayerBase::setSpeed( Speed sp ) { | |||
128 | m_speedBox->setCurrentItem(index ); | 128 | m_speedBox->setCurrentItem(index ); |
129 | } | 129 | } |
130 | IOLayerBase::Flow IOLayerBase::flow()const { | 130 | IOLayerBase::Flow IOLayerBase::flow()const { |
131 | if (m_flowHw->isChecked() ) { | 131 | if (m_flowHw->isChecked() ) { |
132 | qWarning("Hardware flow"); | ||
133 | return Hardware; | 132 | return Hardware; |
134 | }else if( m_flowSw->isChecked() ) { | 133 | }else if( m_flowSw->isChecked() ) { |
135 | qWarning("Software"); | ||
136 | return Software; | 134 | return Software; |
137 | } else { | 135 | } else { |
138 | qWarning("None"); | ||
139 | return None; | 136 | return None; |
140 | } | 137 | } |
141 | } | 138 | } |
142 | IOLayerBase::Parity IOLayerBase::parity()const { | 139 | IOLayerBase::Parity IOLayerBase::parity()const { |
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index b770551..94c99bc 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -262,9 +262,8 @@ QList<Session> MainWindow::sessions() { | |||
262 | return m_sessions; | 262 | return m_sessions; |
263 | } | 263 | } |
264 | 264 | ||
265 | void MainWindow::slotNew() { | 265 | void MainWindow::slotNew() { |
266 | qWarning("New Connection"); | ||
267 | ProfileEditorDialog dlg(factory() ); | 266 | ProfileEditorDialog dlg(factory() ); |
268 | dlg.showMaximized(); | 267 | dlg.showMaximized(); |
269 | int ret = dlg.exec(); | 268 | int ret = dlg.exec(); |
270 | 269 | ||
@@ -338,16 +337,14 @@ void MainWindow::slotTerminate() { | |||
338 | /* FIXME move to the next session */ | 337 | /* FIXME move to the next session */ |
339 | } | 338 | } |
340 | 339 | ||
341 | void MainWindow::slotConfigure() { | 340 | void MainWindow::slotConfigure() { |
342 | qWarning("configure"); | ||
343 | ConfigDialog conf( manager()->all(), factory() ); | 341 | ConfigDialog conf( manager()->all(), factory() ); |
344 | conf.showMaximized(); | 342 | conf.showMaximized(); |
345 | 343 | ||
346 | int ret = conf.exec(); | 344 | int ret = conf.exec(); |
347 | 345 | ||
348 | if ( QDialog::Accepted == ret ) { | 346 | if ( QDialog::Accepted == ret ) { |
349 | qWarning("conf %d", conf.list().count() ); | ||
350 | manager()->setProfiles( conf.list() ); | 347 | manager()->setProfiles( conf.list() ); |
351 | manager()->save(); | 348 | manager()->save(); |
352 | populateProfiles(); | 349 | populateProfiles(); |
353 | } | 350 | } |
@@ -359,9 +356,8 @@ void MainWindow::slotConfigure() { | |||
359 | * delete it | 356 | * delete it |
360 | * and set the currentSession() | 357 | * and set the currentSession() |
361 | */ | 358 | */ |
362 | void MainWindow::slotClose() { | 359 | void MainWindow::slotClose() { |
363 | qWarning("close"); | ||
364 | if (!currentSession() ) | 360 | if (!currentSession() ) |
365 | return; | 361 | return; |
366 | 362 | ||
367 | tabWidget()->remove( currentSession() ); | 363 | tabWidget()->remove( currentSession() ); |
@@ -437,9 +433,8 @@ void MainWindow::slotOpenKeb(bool state) { | |||
437 | 433 | ||
438 | } | 434 | } |
439 | void MainWindow::slotSessionChanged( Session* ses ) { | 435 | void MainWindow::slotSessionChanged( Session* ses ) { |
440 | if ( ses ) { | 436 | if ( ses ) { |
441 | qWarning("changing %s", ses->name().latin1() ); | ||
442 | m_curSession = ses; | 437 | m_curSession = ses; |
443 | 438 | ||
444 | if ( m_curSession->isConnected() ) { | 439 | if ( m_curSession->isConnected() ) { |
445 | m_connect->setEnabled( false ); | 440 | m_connect->setEnabled( false ); |
diff --git a/noncore/apps/opie-console/metafactory.cpp b/noncore/apps/opie-console/metafactory.cpp index 09ba586..04a5dfa 100644 --- a/noncore/apps/opie-console/metafactory.cpp +++ b/noncore/apps/opie-console/metafactory.cpp | |||
@@ -119,9 +119,8 @@ ProfileDialogWidget *MetaFactory::newConnectionPlugin ( const QString& str, QWid | |||
119 | ProfileDialogWidget *MetaFactory::newTerminalPlugin( const QString& str, QWidget *parent) { | 119 | ProfileDialogWidget *MetaFactory::newTerminalPlugin( const QString& str, QWidget *parent) { |
120 | if (str.isEmpty() ) | 120 | if (str.isEmpty() ) |
121 | return 0l; | 121 | return 0l; |
122 | ProfileDialogWidget* wid = 0l; | 122 | ProfileDialogWidget* wid = 0l; |
123 | qWarning("new terminalPlugin %s %l", str.latin1(), parent ); | ||
124 | 123 | ||
125 | QMap<QString, configWidget>::Iterator it; | 124 | QMap<QString, configWidget>::Iterator it; |
126 | it = m_termFact.find( str ); | 125 | it = m_termFact.find( str ); |
127 | if ( it != m_termFact.end() ) { | 126 | if ( it != m_termFact.end() ) { |
diff --git a/noncore/apps/opie-console/procctl.cpp b/noncore/apps/opie-console/procctl.cpp index d1cfaf6..ff6bea8 100644 --- a/noncore/apps/opie-console/procctl.cpp +++ b/noncore/apps/opie-console/procctl.cpp | |||
@@ -70,9 +70,8 @@ int ProcCtl::status(pid_t pid )const{ | |||
70 | } | 70 | } |
71 | return -1; | 71 | return -1; |
72 | } | 72 | } |
73 | void ProcCtl::signal_handler(int) { | 73 | void ProcCtl::signal_handler(int) { |
74 | qWarning("signal handler in ProcCtl"); | ||
75 | int status; | 74 | int status; |
76 | signal( SIGCHLD, signal_handler ); | 75 | signal( SIGCHLD, signal_handler ); |
77 | pid_t pi = waitpid( -1, &status, WNOHANG ); | 76 | pid_t pi = waitpid( -1, &status, WNOHANG ); |
78 | 77 | ||
diff --git a/noncore/apps/opie-console/profile.cpp b/noncore/apps/opie-console/profile.cpp index ffd672e..1a94619 100644 --- a/noncore/apps/opie-console/profile.cpp +++ b/noncore/apps/opie-console/profile.cpp | |||
@@ -77,13 +77,11 @@ void Profile::setTerminal( int term ) { | |||
77 | void Profile::clearConf() { | 77 | void Profile::clearConf() { |
78 | m_conf.clear(); | 78 | m_conf.clear(); |
79 | } | 79 | } |
80 | void Profile::writeEntry( const QString& key, const QString& value ) { | 80 | void Profile::writeEntry( const QString& key, const QString& value ) { |
81 | qWarning("key %s value %s", key.latin1(), value.latin1() ); | ||
82 | m_conf.replace( key, value ); | 81 | m_conf.replace( key, value ); |
83 | } | 82 | } |
84 | void Profile::writeEntry( const QString& key, int num ) { | 83 | void Profile::writeEntry( const QString& key, int num ) { |
85 | qWarning("num"); | ||
86 | writeEntry( key, QString::number( num ) ); | 84 | writeEntry( key, QString::number( num ) ); |
87 | } | 85 | } |
88 | void Profile::writeEntry( const QString& key, bool b ) { | 86 | void Profile::writeEntry( const QString& key, bool b ) { |
89 | writeEntry( key, QString::number(b) ); | 87 | writeEntry( key, QString::number(b) ); |
diff --git a/noncore/apps/opie-console/profileconfig.cpp b/noncore/apps/opie-console/profileconfig.cpp index 732fae7..bd089c8 100644 --- a/noncore/apps/opie-console/profileconfig.cpp +++ b/noncore/apps/opie-console/profileconfig.cpp | |||
@@ -11,9 +11,8 @@ ProfileConfig::~ProfileConfig() { | |||
11 | QStringList ProfileConfig::groups()const { | 11 | QStringList ProfileConfig::groups()const { |
12 | QStringList list; | 12 | QStringList list; |
13 | QMap<QString, ConfigGroup>::ConstIterator it; | 13 | QMap<QString, ConfigGroup>::ConstIterator it; |
14 | it= Config::groups.begin(); | 14 | it= Config::groups.begin(); |
15 | qWarning("config %d", Config::groups.count() ); | ||
16 | 15 | ||
17 | for (; it != Config::groups.end(); ++it ) | 16 | for (; it != Config::groups.end(); ++it ) |
18 | list << it.key(); | 17 | list << it.key(); |
19 | 18 | ||
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp index 094c871..b709cf3 100644 --- a/noncore/apps/opie-console/profileeditordialog.cpp +++ b/noncore/apps/opie-console/profileeditordialog.cpp | |||
@@ -114,12 +114,8 @@ void ProfileEditorDialog::initUI() | |||
114 | slotTermActivated( m_fact->external(m_prof.terminalName() ) ); | 114 | slotTermActivated( m_fact->external(m_prof.terminalName() ) ); |
115 | setCurrent( m_fact->external(m_prof.ioLayerName() ), m_conCmb ); | 115 | setCurrent( m_fact->external(m_prof.ioLayerName() ), m_conCmb ); |
116 | setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb ); | 116 | setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb ); |
117 | 117 | ||
118 | qWarning("Layer: %s %s", m_prof.ioLayerName().data(), | ||
119 | m_fact->external(m_prof.ioLayerName() ).latin1() ); | ||
120 | qWarning("Term: %s %s", m_prof.terminalName().data(), | ||
121 | m_fact->external(m_prof.terminalName() ).latin1() ); | ||
122 | 118 | ||
123 | // signal and slots | 119 | // signal and slots |
124 | connect(m_conCmb, SIGNAL(activated(const QString& ) ), | 120 | connect(m_conCmb, SIGNAL(activated(const QString& ) ), |
125 | this, SLOT(slotConActivated(const QString&) ) ); | 121 | this, SLOT(slotConActivated(const QString&) ) ); |
@@ -146,10 +142,8 @@ void ProfileEditorDialog::accept() | |||
146 | // Save general values | 142 | // Save general values |
147 | m_prof.setName(profName()); | 143 | m_prof.setName(profName()); |
148 | m_prof.setIOLayer( m_fact->internal(m_conCmb ->currentText() ) ); | 144 | m_prof.setIOLayer( m_fact->internal(m_conCmb ->currentText() ) ); |
149 | m_prof.setTerminalName( m_fact->internal(m_termCmb->currentText() ) ); | 145 | m_prof.setTerminalName( m_fact->internal(m_termCmb->currentText() ) ); |
150 | qWarning("Term %s %s", m_fact->internal(m_termCmb->currentText() ).data(), | ||
151 | m_termCmb->currentText().latin1() ); | ||
152 | 146 | ||
153 | if (m_con ) | 147 | if (m_con ) |
154 | m_con->save( m_prof ); | 148 | m_con->save( m_prof ); |
155 | if (m_term ) | 149 | if (m_term ) |
@@ -189,9 +183,8 @@ void ProfileEditorDialog::slotConActivated( const QString& str ) { | |||
189 | */ | 183 | */ |
190 | void ProfileEditorDialog::slotTermActivated( const QString& str ) { | 184 | void ProfileEditorDialog::slotTermActivated( const QString& str ) { |
191 | delete m_term; | 185 | delete m_term; |
192 | m_term = m_fact->newTerminalPlugin( str, m_tabTerm ); | 186 | m_term = m_fact->newTerminalPlugin( str, m_tabTerm ); |
193 | qWarning("past"); | ||
194 | 187 | ||
195 | if (m_term) { | 188 | if (m_term) { |
196 | m_term->load(m_prof ); | 189 | m_term->load(m_prof ); |
197 | m_layTerm->addWidget( m_term ); | 190 | m_layTerm->addWidget( m_term ); |
diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp index 95a46f9..e5aedb6 100644 --- a/noncore/apps/opie-console/profilemanager.cpp +++ b/noncore/apps/opie-console/profilemanager.cpp | |||
@@ -23,24 +23,21 @@ ProfileManager::~ProfileManager() { | |||
23 | 23 | ||
24 | } | 24 | } |
25 | void ProfileManager::load() { | 25 | void ProfileManager::load() { |
26 | m_list.clear(); | 26 | m_list.clear(); |
27 | qWarning("load"); | ||
28 | ProfileConfig conf("opie-console-profiles"); | 27 | ProfileConfig conf("opie-console-profiles"); |
29 | QStringList groups = conf.groups(); | 28 | QStringList groups = conf.groups(); |
30 | QStringList::Iterator it; | 29 | QStringList::Iterator it; |
31 | 30 | ||
32 | /* | 31 | /* |
33 | * for each profile | 32 | * for each profile |
34 | */ | 33 | */ |
35 | for ( it = groups.begin(); it != groups.end(); ++it ) { | 34 | for ( it = groups.begin(); it != groups.end(); ++it ) { |
36 | qWarning("group " + (*it) ); | ||
37 | conf.setGroup( (*it) ); | 35 | conf.setGroup( (*it) ); |
38 | Profile prof; | 36 | Profile prof; |
39 | prof.setName( conf.readEntry("name") ); | 37 | prof.setName( conf.readEntry("name") ); |
40 | prof.setIOLayer( conf.readEntry("iolayer").utf8() ); | 38 | prof.setIOLayer( conf.readEntry("iolayer").utf8() ); |
41 | prof.setTerminalName( conf.readEntry("term").utf8() ); | 39 | prof.setTerminalName( conf.readEntry("term").utf8() ); |
42 | qWarning(" %s %s", conf.readEntry("iolayer").latin1(), prof.ioLayerName().data() ); | ||
43 | prof.setBackground( conf.readNumEntry("back") ); | 40 | prof.setBackground( conf.readNumEntry("back") ); |
44 | prof.setForeground( conf.readNumEntry("fore") ); | 41 | prof.setForeground( conf.readNumEntry("fore") ); |
45 | prof.setTerminal( conf.readNumEntry("terminal") ); | 42 | prof.setTerminal( conf.readNumEntry("terminal") ); |
46 | 43 | ||
@@ -120,9 +117,8 @@ void ProfileManager::save( ) { | |||
120 | } | 117 | } |
121 | 118 | ||
122 | conf.writeEntry( "name", (*it2).name() ); | 119 | conf.writeEntry( "name", (*it2).name() ); |
123 | QString str = QString::fromUtf8( (*it2).ioLayerName() ); | 120 | QString str = QString::fromUtf8( (*it2).ioLayerName() ); |
124 | qWarning("IOLayerName " + str ); | ||
125 | 121 | ||
126 | conf.writeEntry( "iolayer", str ); | 122 | conf.writeEntry( "iolayer", str ); |
127 | conf.writeEntry( "term", QString::fromUtf8( (*it2).terminalName() ) ); | 123 | conf.writeEntry( "term", QString::fromUtf8( (*it2).terminalName() ) ); |
128 | conf.writeEntry( "back", (*it2).background() ); | 124 | conf.writeEntry( "back", (*it2).background() ); |
diff --git a/noncore/apps/opie-console/session.cpp b/noncore/apps/opie-console/session.cpp index d0ace6c..e53dbc4 100644 --- a/noncore/apps/opie-console/session.cpp +++ b/noncore/apps/opie-console/session.cpp | |||
@@ -46,9 +46,8 @@ void Session::connect() { | |||
46 | return; | 46 | return; |
47 | 47 | ||
48 | m_connected = true; | 48 | m_connected = true; |
49 | 49 | ||
50 | qWarning("connection in session"); | ||
51 | QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ), | 50 | QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ), |
52 | m_emu, SLOT(recv(const QByteArray&) ) ); | 51 | m_emu, SLOT(recv(const QByteArray&) ) ); |
53 | QObject::connect(m_emu, SIGNAL(send(const QByteArray&) ), | 52 | QObject::connect(m_emu, SIGNAL(send(const QByteArray&) ), |
54 | m_layer, SLOT(send(const QByteArray&) ) ); | 53 | m_layer, SLOT(send(const QByteArray&) ) ); |
diff --git a/noncore/apps/opie-console/tabwidget.cpp b/noncore/apps/opie-console/tabwidget.cpp index 466b536..8a691f9 100644 --- a/noncore/apps/opie-console/tabwidget.cpp +++ b/noncore/apps/opie-console/tabwidget.cpp | |||
@@ -11,9 +11,8 @@ TabWidget::~TabWidget() { | |||
11 | } | 11 | } |
12 | 12 | ||
13 | void TabWidget::add( Session* ses ) { | 13 | void TabWidget::add( Session* ses ) { |
14 | if ( !ses->widgetStack() ) return; | 14 | if ( !ses->widgetStack() ) return; |
15 | qWarning("going to add it"); | ||
16 | //reparent( ses->widgetStack(), QPoint() ); | 15 | //reparent( ses->widgetStack(), QPoint() ); |
17 | addTab( ses->widgetStack(), "console/konsole", ses->name() ); | 16 | addTab( ses->widgetStack(), "console/konsole", ses->name() ); |
18 | //addTab( ses->widgetStack(), ses->name() ); | 17 | //addTab( ses->widgetStack(), ses->name() ); |
19 | m_map.insert( ses->widgetStack(), ses ); | 18 | m_map.insert( ses->widgetStack(), ses ); |