author | harlekin <harlekin> | 2003-03-21 22:29:00 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-03-21 22:29:00 (UTC) |
commit | 43b0fded770624c907aae043e88449f80040d7df (patch) (unidiff) | |
tree | 37e92b5da66c34323a831586c21a9c23b0abe261 /noncore | |
parent | 07a03b603d964b07d2866e04f480014fadcf1570 (diff) | |
download | opie-43b0fded770624c907aae043e88449f80040d7df.zip opie-43b0fded770624c907aae043e88449f80040d7df.tar.gz opie-43b0fded770624c907aae043e88449f80040d7df.tar.bz2 |
added a button for quicklaunch of a default profile
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 21 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/terminalwidget.cpp | 26 |
3 files changed, 36 insertions, 13 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index abcdb84..a6fc30b 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -51,8 +51,9 @@ 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 | void MainWindow::initUI() { | 56 | void MainWindow::initUI() { |
56 | setToolBarsMovable( FALSE ); | 57 | setToolBarsMovable( FALSE ); |
57 | 58 | ||
58 | /* tool bar for the menu */ | 59 | /* tool bar for the menu */ |
@@ -118,14 +119,21 @@ void MainWindow::initUI() { | |||
118 | this, SLOT(slotDisconnect() ) ); | 119 | this, SLOT(slotDisconnect() ) ); |
119 | 120 | ||
120 | m_console->insertSeparator(); | 121 | m_console->insertSeparator(); |
121 | 122 | ||
123 | m_quickLaunch = new QAction( tr("QuickLaunch"), Resource::loadPixmap("console/konsole_mini"), QString::null, 0, this, 0 ); | ||
124 | m_quickLaunch->addTo( m_icons ); | ||
125 | connect( m_quickLaunch, SIGNAL( activated() ), | ||
126 | this, SLOT( slotQuickLaunch() ) ); | ||
127 | |||
122 | m_transfer = new QAction( tr("Transfer file..."), Resource::loadPixmap("pass") , QString::null, | 128 | m_transfer = new QAction( tr("Transfer file..."), Resource::loadPixmap("pass") , QString::null, |
123 | 0, this, 0 ); | 129 | 0, this, 0 ); |
124 | m_transfer->addTo( m_console ); | 130 | m_transfer->addTo( m_console ); |
125 | connect(m_transfer, SIGNAL(activated() ), | 131 | connect(m_transfer, SIGNAL(activated() ), |
126 | this, SLOT(slotTransfer() ) ); | 132 | this, SLOT(slotTransfer() ) ); |
127 | 133 | ||
134 | |||
135 | |||
128 | /* | 136 | /* |
129 | * immediate change of line wrap policy | 137 | * immediate change of line wrap policy |
130 | */ | 138 | */ |
131 | m_isWrapped = false; | 139 | m_isWrapped = false; |
@@ -401,8 +409,18 @@ void MainWindow::slotTerminate() { | |||
401 | slotClose(); | 409 | slotClose(); |
402 | /* FIXME move to the next session */ | 410 | /* FIXME move to the next session */ |
403 | } | 411 | } |
404 | 412 | ||
413 | void MainWindow::slotQuickLaunch() { | ||
414 | Profile prof = manager()->profile( "default" ); | ||
415 | if ( prof.name() == "default" ) { | ||
416 | create( prof ); | ||
417 | } else { | ||
418 | QMessageBox::warning(this, tr("Failure"),tr("please configure one profile named \"default\"")); | ||
419 | } | ||
420 | |||
421 | } | ||
422 | |||
405 | void MainWindow::slotConfigure() { | 423 | void MainWindow::slotConfigure() { |
406 | ConfigDialog conf( manager()->all(), factory() ); | 424 | ConfigDialog conf( manager()->all(), factory() ); |
407 | conf.showMaximized(); | 425 | conf.showMaximized(); |
408 | 426 | ||
@@ -458,8 +476,11 @@ void MainWindow::slotClose() { | |||
458 | void MainWindow::slotProfile( int id) { | 476 | void MainWindow::slotProfile( int id) { |
459 | Profile prof = manager()->profile( m_sessionsPop->text( id) ); | 477 | Profile prof = manager()->profile( m_sessionsPop->text( id) ); |
460 | create( prof ); | 478 | create( prof ); |
461 | } | 479 | } |
480 | |||
481 | |||
482 | |||
462 | void MainWindow::create( const Profile& prof ) { | 483 | void MainWindow::create( const Profile& prof ) { |
463 | if(m_curSession) | 484 | if(m_curSession) |
464 | if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide(); | 485 | if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide(); |
465 | 486 | ||
diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h index 0fac38b..86939c1 100644 --- a/noncore/apps/opie-console/mainwindow.h +++ b/noncore/apps/opie-console/mainwindow.h | |||
@@ -66,8 +66,9 @@ private slots: | |||
66 | void slotRecordScript(); | 66 | void slotRecordScript(); |
67 | void slotSaveScript(); | 67 | void slotSaveScript(); |
68 | void slotRunScript(int); | 68 | void slotRunScript(int); |
69 | void slotFullscreen(); | 69 | void slotFullscreen(); |
70 | void slotQuickLaunch(); | ||
70 | void slotWrap(); | 71 | void slotWrap(); |
71 | void slotSessionChanged( Session* ); | 72 | void slotSessionChanged( Session* ); |
72 | void slotKeyReceived(FKey, ushort, ushort, bool); | 73 | void slotKeyReceived(FKey, ushort, ushort, bool); |
73 | void slotSaveHistory(); | 74 | void slotSaveHistory(); |
@@ -112,8 +113,9 @@ private: | |||
112 | QPopupMenu* m_scriptsPop; | 113 | QPopupMenu* m_scriptsPop; |
113 | QPopupMenu* m_scripts; | 114 | QPopupMenu* m_scripts; |
114 | QAction* m_connect; | 115 | QAction* m_connect; |
115 | QAction* m_disconnect; | 116 | QAction* m_disconnect; |
117 | QAction* m_quickLaunch; | ||
116 | QAction* m_terminate; | 118 | QAction* m_terminate; |
117 | QAction* m_transfer; | 119 | QAction* m_transfer; |
118 | QAction* m_setProfiles; | 120 | QAction* m_setProfiles; |
119 | QAction* m_openKeys; | 121 | QAction* m_openKeys; |
diff --git a/noncore/apps/opie-console/terminalwidget.cpp b/noncore/apps/opie-console/terminalwidget.cpp index a8cee93..70f7c9b 100644 --- a/noncore/apps/opie-console/terminalwidget.cpp +++ b/noncore/apps/opie-console/terminalwidget.cpp | |||
@@ -47,30 +47,30 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent, | |||
47 | m_sizeSmall = new QRadioButton(tr("small"), m_groupSize ); | 47 | m_sizeSmall = new QRadioButton(tr("small"), m_groupSize ); |
48 | m_sizeMedium = new QRadioButton(tr("medium"), m_groupSize ); | 48 | m_sizeMedium = new QRadioButton(tr("medium"), m_groupSize ); |
49 | m_sizeLarge = new QRadioButton(tr("large"), m_groupSize ); | 49 | m_sizeLarge = new QRadioButton(tr("large"), m_groupSize ); |
50 | 50 | ||
51 | m_groupConv = new QHGroupBox(tr("Line-break conversions"), this ); | 51 | m_groupConv = new QHGroupBox( tr("Line-break conversions"), this ); |
52 | m_convInbound = new QCheckBox(tr("Inbound"), m_groupConv ); | 52 | m_convInbound = new QCheckBox( tr("Inbound"), m_groupConv ); |
53 | m_convOutbound = new QCheckBox(tr("Outbound"), m_groupConv ); | 53 | m_convOutbound = new QCheckBox( tr("Outbound"), m_groupConv ); |
54 | 54 | ||
55 | m_groupOptions = new QHGroupBox( tr("Options"), this ); | 55 | m_groupOptions = new QHGroupBox( tr("Options"), this ); |
56 | m_optionEcho = new QCheckBox(tr("Local echo"), m_groupOptions ); | 56 | m_optionEcho = new QCheckBox( tr("Local echo"), m_groupOptions ); |
57 | m_optionWrap = new QCheckBox(tr("Line wrap"), m_groupOptions ); | 57 | m_optionWrap = new QCheckBox( tr("Line wrap"), m_groupOptions ); |
58 | 58 | ||
59 | m_lroot = new QVBoxLayout( this ); | 59 | m_lroot = new QVBoxLayout( this ); |
60 | m_typeBox = new QVBoxLayout( m_lroot ); | 60 | m_typeBox = new QVBoxLayout( m_lroot ); |
61 | m_colorBox = new QVBoxLayout( m_lroot ); | 61 | m_colorBox = new QVBoxLayout( m_lroot ); |
62 | 62 | ||
63 | // Layout | 63 | // Layout |
64 | m_typeBox->add(m_terminal ); | 64 | m_typeBox->add( m_terminal ); |
65 | m_typeBox->add(m_terminalBox ); | 65 | m_typeBox->add( m_terminalBox ); |
66 | m_lroot->add(m_groupSize ); | 66 | m_lroot->add( m_groupSize ); |
67 | 67 | ||
68 | m_colorBox->add( m_colorLabel ); | 68 | m_colorBox->add( m_colorLabel ); |
69 | m_colorBox->add( m_colorCmb ); | 69 | m_colorBox->add( m_colorCmb ); |
70 | 70 | ||
71 | m_lroot->add(m_groupConv ); | 71 | m_lroot->add( m_groupConv ); |
72 | m_lroot->add(m_groupOptions ); | 72 | m_lroot->add( m_groupOptions ); |
73 | m_lroot->addStretch( 0 ); | 73 | m_lroot->addStretch( 0 ); |
74 | 74 | ||
75 | // Fill in some options | 75 | // Fill in some options |
76 | qWarning("Options for terminal box"); | 76 | qWarning("Options for terminal box"); |