summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp21
-rw-r--r--noncore/apps/opie-console/mainwindow.h2
-rw-r--r--noncore/apps/opie-console/terminalwidget.cpp26
-rw-r--r--pics/console/konsole_mini.pngbin0 -> 783 bytes
4 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
@@ -49,12 +49,13 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(
m_scriptsData.setAutoDelete(TRUE);
initUI();
populateProfiles();
populateScripts();
}
+
void MainWindow::initUI() {
setToolBarsMovable( FALSE );
/* tool bar for the menu */
m_tool = new QToolBar( this );
m_tool->setHorizontalStretchable( TRUE );
@@ -116,18 +117,25 @@ void MainWindow::initUI() {
m_disconnect->addTo( m_console );
connect(m_disconnect, SIGNAL(activated() ),
this, SLOT(slotDisconnect() ) );
m_console->insertSeparator();
+ m_quickLaunch = new QAction( tr("QuickLaunch"), Resource::loadPixmap("console/konsole_mini"), QString::null, 0, this, 0 );
+ m_quickLaunch->addTo( m_icons );
+ connect( m_quickLaunch, SIGNAL( activated() ),
+ this, SLOT( slotQuickLaunch() ) );
+
m_transfer = new QAction( tr("Transfer file..."), Resource::loadPixmap("pass") , QString::null,
0, this, 0 );
m_transfer->addTo( m_console );
connect(m_transfer, SIGNAL(activated() ),
this, SLOT(slotTransfer() ) );
+
+
/*
* immediate change of line wrap policy
*/
m_isWrapped = false;
m_wrap = new QAction( tr("Line wrap"), Resource::loadPixmap( "linewrap" ), QString::null, 0, this, 0 );
m_wrap->addTo( m_console );
@@ -399,12 +407,22 @@ void MainWindow::slotTerminate() {
currentSession()->layer()->close();
slotClose();
/* FIXME move to the next session */
}
+void MainWindow::slotQuickLaunch() {
+ Profile prof = manager()->profile( "default" );
+ if ( prof.name() == "default" ) {
+ create( prof );
+ } else {
+ QMessageBox::warning(this, tr("Failure"),tr("please configure one profile named \"default\""));
+ }
+
+}
+
void MainWindow::slotConfigure() {
ConfigDialog conf( manager()->all(), factory() );
conf.showMaximized();
int ret = conf.exec();
@@ -456,12 +474,15 @@ void MainWindow::slotClose() {
* and then we will make a profile
*/
void MainWindow::slotProfile( int id) {
Profile prof = manager()->profile( m_sessionsPop->text( id) );
create( prof );
}
+
+
+
void MainWindow::create( const Profile& prof ) {
if(m_curSession)
if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide();
Session *ses = manager()->fromProfile( prof, tabWidget() );
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
@@ -64,12 +64,13 @@ private slots:
void slotOpenKeb(bool);
void slotOpenButtons(bool);
void slotRecordScript();
void slotSaveScript();
void slotRunScript(int);
void slotFullscreen();
+ void slotQuickLaunch();
void slotWrap();
void slotSessionChanged( Session* );
void slotKeyReceived(FKey, ushort, ushort, bool);
void slotSaveHistory();
/* what could these both slot do? */
@@ -110,12 +111,13 @@ private:
QPopupMenu* m_console;
QPopupMenu* m_sessionsPop;
QPopupMenu* m_scriptsPop;
QPopupMenu* m_scripts;
QAction* m_connect;
QAction* m_disconnect;
+ QAction* m_quickLaunch;
QAction* m_terminate;
QAction* m_transfer;
QAction* m_setProfiles;
QAction* m_openKeys;
QAction* m_openButtons;
QAction* m_recordScript;
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
@@ -45,34 +45,34 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
m_groupSize = new QHButtonGroup(tr("Font size"), this );
m_sizeSmall = new QRadioButton(tr("small"), m_groupSize );
m_sizeMedium = new QRadioButton(tr("medium"), m_groupSize );
m_sizeLarge = new QRadioButton(tr("large"), m_groupSize );
- m_groupConv = new QHGroupBox(tr("Line-break conversions"), this );
- m_convInbound = new QCheckBox(tr("Inbound"), m_groupConv );
- m_convOutbound = new QCheckBox(tr("Outbound"), m_groupConv );
+ m_groupConv = new QHGroupBox( tr("Line-break conversions"), this );
+ m_convInbound = new QCheckBox( tr("Inbound"), m_groupConv );
+ m_convOutbound = new QCheckBox( tr("Outbound"), m_groupConv );
m_groupOptions = new QHGroupBox( tr("Options"), this );
- m_optionEcho = new QCheckBox(tr("Local echo"), m_groupOptions );
- m_optionWrap = new QCheckBox(tr("Line wrap"), m_groupOptions );
+ m_optionEcho = new QCheckBox( tr("Local echo"), m_groupOptions );
+ m_optionWrap = new QCheckBox( tr("Line wrap"), m_groupOptions );
- m_lroot = new QVBoxLayout( this );
+ m_lroot = new QVBoxLayout( this );
m_typeBox = new QVBoxLayout( m_lroot );
m_colorBox = new QVBoxLayout( m_lroot );
// Layout
- m_typeBox->add(m_terminal );
- m_typeBox->add(m_terminalBox );
- m_lroot->add(m_groupSize );
+ m_typeBox->add( m_terminal );
+ m_typeBox->add( m_terminalBox );
+ m_lroot->add( m_groupSize );
- m_colorBox->add( m_colorLabel );
- m_colorBox->add( m_colorCmb );
+ m_colorBox->add( m_colorLabel );
+ m_colorBox->add( m_colorCmb );
- m_lroot->add(m_groupConv );
- m_lroot->add(m_groupOptions );
+ m_lroot->add( m_groupConv );
+ m_lroot->add( m_groupOptions );
m_lroot->addStretch( 0 );
// Fill in some options
qWarning("Options for terminal box");
m_terminalBox->insertItem( tr("VT 100"), 0 ); // /*, id_term_vt100*/ );
m_terminalBox->insertItem( tr("VT 102"), 1 ); // /* , id_term_vt102 */);
diff --git a/pics/console/konsole_mini.png b/pics/console/konsole_mini.png
new file mode 100644
index 0000000..590a417
--- a/dev/null
+++ b/pics/console/konsole_mini.png
Binary files differ