summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp24
-rw-r--r--noncore/apps/opie-console/session.cpp10
-rw-r--r--noncore/apps/opie-console/session.h5
-rw-r--r--noncore/apps/opie-console/transferdialog.cpp15
-rw-r--r--noncore/apps/opie-console/transferdialog.h2
5 files changed, 46 insertions, 10 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index c44b359..5f6dc12 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -534,6 +534,9 @@ void MainWindow::slotProfile( int id) {
534 create( prof ); 534 create( prof );
535} 535}
536void MainWindow::create( const Profile& prof ) { 536void MainWindow::create( const Profile& prof ) {
537 if(m_curSession)
538 if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide();
539
537 Session *ses = manager()->fromProfile( prof, tabWidget() ); 540 Session *ses = manager()->fromProfile( prof, tabWidget() );
538 541
539 if((!ses) || (!ses->layer()) || (!ses->widgetStack())) 542 if((!ses) || (!ses->layer()) || (!ses->widgetStack()))
@@ -578,10 +581,15 @@ void MainWindow::create( const Profile& prof ) {
578void MainWindow::slotTransfer() 581void MainWindow::slotTransfer()
579{ 582{
580 if ( currentSession() ) { 583 if ( currentSession() ) {
581 TransferDialog dlg(currentSession()->widgetStack(), this); 584 Session *mysession = currentSession();
582 dlg.showMaximized(); 585 TransferDialog dlg(mysession->widgetStack(), this);
586 mysession->setTransferDialog(&dlg);
587 dlg.show();
588 //dlg.showMaximized();
583 //currentSession()->widgetStack()->add(dlg); 589 //currentSession()->widgetStack()->add(dlg);
584 dlg.exec(); 590 //dlg.exec();
591 while(dlg.isRunning()) qApp->processEvents();
592 mysession->setTransferDialog(0l);
585 } 593 }
586} 594}
587 595
@@ -607,6 +615,12 @@ void MainWindow::slotOpenButtons( bool state ) {
607 615
608void MainWindow::slotSessionChanged( Session* ses ) { 616void MainWindow::slotSessionChanged( Session* ses ) {
609 qWarning("changed!"); 617 qWarning("changed!");
618
619 if(m_curSession)
620 if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide();
621 if(ses)
622 if(ses->transferDialog()) ses->transferDialog()->show();
623
610 if ( ses ) { 624 if ( ses ) {
611 m_curSession = ses; 625 m_curSession = ses;
612 qDebug(QString("is connected : %1").arg( m_curSession->layer()->isConnected() ) ); 626 qDebug(QString("is connected : %1").arg( m_curSession->layer()->isConnected() ) );
@@ -630,10 +644,6 @@ void MainWindow::slotSessionChanged( Session* ses ) {
630 m_transfer->setEnabled( true ); 644 m_transfer->setEnabled( true );
631 } 645 }
632 646
633
634
635
636
637 QWidget *w = m_curSession->widget(); 647 QWidget *w = m_curSession->widget();
638 if(w) w->setFocus(); 648 if(w) w->setFocus();
639 649
diff --git a/noncore/apps/opie-console/session.cpp b/noncore/apps/opie-console/session.cpp
index c166d95..4f52584 100644
--- a/noncore/apps/opie-console/session.cpp
+++ b/noncore/apps/opie-console/session.cpp
@@ -11,6 +11,7 @@ Session::Session() {
11 m_widget = 0l; 11 m_widget = 0l;
12 m_layer = 0l; 12 m_layer = 0l;
13 m_emu = 0l; 13 m_emu = 0l;
14 m_transfer = 0l;
14} 15}
15Session::Session( const QString& na, QWidgetStack* widget, IOLayer* lay) 16Session::Session( const QString& na, QWidgetStack* widget, IOLayer* lay)
16 : m_name( na ), m_widget( widget ), m_layer( lay ) 17 : m_name( na ), m_widget( widget ), m_layer( lay )
@@ -104,4 +105,13 @@ void Session::setEmulationWidget( WidgetLayer* lay ) {
104 m_widLay = lay; 105 m_widLay = lay;
105} 106}
106*/ 107*/
108void Session::setTransferDialog(QWidget *d)
109{
110 m_transfer = d;
111}
112
113QWidget *Session::transferDialog()
114{
115 return m_transfer;
116}
107 117
diff --git a/noncore/apps/opie-console/session.h b/noncore/apps/opie-console/session.h
index f60a6c0..d69224a 100644
--- a/noncore/apps/opie-console/session.h
+++ b/noncore/apps/opie-console/session.h
@@ -64,6 +64,9 @@ public:
64 void setName( const QString& ); 64 void setName( const QString& );
65 void setProfile( const Profile& ); 65 void setProfile( const Profile& );
66 66
67 void setTransferDialog(QWidget *d);
68 QWidget *transferDialog();
69
67private: 70private:
68 QString m_name; 71 QString m_name;
69 QWidgetStack* m_widget; 72 QWidgetStack* m_widget;
@@ -71,7 +74,7 @@ private:
71 EmulationHandler* m_emu; 74 EmulationHandler* m_emu;
72 bool m_connected : 1; 75 bool m_connected : 1;
73 Profile m_prof; 76 Profile m_prof;
74 77 QWidget *m_transfer;
75}; 78};
76 79
77#endif 80#endif
diff --git a/noncore/apps/opie-console/transferdialog.cpp b/noncore/apps/opie-console/transferdialog.cpp
index 75c4c72..0af1911 100644
--- a/noncore/apps/opie-console/transferdialog.cpp
+++ b/noncore/apps/opie-console/transferdialog.cpp
@@ -18,7 +18,7 @@
18#include "transferdialog.h" 18#include "transferdialog.h"
19 19
20TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *) 20TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *)
21: QDialog(parent, 0l, true), m_win(mainwindow) 21: QDialog(parent, 0l, false), m_win(mainwindow)
22{ 22{
23 m_lay = 0l; 23 m_lay = 0l;
24 m_recvlay = 0l; 24 m_recvlay = 0l;
@@ -29,6 +29,7 @@ TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const ch
29 QRadioButton *mode_send, *mode_receive; 29 QRadioButton *mode_send, *mode_receive;
30 30
31 m_autocleanup = 0; 31 m_autocleanup = 0;
32 m_running = true;
32 33
33 group = new QButtonGroup(QObject::tr("Transfer mode"), this); 34 group = new QButtonGroup(QObject::tr("Transfer mode"), this);
34 mode_send = new QRadioButton(QObject::tr("Send"), group); 35 mode_send = new QRadioButton(QObject::tr("Send"), group);
@@ -167,7 +168,11 @@ void TransferDialog::slotCancel()
167 if((m_lay) || (m_recvlay)) 168 if((m_lay) || (m_recvlay))
168 { 169 {
169 cleanup(); 170 cleanup();
170 if(m_autocleanup) close(); 171 if(m_autocleanup)
172 {
173 m_running = false;
174 close();
175 }
171 else 176 else
172 { 177 {
173 QMessageBox::information(this, 178 QMessageBox::information(this,
@@ -177,6 +182,7 @@ void TransferDialog::slotCancel()
177 } 182 }
178 else 183 else
179 { 184 {
185 m_running = false;
180 close(); 186 close();
181 } 187 }
182} 188}
@@ -264,3 +270,8 @@ void TransferDialog::slotMode(int id)
264 m_transfermode = id; 270 m_transfermode = id;
265} 271}
266 272
273bool TransferDialog::isRunning()
274{
275 return m_running;
276}
277
diff --git a/noncore/apps/opie-console/transferdialog.h b/noncore/apps/opie-console/transferdialog.h
index d87be6a..23691e0 100644
--- a/noncore/apps/opie-console/transferdialog.h
+++ b/noncore/apps/opie-console/transferdialog.h
@@ -18,6 +18,7 @@ class TransferDialog : public QDialog
18 public: 18 public:
19 TransferDialog(QWidget *parent = 0l, MainWindow *mainwindow = 0l, const char *name = 0l); 19 TransferDialog(QWidget *parent = 0l, MainWindow *mainwindow = 0l, const char *name = 0l);
20 ~TransferDialog(); 20 ~TransferDialog();
21 bool isRunning();
21 22
22 public slots: 23 public slots:
23 void slotFilename(); 24 void slotFilename();
@@ -48,6 +49,7 @@ class TransferDialog : public QDialog
48 ReceiveLayer *m_recvlay; 49 ReceiveLayer *m_recvlay;
49 int m_transfermode; 50 int m_transfermode;
50 int m_autocleanup; 51 int m_autocleanup;
52 bool m_running;
51}; 53};
52 54
53#endif 55#endif