From 2f2f9dc5f45fe7cf194a057e104c2d54394e4cef Mon Sep 17 00:00:00 2001
From: harlekin <harlekin>
Date: Thu, 24 Oct 2002 19:16:28 +0000
Subject: cleanup and icon rearrangement

---
(limited to 'noncore/apps/opie-console')

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
@@ -56,22 +56,16 @@ void MainWindow::initUI() {
     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() ) );
@@ -80,21 +74,21 @@ 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();
 
@@ -133,7 +127,6 @@ void MainWindow::initUI() {
     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() ) );
 
@@ -175,12 +168,8 @@ void MainWindow::initUI() {
     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,
@@ -192,9 +181,6 @@ void MainWindow::initUI() {
     /* 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 );
@@ -205,26 +191,27 @@ void MainWindow::initUI() {
     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 );
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
@@ -104,7 +104,6 @@ private:
     QToolBar* m_buttonBar;
     QMenuBar* m_bar;
     QPopupMenu* m_console;
-    QPopupMenu* m_settings;
     QPopupMenu* m_sessionsPop;
     QPopupMenu* m_scripts;
     QAction* m_connect;
--
cgit v0.9.0.2