summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp37
-rw-r--r--noncore/apps/opie-console/mainwindow.h7
2 files changed, 44 insertions, 0 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 88727e4..2a4d069 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -5,4 +5,6 @@
5#include <qpopupmenu.h> 5#include <qpopupmenu.h>
6#include <qtoolbar.h> 6#include <qtoolbar.h>
7#include <qpe/resource.h>
8
7 9
8#include "profileeditordialog.h" 10#include "profileeditordialog.h"
@@ -15,4 +17,5 @@
15#include "tabwidget.h" 17#include "tabwidget.h"
16#include "transferdialog.h" 18#include "transferdialog.h"
19#include "function_keyboard.h"
17 20
18MainWindow::MainWindow() { 21MainWindow::MainWindow() {
@@ -30,4 +33,5 @@ void MainWindow::initUI() {
30 setToolBarsMovable( FALSE ); 33 setToolBarsMovable( FALSE );
31 34
35 /* tool bar for the menu */
32 m_tool = new QToolBar( this ); 36 m_tool = new QToolBar( this );
33 m_tool->setHorizontalStretchable( TRUE ); 37 m_tool->setHorizontalStretchable( TRUE );
@@ -38,4 +42,8 @@ void MainWindow::initUI() {
38 m_settings = new QPopupMenu( this ); 42 m_settings = new QPopupMenu( this );
39 43
44 /* add a toolbar for icons */
45 m_icons = new QToolBar(this);
46 m_icons->setHorizontalStretchable( TRUE );
47
40 /* 48 /*
41 * new Action for new sessions 49 * new Action for new sessions
@@ -95,4 +103,18 @@ void MainWindow::initUI() {
95 this, SLOT(slotConfigure() ) ); 103 this, SLOT(slotConfigure() ) );
96 104
105 /*
106 * action that open/closes the keyboard
107 */
108 m_openKeys = new QAction ("Keyboard...",
109 Resource::loadPixmap( "down" ),
110 QString::null, 0, this, 0);
111
112 m_openKeys->setToggleAction(true);
113
114 connect (m_openKeys, SIGNAL(toggled(bool)),
115 this, SLOT(slotOpenKeb(bool)));
116 m_openKeys->addTo(m_icons);
117
118
97 /* insert the submenu */ 119 /* insert the submenu */
98 m_console->insertItem(tr("New from Profile"), m_sessionsPop, 120 m_console->insertItem(tr("New from Profile"), m_sessionsPop,
@@ -105,4 +127,12 @@ void MainWindow::initUI() {
105 m_bar->insertItem( tr("Settings"), m_settings ); 127 m_bar->insertItem( tr("Settings"), m_settings );
106 128
129 /* and the keyboard */
130 m_keyBar = new QToolBar(this);
131 addToolBar( m_keyBar, "Keyboard", QMainWindow::Top, TRUE );
132 m_keyBar->setHorizontalStretchable( TRUE );
133 m_keyBar->hide();
134
135 m_kb = new FunctionKeyboard(m_keyBar);
136
107 /* 137 /*
108 * connect to the menu activation 138 * connect to the menu activation
@@ -234,2 +264,9 @@ void MainWindow::slotTransfer()
234} 264}
235 265
266
267void MainWindow::slotOpenKeb(bool state) {
268
269 if (state) m_keyBar->show();
270 else m_keyBar->hide();
271
272}
diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h
index c8b0b65..73bb285 100644
--- a/noncore/apps/opie-console/mainwindow.h
+++ b/noncore/apps/opie-console/mainwindow.h
@@ -13,4 +13,5 @@
13 */ 13 */
14class QToolBar; 14class QToolBar;
15class QToolButton;
15class QMenuBar; 16class QMenuBar;
16class QAction; 17class QAction;
@@ -19,4 +20,5 @@ class TabWidget;
19class ProfileManager; 20class ProfileManager;
20class Profile; 21class Profile;
22class FunctionKeyboard;
21class MainWindow : public QMainWindow { 23class MainWindow : public QMainWindow {
22 Q_OBJECT 24 Q_OBJECT
@@ -57,4 +59,5 @@ private slots:
57 void slotProfile(int); 59 void slotProfile(int);
58 void slotTransfer(); 60 void slotTransfer();
61 void slotOpenKeb(bool);
59 62
60private: 63private:
@@ -80,4 +83,6 @@ private:
80 TabWidget* m_consoleWindow; 83 TabWidget* m_consoleWindow;
81 QToolBar* m_tool; 84 QToolBar* m_tool;
85 QToolBar* m_icons;
86 QToolBar* m_keyBar;
82 QMenuBar* m_bar; 87 QMenuBar* m_bar;
83 QPopupMenu* m_console; 88 QPopupMenu* m_console;
@@ -89,5 +94,7 @@ private:
89 QAction* m_transfer; 94 QAction* m_transfer;
90 QAction* m_setProfiles; 95 QAction* m_setProfiles;
96 QAction* m_openKeys;
91 97
98 FunctionKeyboard *m_kb;
92}; 99};
93 100