summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 2a4d069..3af0cba 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -34,32 +34,33 @@ void MainWindow::initUI() {
34 34
35 /* tool bar for the menu */ 35 /* tool bar for the menu */
36 m_tool = new QToolBar( this ); 36 m_tool = new QToolBar( this );
37 m_tool->setHorizontalStretchable( TRUE ); 37 m_tool->setHorizontalStretchable( TRUE );
38 38
39 m_bar = new QMenuBar( m_tool ); 39 m_bar = new QMenuBar( m_tool );
40 m_console = new QPopupMenu( this ); 40 m_console = new QPopupMenu( this );
41 m_sessionsPop= new QPopupMenu( this ); 41 m_sessionsPop= new QPopupMenu( this );
42 m_settings = new QPopupMenu( this ); 42 m_settings = new QPopupMenu( this );
43 43
44 /* add a toolbar for icons */ 44 /* add a toolbar for icons */
45 m_icons = new QToolBar(this); 45 m_icons = new QToolBar(this);
46 m_icons->setHorizontalStretchable( TRUE );
47 46
48 /* 47 /*
49 * new Action for new sessions 48 * new Action for new sessions
50 */ 49 */
51 QAction* a = new QAction(); 50 QAction* a = new QAction(tr("New Connection"),
52 a->setText( tr("New Connection") ); 51 Resource::loadPixmap( "new" ),
52 QString::null, 0, this, 0);
53 a->addTo( m_console ); 53 a->addTo( m_console );
54 a->addTo( m_icons );
54 connect(a, SIGNAL(activated() ), 55 connect(a, SIGNAL(activated() ),
55 this, SLOT(slotNew() ) ); 56 this, SLOT(slotNew() ) );
56 57
57 /* 58 /*
58 * connect action 59 * connect action
59 */ 60 */
60 m_connect = new QAction(); 61 m_connect = new QAction();
61 m_connect->setText( tr("Connect") ); 62 m_connect->setText( tr("Connect") );
62 m_connect->addTo( m_console ); 63 m_connect->addTo( m_console );
63 connect(m_connect, SIGNAL(activated() ), 64 connect(m_connect, SIGNAL(activated() ),
64 this, SLOT(slotConnect() ) ); 65 this, SLOT(slotConnect() ) );
65 66
@@ -87,34 +88,36 @@ void MainWindow::initUI() {
87 connect(m_terminate, SIGNAL(activated() ), 88 connect(m_terminate, SIGNAL(activated() ),
88 this, SLOT(slotTerminate() ) ); 89 this, SLOT(slotTerminate() ) );
89 90
90 a = new QAction(); 91 a = new QAction();
91 a->setText( tr("Close Window") ); 92 a->setText( tr("Close Window") );
92 a->addTo( m_console ); 93 a->addTo( m_console );
93 connect(a, SIGNAL(activated() ), 94 connect(a, SIGNAL(activated() ),
94 this, SLOT(slotClose() ) ); 95 this, SLOT(slotClose() ) );
95 96
96 /* 97 /*
97 * the settings action 98 * the settings action
98 */ 99 */
99 m_setProfiles = new QAction(); 100 m_setProfiles = new QAction(tr("Configure Profiles"),
100 m_setProfiles->setText( tr("Configure Profiles") ); 101 Resource::loadPixmap( "SettingsIcon" ),
102 QString::null, 0, this, 0);
101 m_setProfiles->addTo( m_settings ); 103 m_setProfiles->addTo( m_settings );
104 m_setProfiles->addTo( m_icons );
102 connect( m_setProfiles, SIGNAL(activated() ), 105 connect( m_setProfiles, SIGNAL(activated() ),
103 this, SLOT(slotConfigure() ) ); 106 this, SLOT(slotConfigure() ) );
104 107
105 /* 108 /*
106 * action that open/closes the keyboard 109 * action that open/closes the keyboard
107 */ 110 */
108 m_openKeys = new QAction ("Keyboard...", 111 m_openKeys = new QAction (tr("Open Keyboard..."),
109 Resource::loadPixmap( "down" ), 112 Resource::loadPixmap( "down" ),
110 QString::null, 0, this, 0); 113 QString::null, 0, this, 0);
111 114
112 m_openKeys->setToggleAction(true); 115 m_openKeys->setToggleAction(true);
113 116
114 connect (m_openKeys, SIGNAL(toggled(bool)), 117 connect (m_openKeys, SIGNAL(toggled(bool)),
115 this, SLOT(slotOpenKeb(bool))); 118 this, SLOT(slotOpenKeb(bool)));
116 m_openKeys->addTo(m_icons); 119 m_openKeys->addTo(m_icons);
117 120
118 121
119 /* insert the submenu */ 122 /* insert the submenu */
120 m_console->insertItem(tr("New from Profile"), m_sessionsPop, 123 m_console->insertItem(tr("New from Profile"), m_sessionsPop,