summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-24 12:49:24 (UTC)
committer harlekin <harlekin>2002-10-24 12:49:24 (UTC)
commit263b907b4f3bd3be7725d234ff42be86cff39ab7 (patch) (side-by-side diff)
tree2c5edaf127210e80030af54122c55ab836dac4d2
parentc2a6bda0c89ee3ac97323108f0eec80b658a3995 (diff)
downloadopie-263b907b4f3bd3be7725d234ff42be86cff39ab7.zip
opie-263b907b4f3bd3be7725d234ff42be86cff39ab7.tar.gz
opie-263b907b4f3bd3be7725d234ff42be86cff39ab7.tar.bz2
de- /activate file transfer menu entry according to layer capabilities
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp29
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
@@ -173,40 +173,24 @@ void MainWindow::initUI() {
* action that open/closes the keyboard
*/
m_openKeys = new QAction (tr("Open Keyboard..."),
Resource::loadPixmap( "console/keys/keyboard_icon" ),
QString::null, 0, this, 0);
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 );
/* the scripts menu */
m_bar->insertItem( tr("Scripts"), m_scripts );
/* the settings menu */
// m_bar->insertItem( tr("Settings"), m_settings );
@@ -343,33 +327,35 @@ void MainWindow::slotRunScript() {
}
}
void MainWindow::slotConnect() {
if ( currentSession() ) {
bool ret = currentSession()->layer()->open();
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();
slotClose();
/* FIXME move to the next session */
}
void MainWindow::slotConfigure() {
@@ -438,38 +424,39 @@ void MainWindow::create( const Profile& prof ) {
return;
}
m_sessions.append( ses );
tabWidget()->add( ses );
tabWidget()->repaint();
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()
{
if ( currentSession() ) {
TransferDialog dlg(currentSession()->widgetStack(), this);
dlg.showMaximized();
//currentSession()->widgetStack()->add(dlg);
dlg.exec();
}
@@ -499,24 +486,30 @@ void MainWindow::slotSessionChanged( Session* ses ) {
qWarning("changed!");
if ( ses ) {
m_curSession = ses;
qDebug(QString("is connected : %1").arg( m_curSession->layer()->isConnected() ) );
if ( m_curSession->layer()->isConnected() ) {
m_connect->setEnabled( false );
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() {
if ( m_isFullscreen ) {
( m_curSession->widgetStack() )->reparent( savedParentFullscreen, 0, QPoint(0,0), true );
( m_curSession->widgetStack() )->resize( savedParentFullscreen->width(), savedParentFullscreen->height() );