summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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
@@ -4,6 +4,8 @@
#include <qlabel.h>
#include <qpopupmenu.h>
#include <qtoolbar.h>
+#include <qpe/resource.h>
+
#include "profileeditordialog.h"
#include "configdialog.h"
@@ -14,6 +16,7 @@
#include "mainwindow.h"
#include "tabwidget.h"
#include "transferdialog.h"
+#include "function_keyboard.h"
MainWindow::MainWindow() {
m_factory = new MetaFactory();
@@ -29,6 +32,7 @@ MainWindow::MainWindow() {
void MainWindow::initUI() {
setToolBarsMovable( FALSE );
+ /* tool bar for the menu */
m_tool = new QToolBar( this );
m_tool->setHorizontalStretchable( TRUE );
@@ -37,6 +41,10 @@ void MainWindow::initUI() {
m_sessionsPop= new QPopupMenu( this );
m_settings = new QPopupMenu( this );
+ /* add a toolbar for icons */
+ m_icons = new QToolBar(this);
+ m_icons->setHorizontalStretchable( TRUE );
+
/*
* new Action for new sessions
*/
@@ -94,6 +102,20 @@ void MainWindow::initUI() {
connect( m_setProfiles, SIGNAL(activated() ),
this, SLOT(slotConfigure() ) );
+ /*
+ * action that open/closes the keyboard
+ */
+ m_openKeys = new QAction ("Keyboard...",
+ Resource::loadPixmap( "down" ),
+ QString::null, 0, this, 0);
+
+ m_openKeys->setToggleAction(true);
+
+ connect (m_openKeys, SIGNAL(toggled(bool)),
+ this, SLOT(slotOpenKeb(bool)));
+ m_openKeys->addTo(m_icons);
+
+
/* insert the submenu */
m_console->insertItem(tr("New from Profile"), m_sessionsPop,
-1, 0);
@@ -104,6 +126,14 @@ void MainWindow::initUI() {
/* the settings menu */
m_bar->insertItem( tr("Settings"), m_settings );
+ /* and the keyboard */
+ m_keyBar = new QToolBar(this);
+ addToolBar( m_keyBar, "Keyboard", QMainWindow::Top, TRUE );
+ m_keyBar->setHorizontalStretchable( TRUE );
+ m_keyBar->hide();
+
+ m_kb = new FunctionKeyboard(m_keyBar);
+
/*
* connect to the menu activation
*/
@@ -233,3 +263,10 @@ void MainWindow::slotTransfer()
}
}
+
+void MainWindow::slotOpenKeb(bool state) {
+
+ if (state) m_keyBar->show();
+ else m_keyBar->hide();
+
+}
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
@@ -12,12 +12,14 @@
* actions supported by the gui
*/
class QToolBar;
+class QToolButton;
class QMenuBar;
class QAction;
class MetaFactory;
class TabWidget;
class ProfileManager;
class Profile;
+class FunctionKeyboard;
class MainWindow : public QMainWindow {
Q_OBJECT
public:
@@ -56,6 +58,7 @@ private slots:
void slotClose();
void slotProfile(int);
void slotTransfer();
+ void slotOpenKeb(bool);
private:
void initUI();
@@ -79,6 +82,8 @@ private:
TabWidget* m_consoleWindow;
QToolBar* m_tool;
+ QToolBar* m_icons;
+ QToolBar* m_keyBar;
QMenuBar* m_bar;
QPopupMenu* m_console;
QPopupMenu* m_settings;
@@ -88,7 +93,9 @@ private:
QAction* m_terminate;
QAction* m_transfer;
QAction* m_setProfiles;
+ QAction* m_openKeys;
+ FunctionKeyboard *m_kb;
};