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
@@ -57,12 +57,8 @@ void MainWindow::initUI() {
     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
@@ -71,6 +67,4 @@ void MainWindow::initUI() {
                              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() ),
@@ -81,19 +75,19 @@ void MainWindow::initUI() {
      * 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();
@@ -134,5 +128,4 @@ void MainWindow::initUI() {
                            , QString::null, 0, this, 0);
     m_fullscreen->addTo( m_console );
-    m_fullscreen->addTo( m_icons );
     connect( m_fullscreen, SIGNAL( activated() ),
              this,  SLOT( slotFullscreen() ) );
@@ -176,10 +169,6 @@ void MainWindow::initUI() {
                              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 */
@@ -193,7 +182,4 @@ void MainWindow::initUI() {
     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);
@@ -206,10 +192,6 @@ void MainWindow::initUI() {
             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 );
@@ -218,12 +200,17 @@ void MainWindow::initUI() {
              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 );
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
@@ -105,5 +105,4 @@ private:
     QMenuBar* m_bar;
     QPopupMenu* m_console;
-    QPopupMenu* m_settings;
     QPopupMenu* m_sessionsPop;
     QPopupMenu* m_scripts;