summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-24 12:22:18 (UTC)
committer harlekin <harlekin>2002-10-24 12:22:18 (UTC)
commit23b602802d2c02b20a8c6a9bf8c3785b9ca97b43 (patch) (unidiff)
tree9af1c9f623316eb888ae525efaeb3a99169ce82d
parentacf708cee945b8b843b0132672d79f5c4571c22b (diff)
downloadopie-23b602802d2c02b20a8c6a9bf8c3785b9ca97b43.zip
opie-23b602802d2c02b20a8c6a9bf8c3785b9ca97b43.tar.gz
opie-23b602802d2c02b20a8c6a9bf8c3785b9ca97b43.tar.bz2
taken most quickbutton stuff out now and also set the nicer icon again for keys
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
@@ -26,7 +26,6 @@
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
@@ -174,7 +173,7 @@ void MainWindow::initUI() {
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);
@@ -227,12 +226,6 @@ void MainWindow::initUI() {
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 );
@@ -447,6 +440,7 @@ void MainWindow::create( const Profile& prof ) {
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
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
@@ -21,7 +21,7 @@ class 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
@@ -121,7 +121,6 @@ private:
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;