| -rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 408d3dd..3066b35 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp @@ -57,13 +57,29 @@ void MainWindow::initUI() { 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 ); + //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() ) ); + + /* * new Action for new sessions */ QAction* a = new QAction(tr("New Connection"), @@ -125,18 +141,8 @@ void MainWindow::initUI() { m_closewindow->addTo( m_console ); connect( m_closewindow, SIGNAL(activated() ), this, SLOT(slotClose() ) ); - /* - * 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 ); - connect( m_setProfiles, SIGNAL(activated() ), - this, SLOT(slotConfigure() ) ); /* * script actions */ @@ -176,9 +182,9 @@ void MainWindow::initUI() { /* the scripts menu */ m_bar->insertItem( tr("Scripts"), m_scripts ); /* the settings menu */ - m_bar->insertItem( tr("Settings"), m_settings ); + // m_bar->insertItem( tr("Settings"), m_settings ); /* and the keyboard */ m_keyBar = new QToolBar(this); addToolBar( m_keyBar, "Keyboard", QMainWindow::Top, TRUE ); |