author | harlekin <harlekin> | 2002-10-24 12:22:18 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-24 12:22:18 (UTC) |
commit | 23b602802d2c02b20a8c6a9bf8c3785b9ca97b43 (patch) (side-by-side diff) | |
tree | 9af1c9f623316eb888ae525efaeb3a99169ce82d /noncore/apps/opie-console/mainwindow.cpp | |
parent | acf708cee945b8b843b0132672d79f5c4571c22b (diff) | |
download | opie-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 (limited to 'noncore/apps/opie-console/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 10 |
1 files changed, 2 insertions, 8 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 @@ -17,25 +17,24 @@ #include "profileeditordialog.h" #include "configdialog.h" #include "default.h" #include "metafactory.h" #include "profile.h" #include "profilemanager.h" #include "mainwindow.h" #include "tabwidget.h" #include "transferdialog.h" #include "function_keyboard.h" #include "emulation_handler.h" #include "script.h" -#include "quick_button.h" MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp) { KeyTrans::loadAll(); for (int i = 0; i < KeyTrans::count(); i++ ) { KeyTrans* s = KeyTrans::find(i ); assert( s ); } m_factory = new MetaFactory(); Default def(m_factory); m_sessions.setAutoDelete( TRUE ); @@ -165,25 +164,25 @@ void MainWindow::initUI() { m_saveScript = new QAction(tr("Save Script"), QString::null, 0, this, 0); m_saveScript->addTo(m_scripts); connect(m_saveScript, SIGNAL(activated()), this, SLOT(slotSaveScript())); m_runScript = new QAction(tr("Run Script"), QString::null, 0, this, 0); m_runScript->addTo(m_scripts); connect(m_runScript, SIGNAL(activated()), this, SLOT(slotRunScript())); /* * action that open/closes the keyboard */ m_openKeys = new QAction (tr("Open Keyboard..."), - Resource::loadPixmap( "down" ), + Resource::loadPixmap( "console/keys/keyboard_icon" ), QString::null, 0, this, 0); m_openKeys->setToggleAction(true); connect (m_openKeys, SIGNAL(toggled(bool)), this, SLOT(slotOpenKeb(bool))); m_openKeys->addTo(m_icons); /* * action that open/closes the keyboard @@ -218,30 +217,24 @@ void MainWindow::initUI() { m_keyBar->setHorizontalStretchable( TRUE ); m_keyBar->hide(); m_kb = new FunctionKeyboard(m_keyBar); connect(m_kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)), this, SLOT(slotKeyReceived(FKey, ushort, ushort, bool))); m_buttonBar = new QToolBar( this ); addToolBar( m_buttonBar, "Buttons", QMainWindow::Top, TRUE ); m_buttonBar->setHorizontalStretchable( TRUE ); m_buttonBar->hide(); - /* - m_qb = new QuickButton( m_buttonBar ); - connect( m_qb, SIGNAL( keyPressed( ushort, ushort, bool, bool, bool) ), - this, SLOT( slotKeyReceived( ushort, ushort, bool, bool, bool) ) ); - */ - /* now add the copy and paste actions */ a = new QAction(tr("Copy"), Resource::loadPixmap("copy"), QString::null, 0, this, 0 ); //a->addTo( m_icons ); connect( a, SIGNAL(activated() ), this, SLOT(slotCopy() ) ); a = new QAction(tr("Paste"), Resource::loadPixmap("paste"), QString::null, 0, this, 0 ); a->addTo( m_icons ); connect( a, SIGNAL(activated() ), @@ -438,24 +431,25 @@ void MainWindow::create( const Profile& prof ) { if((!ses) || (!ses->layer()) || (!ses->widgetStack())) { QMessageBox::warning(this, QObject::tr("Session failed"), QObject::tr("<qt>Cannot open session: Not all components were found.</qt>")); //if(ses) delete ses; return; } m_sessions.append( ses ); tabWidget()->add( ses ); + tabWidget()->repaint(); m_curSession = ses; // dicide if its a local term ( then no connction and no tranfer), maybe make a wrapper method out of it m_connect->setEnabled( true ); m_disconnect->setEnabled( false ); m_terminate->setEnabled( true ); m_transfer->setEnabled( true ); m_recordScript->setEnabled( true ); m_saveScript->setEnabled( true ); m_runScript->setEnabled( true ); m_fullscreen->setEnabled( true ); m_closewindow->setEnabled( true ); |