summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-24 19:16:28 (UTC)
committer harlekin <harlekin>2002-10-24 19:16:28 (UTC)
commit2f2f9dc5f45fe7cf194a057e104c2d54394e4cef (patch) (side-by-side diff)
treebf9a38b4e3d09e2e145b79ecf1e5be78263c530d
parent94573faf2e89723a49bbaf3630f1d19f80ba6b27 (diff)
downloadopie-2f2f9dc5f45fe7cf194a057e104c2d54394e4cef.zip
opie-2f2f9dc5f45fe7cf194a057e104c2d54394e4cef.tar.gz
opie-2f2f9dc5f45fe7cf194a057e104c2d54394e4cef.tar.bz2
cleanup and icon rearrangement
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp47
-rw-r--r--noncore/apps/opie-console/mainwindow.h1
2 files changed, 17 insertions, 31 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 745efaf..44ef458 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -47,63 +47,57 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(
}
void MainWindow::initUI() {
setToolBarsMovable( FALSE );
/* tool bar for the menu */
m_tool = new QToolBar( this );
m_tool->setHorizontalStretchable( TRUE );
m_bar = new QMenuBar( m_tool );
m_console = new QPopupMenu( this );
m_scripts = new QPopupMenu( this );
m_sessionsPop= new QPopupMenu( this );
- //m_settings = new QPopupMenu( this );
/* add a toolbar for icons */
m_icons = new QToolBar(this);
-
-
-
/*
* the settings action
*/
m_setProfiles = new QAction(tr("Configure Profiles"),
Resource::loadPixmap( "SettingsIcon" ),
QString::null, 0, this, 0);
- // m_setProfiles->addTo( m_settings );
- m_setProfiles->addTo( m_icons );
m_setProfiles->addTo( m_console );
connect( m_setProfiles, SIGNAL(activated() ),
this, SLOT(slotConfigure() ) );
m_console->insertSeparator();
/*
* new Action for new sessions
*/
- QAction* a = new QAction(tr("New Connection"),
+ QAction* newCon = new QAction(tr("New Connection"),
Resource::loadPixmap( "new" ),
QString::null, 0, this, 0);
- a->addTo( m_console );
- a->addTo( m_icons );
- connect(a, SIGNAL(activated() ),
+ newCon->addTo( m_console );
+ connect( newCon, SIGNAL(activated() ),
this, SLOT(slotNew() ) );
m_console->insertSeparator();
/* save icon is not available */
- a = new QAction(tr("Save Connection"),
+
+ QAction *saveCon = new QAction(tr("Save Connection"),
Resource::loadPixmap("save"), QString::null,
0, this, 0 );
- a->addTo( m_console );
- connect(a, SIGNAL(activated() ),
+ saveCon->addTo( m_console );
+ connect( saveCon, SIGNAL(activated() ),
this, SLOT(slotSaveSession() ) );
m_console->insertSeparator();
/*
* connect action
*/
m_connect = new QAction();
m_connect->setText( tr("Connect") );
m_connect->addTo( m_console );
connect(m_connect, SIGNAL(activated() ),
this, SLOT(slotConnect() ) );
@@ -124,25 +118,24 @@ void MainWindow::initUI() {
connect(m_transfer, SIGNAL(activated() ),
this, SLOT(slotTransfer() ) );
/*
* fullscreen
*/
m_isFullscreen = false;
m_fullscreen = new QAction( tr("Full screen"), Resource::loadPixmap( "fullscreen" )
, QString::null, 0, this, 0);
m_fullscreen->addTo( m_console );
- m_fullscreen->addTo( m_icons );
connect( m_fullscreen, SIGNAL( activated() ),
this, SLOT( slotFullscreen() ) );
m_console->insertSeparator();
/*
* terminate action
*/
m_terminate = new QAction();
m_terminate->setText( tr("Terminate") );
m_terminate->addTo( m_console );
connect(m_terminate, SIGNAL(activated() ),
this, SLOT(slotTerminate() ) );
@@ -166,74 +159,68 @@ void MainWindow::initUI() {
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( "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);
+ connect (m_openKeys, SIGNAL(toggled(bool)), this, SLOT(slotOpenKeb(bool)));
/* insert the submenu */
m_console->insertItem(tr("New from Profile"), m_sessionsPop,
-1, 0);
/* insert the connection menu */
m_bar->insertItem( tr("Connection"), m_console );
/* the scripts menu */
m_bar->insertItem( tr("Scripts"), m_scripts );
- /* 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(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();
- a = new QAction(tr("Copy"),
+ QAction *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"),
+ QAction *paste = new QAction(tr("Paste"),
Resource::loadPixmap("paste"), QString::null,
0, this, 0 );
- a->addTo( m_icons );
- connect( a, SIGNAL(activated() ),
+ connect( paste, SIGNAL(activated() ),
this, SLOT(slotPaste() ) );
+ newCon->addTo( m_icons );
+ m_setProfiles->addTo( m_icons );
+ paste->addTo( m_icons );
+ m_openKeys->addTo(m_icons);
+ m_fullscreen->addTo( m_icons );
+
m_connect->setEnabled( false );
m_disconnect->setEnabled( false );
m_terminate->setEnabled( false );
m_transfer->setEnabled( false );
m_recordScript->setEnabled( false );
m_saveScript->setEnabled( false );
m_runScript->setEnabled( false );
m_fullscreen->setEnabled( false );
m_closewindow->setEnabled( false );
/*
* connect to the menu activation
diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h
index 7cc2aa5..19d3a3d 100644
--- a/noncore/apps/opie-console/mainwindow.h
+++ b/noncore/apps/opie-console/mainwindow.h
@@ -95,25 +95,24 @@ private:
* the metafactory
*/
MetaFactory* m_factory;
ProfileManager* m_manager;
TabWidget* m_consoleWindow;
QToolBar* m_tool;
QToolBar* m_icons;
QToolBar* m_keyBar;
QToolBar* m_buttonBar;
QMenuBar* m_bar;
QPopupMenu* m_console;
- QPopupMenu* m_settings;
QPopupMenu* m_sessionsPop;
QPopupMenu* m_scripts;
QAction* m_connect;
QAction* m_disconnect;
QAction* m_terminate;
QAction* m_transfer;
QAction* m_setProfiles;
QAction* m_openKeys;
QAction* m_openButtons;
QAction* m_recordScript;
QAction* m_saveScript;
QAction* m_runScript;