cleanup and icon rearrangement

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
@@ -58,3 +58,2 @@ void MainWindow::initUI() {
     m_sessionsPop= new QPopupMenu( this );
-    //m_settings = new QPopupMenu( this );
 
@@ -63,5 +62,2 @@ void MainWindow::initUI() {
 
-
-
-
     /*
@@ -72,4 +68,2 @@ void MainWindow::initUI() {
                              QString::null, 0, this, 0);
-    //  m_setProfiles->addTo( m_settings );
-    m_setProfiles->addTo( m_icons );
     m_setProfiles->addTo( m_console );
@@ -82,8 +76,7 @@ void MainWindow::initUI() {
      */
-    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() ) );
@@ -92,7 +85,8 @@ void MainWindow::initUI() {
     /* 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() ) );
@@ -135,3 +129,2 @@ void MainWindow::initUI() {
     m_fullscreen->addTo( m_console );
-    m_fullscreen->addTo( m_icons );
     connect( m_fullscreen, SIGNAL( activated() ),
@@ -177,8 +170,4 @@ void MainWindow::initUI() {
                              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)));
 
@@ -194,5 +183,2 @@ void MainWindow::initUI() {
 
-    /* the settings menu */
-    // m_bar->insertItem( tr("Settings"), m_settings );
-
     /* and the keyboard */
@@ -207,8 +193,4 @@ void MainWindow::initUI() {
 
-    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,
@@ -219,7 +201,6 @@ void MainWindow::initUI() {
 
-    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() ) );
@@ -227,2 +208,8 @@ void MainWindow::initUI() {
 
+    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 );
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
@@ -106,3 +106,2 @@ private:
     QPopupMenu* m_console;
-    QPopupMenu* m_settings;
     QPopupMenu* m_sessionsPop;