summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp30
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
@@ -55,17 +55,33 @@ void MainWindow::initUI() {
55 m_tool->setHorizontalStretchable( TRUE ); 55 m_tool->setHorizontalStretchable( TRUE );
56 56
57 m_bar = new QMenuBar( m_tool ); 57 m_bar = new QMenuBar( m_tool );
58 m_console = new QPopupMenu( this ); 58 m_console = new QPopupMenu( this );
59 m_scripts = new QPopupMenu( this ); 59 m_scripts = new QPopupMenu( this );
60 m_sessionsPop= new QPopupMenu( this ); 60 m_sessionsPop= new QPopupMenu( this );
61 m_settings = new QPopupMenu( this ); 61 //m_settings = new QPopupMenu( this );
62 62
63 /* add a toolbar for icons */ 63 /* add a toolbar for icons */
64 m_icons = new QToolBar(this); 64 m_icons = new QToolBar(this);
65 65
66
67
68
69 /*
70 * the settings action
71 */
72 m_setProfiles = new QAction(tr("Configure Profiles"),
73 Resource::loadPixmap( "SettingsIcon" ),
74 QString::null, 0, this, 0);
75 // m_setProfiles->addTo( m_settings );
76 m_setProfiles->addTo( m_icons );
77 m_setProfiles->addTo( m_console );
78 connect( m_setProfiles, SIGNAL(activated() ),
79 this, SLOT(slotConfigure() ) );
80
81
66 /* 82 /*
67 * new Action for new sessions 83 * new Action for new sessions
68 */ 84 */
69 QAction* a = new QAction(tr("New Connection"), 85 QAction* a = new QAction(tr("New Connection"),
70 Resource::loadPixmap( "new" ), 86 Resource::loadPixmap( "new" ),
71 QString::null, 0, this, 0); 87 QString::null, 0, this, 0);
@@ -123,22 +139,12 @@ void MainWindow::initUI() {
123 m_closewindow = new QAction(); 139 m_closewindow = new QAction();
124 m_closewindow->setText( tr("Close Window") ); 140 m_closewindow->setText( tr("Close Window") );
125 m_closewindow->addTo( m_console ); 141 m_closewindow->addTo( m_console );
126 connect( m_closewindow, SIGNAL(activated() ), 142 connect( m_closewindow, SIGNAL(activated() ),
127 this, SLOT(slotClose() ) ); 143 this, SLOT(slotClose() ) );
128 144
129 /*
130 * the settings action
131 */
132 m_setProfiles = new QAction(tr("Configure Profiles"),
133 Resource::loadPixmap( "SettingsIcon" ),
134 QString::null, 0, this, 0);
135 m_setProfiles->addTo( m_settings );
136 m_setProfiles->addTo( m_icons );
137 connect( m_setProfiles, SIGNAL(activated() ),
138 this, SLOT(slotConfigure() ) );
139 145
140 /* 146 /*
141 * script actions 147 * script actions
142 */ 148 */
143 m_recordScript = new QAction(tr("Record Script"), QString::null, 0, this, 0); 149 m_recordScript = new QAction(tr("Record Script"), QString::null, 0, this, 0);
144 m_recordScript->addTo(m_scripts); 150 m_recordScript->addTo(m_scripts);
@@ -174,13 +180,13 @@ void MainWindow::initUI() {
174 m_bar->insertItem( tr("Connection"), m_console ); 180 m_bar->insertItem( tr("Connection"), m_console );
175 181
176 /* the scripts menu */ 182 /* the scripts menu */
177 m_bar->insertItem( tr("Scripts"), m_scripts ); 183 m_bar->insertItem( tr("Scripts"), m_scripts );
178 184
179 /* the settings menu */ 185 /* the settings menu */
180 m_bar->insertItem( tr("Settings"), m_settings ); 186 // m_bar->insertItem( tr("Settings"), m_settings );
181 187
182 /* and the keyboard */ 188 /* and the keyboard */
183 m_keyBar = new QToolBar(this); 189 m_keyBar = new QToolBar(this);
184 addToolBar( m_keyBar, "Keyboard", QMainWindow::Top, TRUE ); 190 addToolBar( m_keyBar, "Keyboard", QMainWindow::Top, TRUE );
185 m_keyBar->setHorizontalStretchable( TRUE ); 191 m_keyBar->setHorizontalStretchable( TRUE );
186 m_keyBar->hide(); 192 m_keyBar->hide();