summaryrefslogtreecommitdiff
path: root/noncore/comm/keypebble/kvnc.cpp
Unidiff
Diffstat (limited to 'noncore/comm/keypebble/kvnc.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/comm/keypebble/kvnc.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index aa46e2f..b173004 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -69,12 +69,13 @@ KVNC::KVNC( const char *name ) : QMainWindow( 0, name )
69 stack->raiseWidget( bookmarkSelector ); 69 stack->raiseWidget( bookmarkSelector );
70 70
71 canvas = new KRFBCanvas( stack, "canvas" ); 71 canvas = new KRFBCanvas( stack, "canvas" );
72 stack->addWidget(canvas,get_unique_id()); 72 stack->addWidget(canvas,get_unique_id());
73 setCentralWidget( stack ); 73 setCentralWidget( stack );
74 74
75
75 connect( bookmarkSelector->bookmarkList, SIGNAL(doubleClicked(QListBoxItem *)), 76 connect( bookmarkSelector->bookmarkList, SIGNAL(doubleClicked(QListBoxItem *)),
76 this, SLOT(openConnection(QListBoxItem *)) ); 77 this, SLOT(openConnection(QListBoxItem *)) );
77 connect( canvas->connection(), SIGNAL(statusChanged(const QString &)), 78 connect( canvas->connection(), SIGNAL(statusChanged(const QString &)),
78 this, SLOT(statusMessage(const QString &)) ); 79 this, SLOT(statusMessage(const QString &)) );
79 connect( canvas->connection(), SIGNAL(error(const QString &)), 80 connect( canvas->connection(), SIGNAL(error(const QString &)),
80 this, SLOT(error(const QString &)) ); 81 this, SLOT(error(const QString &)) );
@@ -89,13 +90,16 @@ KVNC::KVNC( const char *name ) : QMainWindow( 0, name )
89 connect( cornerButton, SIGNAL(pressed()), this, SLOT(showMenu()) ); 90 connect( cornerButton, SIGNAL(pressed()), this, SLOT(showMenu()) );
90 canvas->setCornerWidget( cornerButton ); 91 canvas->setCornerWidget( cornerButton );
91 92
92 stack->raiseWidget( bookmarkSelector ); 93 stack->raiseWidget( bookmarkSelector );
93 94
94 95
95 QPEToolBar *bar = new QPEToolBar( this ); 96 bar= new QToolBar( this );
97 setToolBarsMovable( false );
98 setRightJustification(false);
99
96 100
97 QAction *n = new QAction( tr( "New Connection" ), Resource::loadPixmap( "new" ), 101 QAction *n = new QAction( tr( "New Connection" ), Resource::loadPixmap( "new" ),
98 QString::null, 0, this, 0 ); 102 QString::null, 0, this, 0 );
99 connect( n, SIGNAL( activated() ), 103 connect( n, SIGNAL( activated() ),
100 this, SLOT( newConnection() ) ); 104 this, SLOT( newConnection() ) );
101 n->addTo( bar ); 105 n->addTo( bar );
@@ -232,12 +236,13 @@ void KVNC::connected()
232 static QString msg = tr( "Connected to remote host" ); 236 static QString msg = tr( "Connected to remote host" );
233 statusMessage( msg ); 237 statusMessage( msg );
234 ctlAltDelAction->setEnabled(true); 238 ctlAltDelAction->setEnabled(true);
235 disconnectAction->setEnabled( true ); 239 disconnectAction->setEnabled( true );
236 fullScreenAction->setEnabled( true ); 240 fullScreenAction->setEnabled( true );
237 stack->raiseWidget(canvas); 241 stack->raiseWidget(canvas);
242 bar->hide();
238} 243}
239 244
240void KVNC::loggedIn() 245void KVNC::loggedIn()
241{ 246{
242 static QString msg = tr( "Logged in to remote host" ); 247 static QString msg = tr( "Logged in to remote host" );
243 statusMessage( msg ); 248 statusMessage( msg );
@@ -251,12 +256,13 @@ void KVNC::disconnected()
251 static QString msg = tr( "Connection closed" ); 256 static QString msg = tr( "Connection closed" );
252 statusMessage( msg ); 257 statusMessage( msg );
253 ctlAltDelAction->setEnabled(false); 258 ctlAltDelAction->setEnabled(false);
254 disconnectAction->setEnabled( false ); 259 disconnectAction->setEnabled( false );
255 fullScreenAction->setEnabled( false ); 260 fullScreenAction->setEnabled( false );
256 stack->raiseWidget(bookmarkSelector); 261 stack->raiseWidget(bookmarkSelector);
262 bar->show();
257} 263}
258 264
259void KVNC::statusMessage( const QString &m ) 265void KVNC::statusMessage( const QString &m )
260{ 266{
261 Global::statusMessage( m ); 267 Global::statusMessage( m );
262} 268}