-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index ddaaf1b..c7750be 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp @@ -179,28 +179,12 @@ void MainWindow::initUI() { m_openKeys->setToggleAction(true); connect (m_openKeys, SIGNAL(toggled(bool)), this, SLOT(slotOpenKeb(bool))); m_openKeys->addTo(m_icons); - - /* - * action that open/closes the keyboard - - m_openButtons = new QAction ( tr( "Open Buttons..." ), - Resource::loadPixmap( "" ), - QString::null, 0, this, 0 ); - - m_openButtons->setToggleAction( true ); - - connect ( m_openButtons, SIGNAL( toggled( bool ) ), - this, SLOT( slotOpenButtons( bool ) ) ); - m_openButtons->addTo( m_icons ); - - */ - /* insert the submenu */ m_console->insertItem(tr("New from Profile"), m_sessionsPop, -1, 0); /* insert the connection menu */ m_bar->insertItem( tr("Connection"), m_console ); @@ -349,21 +333,23 @@ void MainWindow::slotConnect() { if(!ret) QMessageBox::warning(currentSession()->widgetStack(), QObject::tr("Failed"), QObject::tr("Connecting failed for this session.")); else { m_connect->setEnabled( false ); m_disconnect->setEnabled( true ); + m_transfer->setEnabled( true ); } } } void MainWindow::slotDisconnect() { if ( currentSession() ) { currentSession()->layer()->close(); m_connect->setEnabled( true ); m_disconnect->setEnabled( false ); + m_transfer->setEnabled( false ); } } void MainWindow::slotTerminate() { if ( currentSession() ) currentSession()->layer()->close(); @@ -444,26 +430,27 @@ void MainWindow::create( const Profile& prof ) { m_curSession = ses; // dicide if its a local term ( then no connction and no tranfer), maybe make a wrapper method out of it m_connect->setEnabled( true ); m_disconnect->setEnabled( false ); m_terminate->setEnabled( true ); - m_transfer->setEnabled( true ); m_recordScript->setEnabled( true ); m_saveScript->setEnabled( true ); m_runScript->setEnabled( true ); m_fullscreen->setEnabled( true ); m_closewindow->setEnabled( true ); - + m_transfer->setEnabled( false ); // is io_layer wants direct connection, then autoconnect //if ( ( m_curSession->layer() )->supports()[0] == 1 ) { if (prof.autoConnect()) { slotConnect(); } + + QWidget *w = currentSession()->widget(); if(w) w->setFocus(); } void MainWindow::slotTransfer() { @@ -505,12 +492,18 @@ void MainWindow::slotSessionChanged( Session* ses ) { m_disconnect->setEnabled( true ); } else { m_connect->setEnabled( true ); m_disconnect->setEnabled( false ); } + if ( ( m_curSession->layer() )->supports()[1] == 0 ) { + m_transfer->setEnabled( false ); + } else { + m_transfer->setEnabled( true ); + } + QWidget *w = m_curSession->widget(); if(w) w->setFocus(); } } void MainWindow::slotFullscreen() { |