summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp10
-rw-r--r--noncore/apps/opie-console/mainwindow.h3
2 files changed, 3 insertions, 10 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 02a3fa9..ddaaf1b 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -23,13 +23,12 @@
23#include "mainwindow.h" 23#include "mainwindow.h"
24#include "tabwidget.h" 24#include "tabwidget.h"
25#include "transferdialog.h" 25#include "transferdialog.h"
26#include "function_keyboard.h" 26#include "function_keyboard.h"
27#include "emulation_handler.h" 27#include "emulation_handler.h"
28#include "script.h" 28#include "script.h"
29#include "quick_button.h"
30 29
31 30
32 31
33MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp) { 32MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp) {
34 KeyTrans::loadAll(); 33 KeyTrans::loadAll();
35 for (int i = 0; i < KeyTrans::count(); i++ ) { 34 for (int i = 0; i < KeyTrans::count(); i++ ) {
@@ -171,13 +170,13 @@ void MainWindow::initUI() {
171 connect(m_runScript, SIGNAL(activated()), this, SLOT(slotRunScript())); 170 connect(m_runScript, SIGNAL(activated()), this, SLOT(slotRunScript()));
172 171
173 /* 172 /*
174 * action that open/closes the keyboard 173 * action that open/closes the keyboard
175 */ 174 */
176 m_openKeys = new QAction (tr("Open Keyboard..."), 175 m_openKeys = new QAction (tr("Open Keyboard..."),
177 Resource::loadPixmap( "down" ), 176 Resource::loadPixmap( "console/keys/keyboard_icon" ),
178 QString::null, 0, this, 0); 177 QString::null, 0, this, 0);
179 178
180 m_openKeys->setToggleAction(true); 179 m_openKeys->setToggleAction(true);
181 180
182 connect (m_openKeys, SIGNAL(toggled(bool)), 181 connect (m_openKeys, SIGNAL(toggled(bool)),
183 this, SLOT(slotOpenKeb(bool))); 182 this, SLOT(slotOpenKeb(bool)));
@@ -224,18 +223,12 @@ void MainWindow::initUI() {
224 223
225 m_buttonBar = new QToolBar( this ); 224 m_buttonBar = new QToolBar( this );
226 addToolBar( m_buttonBar, "Buttons", QMainWindow::Top, TRUE ); 225 addToolBar( m_buttonBar, "Buttons", QMainWindow::Top, TRUE );
227 m_buttonBar->setHorizontalStretchable( TRUE ); 226 m_buttonBar->setHorizontalStretchable( TRUE );
228 m_buttonBar->hide(); 227 m_buttonBar->hide();
229 228
230 /*
231 m_qb = new QuickButton( m_buttonBar );
232 connect( m_qb, SIGNAL( keyPressed( ushort, ushort, bool, bool, bool) ),
233 this, SLOT( slotKeyReceived( ushort, ushort, bool, bool, bool) ) );
234 */
235 /* now add the copy and paste actions */
236 a = new QAction(tr("Copy"), 229 a = new QAction(tr("Copy"),
237 Resource::loadPixmap("copy"), QString::null, 230 Resource::loadPixmap("copy"), QString::null,
238 0, this, 0 ); 231 0, this, 0 );
239 //a->addTo( m_icons ); 232 //a->addTo( m_icons );
240 connect( a, SIGNAL(activated() ), 233 connect( a, SIGNAL(activated() ),
241 this, SLOT(slotCopy() ) ); 234 this, SLOT(slotCopy() ) );
@@ -444,12 +437,13 @@ void MainWindow::create( const Profile& prof ) {
444 //if(ses) delete ses; 437 //if(ses) delete ses;
445 return; 438 return;
446 } 439 }
447 440
448 m_sessions.append( ses ); 441 m_sessions.append( ses );
449 tabWidget()->add( ses ); 442 tabWidget()->add( ses );
443 tabWidget()->repaint();
450 m_curSession = ses; 444 m_curSession = ses;
451 445
452 // dicide if its a local term ( then no connction and no tranfer), maybe make a wrapper method out of it 446 // dicide if its a local term ( then no connction and no tranfer), maybe make a wrapper method out of it
453 m_connect->setEnabled( true ); 447 m_connect->setEnabled( true );
454 m_disconnect->setEnabled( false ); 448 m_disconnect->setEnabled( false );
455 m_terminate->setEnabled( true ); 449 m_terminate->setEnabled( true );
diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h
index 16b6252..7cc2aa5 100644
--- a/noncore/apps/opie-console/mainwindow.h
+++ b/noncore/apps/opie-console/mainwindow.h
@@ -18,13 +18,13 @@ class QAction;
18class MetaFactory; 18class MetaFactory;
19class TabWidget; 19class TabWidget;
20class ProfileManager; 20class ProfileManager;
21class Profile; 21class Profile;
22class FunctionKeyboard; 22class FunctionKeyboard;
23class FKey; 23class FKey;
24class QuickButton; 24
25 25
26class MainWindow : public QMainWindow { 26class MainWindow : public QMainWindow {
27 Q_OBJECT 27 Q_OBJECT
28public: 28public:
29 MainWindow( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 ); 29 MainWindow( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
30 ~MainWindow(); 30 ~MainWindow();
@@ -118,13 +118,12 @@ private:
118 QAction* m_saveScript; 118 QAction* m_saveScript;
119 QAction* m_runScript; 119 QAction* m_runScript;
120 QAction* m_fullscreen; 120 QAction* m_fullscreen;
121 QAction* m_closewindow; 121 QAction* m_closewindow;
122 122
123 FunctionKeyboard *m_kb; 123 FunctionKeyboard *m_kb;
124 QuickButton *m_qb;
125 bool m_isFullscreen; 124 bool m_isFullscreen;
126 125
127 QWidget* savedParentFullscreen; 126 QWidget* savedParentFullscreen;
128}; 127};
129 128
130 129