summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/main.cpp2
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp7
2 files changed, 7 insertions, 2 deletions
diff --git a/noncore/apps/opie-console/main.cpp b/noncore/apps/opie-console/main.cpp
index 3b4321a..b17f8e8 100644
--- a/noncore/apps/opie-console/main.cpp
+++ b/noncore/apps/opie-console/main.cpp
@@ -98,13 +98,13 @@ int main(int argc, char **argv) {
98 qWarning("fscked"); 98 qWarning("fscked");
99 FixIt it; 99 FixIt it;
100 it.fixIt(); 100 it.fixIt();
101#endif 101#endif
102 102
103 MainWindow mw; 103 MainWindow mw;
104 mw.setCaption(QObject::tr("Opie console") ); 104 mw.setCaption(QObject::tr("Opie Console") );
105 app.showMainWidget( &mw ); 105 app.showMainWidget( &mw );
106 106
107 int ap = app.exec(); 107 int ap = app.exec();
108 108
109#ifdef FSCKED_DISTRIBUTION 109#ifdef FSCKED_DISTRIBUTION
110 /* should add a signal handler too */ 110 /* should add a signal handler too */
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 3acbfad..c48116d 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -51,12 +51,13 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(
51 initUI(); 51 initUI();
52 populateProfiles(); 52 populateProfiles();
53 populateScripts(); 53 populateScripts();
54} 54}
55 55
56void MainWindow::initUI() { 56void MainWindow::initUI() {
57
57 setToolBarsMovable( FALSE ); 58 setToolBarsMovable( FALSE );
58 59
59 /* tool bar for the menu */ 60 /* tool bar for the menu */
60 m_tool = new QToolBar( this ); 61 m_tool = new QToolBar( this );
61 m_tool->setHorizontalStretchable( TRUE ); 62 m_tool->setHorizontalStretchable( TRUE );
62 63
@@ -117,17 +118,20 @@ void MainWindow::initUI() {
117 m_disconnect->addTo( m_console ); 118 m_disconnect->addTo( m_console );
118 connect(m_disconnect, SIGNAL(activated() ), 119 connect(m_disconnect, SIGNAL(activated() ),
119 this, SLOT(slotDisconnect() ) ); 120 this, SLOT(slotDisconnect() ) );
120 121
121 m_console->insertSeparator(); 122 m_console->insertSeparator();
122 123
124
123 m_quickLaunch = new QAction( tr("QuickLaunch"), Resource::loadPixmap("console/konsole_mini"), QString::null, 0, this, 0 ); 125 m_quickLaunch = new QAction( tr("QuickLaunch"), Resource::loadPixmap("console/konsole_mini"), QString::null, 0, this, 0 );
124 m_quickLaunch->addTo( m_icons ); 126 m_quickLaunch->addTo( m_icons );
125 connect( m_quickLaunch, SIGNAL( activated() ), 127 connect( m_quickLaunch, SIGNAL( activated() ),
126 this, SLOT( slotQuickLaunch() ) ); 128 this, SLOT( slotQuickLaunch() ) );
127 129
130 QWhatsThis::add( m_icons, tr( "The shell button launches the \"default\" profile. If there is none default values are taken" ) );
131
128 m_transfer = new QAction( tr("Transfer file..."), Resource::loadPixmap("pass") , QString::null, 132 m_transfer = new QAction( tr("Transfer file..."), Resource::loadPixmap("pass") , QString::null,
129 0, this, 0 ); 133 0, this, 0 );
130 m_transfer->addTo( m_console ); 134 m_transfer->addTo( m_console );
131 connect(m_transfer, SIGNAL(activated() ), 135 connect(m_transfer, SIGNAL(activated() ),
132 this, SLOT(slotTransfer() ) ); 136 this, SLOT(slotTransfer() ) );
133 137
@@ -232,13 +236,13 @@ void MainWindow::initUI() {
232 0, this, 0 ); 236 0, this, 0 );
233 connect( paste, SIGNAL(activated() ), 237 connect( paste, SIGNAL(activated() ),
234 this, SLOT(slotPaste() ) ); 238 this, SLOT(slotPaste() ) );
235 239
236 240
237 newCon->addTo( m_icons ); 241 newCon->addTo( m_icons );
238 m_setProfiles->addTo( m_icons ); 242 //m_setProfiles->addTo( m_icons );
239 paste->addTo( m_icons ); 243 paste->addTo( m_icons );
240 m_openKeys->addTo(m_icons); 244 m_openKeys->addTo(m_icons);
241 m_fullscreen->addTo( m_icons ); 245 m_fullscreen->addTo( m_icons );
242 246
243 m_connect->setEnabled( false ); 247 m_connect->setEnabled( false );
244 m_disconnect->setEnabled( false ); 248 m_disconnect->setEnabled( false );
@@ -259,12 +263,13 @@ void MainWindow::initUI() {
259 263
260 m_consoleWindow = new TabWidget( this, "blah"); 264 m_consoleWindow = new TabWidget( this, "blah");
261 connect(m_consoleWindow, SIGNAL(activated(Session*) ), 265 connect(m_consoleWindow, SIGNAL(activated(Session*) ),
262 this, SLOT(slotSessionChanged(Session*) ) ); 266 this, SLOT(slotSessionChanged(Session*) ) );
263 setCentralWidget( m_consoleWindow ); 267 setCentralWidget( m_consoleWindow );
264 268
269 slotQuickLaunch();
265} 270}
266 271
267ProfileManager* MainWindow::manager() { 272ProfileManager* MainWindow::manager() {
268 return m_manager; 273 return m_manager;
269} 274}
270TabWidget* MainWindow::tabWidget() { 275TabWidget* MainWindow::tabWidget() {