7 files changed, 72 insertions, 61 deletions

diff --git a/noncore/apps/opie-console/configdialog.cpp b/noncore/apps/opie-console/configdialog.cpp
index 0bc6588..53b3853 100644
--- a/noncore/apps/opie-console/configdialog.cpp
+++ b/noncore/apps/opie-console/configdialog.cpp
@@ -77,3 +77,3 @@ void ConfigDialog::slotEdit() {
 
-        dlg.setCaption("Edit Connection Profile");
+        dlg.setCaption(tr("Edit Connection Profile"));
         dlg.showMaximized();
@@ -96,3 +96,3 @@ void ConfigDialog::slotAdd() {
 
-        dlg.setCaption("New Connection");
+        dlg.setCaption(tr("New Connection"));
         dlg.showMaximized();
diff --git a/noncore/apps/opie-console/consoleconfigwidget.cpp b/noncore/apps/opie-console/consoleconfigwidget.cpp
index 3f2d154..faedc58 100644
--- a/noncore/apps/opie-console/consoleconfigwidget.cpp
+++ b/noncore/apps/opie-console/consoleconfigwidget.cpp
@@ -10,2 +10,6 @@
 
+#include <pwd.h>
+#include <sys/types.h>
+
+
 #include "consoleconfigwidget.h"
@@ -67,7 +71,14 @@ void ConsoleConfigWidget::load( const Profile& prof ) {
     /*
-     * we will use /bin/bash as default
-     * but will fallback in MyPty to /bin/sh
-     * if necessary
+     * default to the users default shell
      */
-    m_cmd->setText(prof.readEntry("Command", "/bin/bash"));
+    struct passwd *ent = 0;
+    char *shell = "/bin/sh";
+
+    while ( (ent = getpwent()) != 0 ) {
+        if (ent->pw_shell != "")  {
+            shell = ent->pw_shell;
+        }
+    }
+
+    m_cmd->setText(prof.readEntry("Command", shell ));
     int envcount = prof.readNumEntry("EnvVars", 0);
diff --git a/noncore/apps/opie-console/main.cpp b/noncore/apps/opie-console/main.cpp
index b17f8e8..228db57 100644
--- a/noncore/apps/opie-console/main.cpp
+++ b/noncore/apps/opie-console/main.cpp
@@ -31,43 +31,41 @@ FixIt::FixIt() {
     /* the new inittab */
-    m_file = "#\n# /etc/inittab
-#
-
-#   0 - halt (Do NOT set initdefault to this)
-#   1 - Single user mode
-#   2 - Multiuser, without NFS (The same as 3, if you do not have networking)
-#   3 - Full multiuser mode
-#   4 - JavaVM(Intent) developer mode
-#   5 - JavaVM(Intent)
-#   6 - reboot (Do NOT set initdefault to this)
-#
-id:5:initdefault:
-
-# Specify things to do when starting
-si::sysinit:/etc/rc.d/rc.sysinit
-
-l0:0:wait:/root/etc/rc.d/rc 0
-l1:1:wait:/etc/rc.d/rc 1
-l2:2:wait:/etc/rc.d/rc 2
-l3:3:wait:/etc/rc.d/rc 3
-l4:4:wait:/etc/rc.d/rc 4
-l5:5:wait:/etc/rc.d/rc 5
-l6:6:wait:/root/etc/rc.d/rc 6
-
-# Specify things to do before rebooting
-um::ctrlaltdel:/bin/umount -a -r > /dev/null 2>&1
-sw::ctrlaltdel:/sbin/swapoff -a > /dev/null 2>&1
-
-# Specify program to run on ttyS0
-s0:24:respawn:/sbin/getty 9600 ttyS0
-#pd:5:respawn:/etc/sync/serialctl
-
-# Specify program to run on tty1
-1:2:respawn:/sbin/getty 9600 tty1
-ln:345:respawn:survive -l 6 /sbin/launch
-#qt:5:respawn:/sbin/qt
-
-# collie sp.
-sy::respawn:/sbin/shsync\n";
-
-
+    m_file = "#\n# /etc/inittab"
+"#"
+""
+"#   0 - halt (Do NOT set initdefault to this)"
+"#   1 - Single user mode"
+"#   2 - Multiuser, without NFS (The same as 3, if you do not have networking)"
+"#   3 - Full multiuser mode"
+"#   4 - JavaVM(Intent) developer mode"
+"#   5 - JavaVM(Intent)"
+"#   6 - reboot (Do NOT set initdefault to this)"
+"#"
+"id:5:initdefault:"
+""
+"# Specify things to do when starting"
+"si::sysinit:/etc/rc.d/rc.sysinit"
+""
+"l0:0:wait:/root/etc/rc.d/rc 0"
+"l1:1:wait:/etc/rc.d/rc 1"
+"l2:2:wait:/etc/rc.d/rc 2"
+"l3:3:wait:/etc/rc.d/rc 3"
+"l4:4:wait:/etc/rc.d/rc 4"
+"l5:5:wait:/etc/rc.d/rc 5"
+"l6:6:wait:/root/etc/rc.d/rc 6"
+""
+"# Specify things to do before rebooting"
+"um::ctrlaltdel:/bin/umount -a -r > /dev/null 2>&1"
+"sw::ctrlaltdel:/sbin/swapoff -a > /dev/null 2>&1"
+""
+"# Specify program to run on ttyS0"
+"s0:24:respawn:/sbin/getty 9600 ttyS0"
+"#pd:5:respawn:/etc/sync/serialctl"
+""
+"# Specify program to run on tty1"
+"1:2:respawn:/sbin/getty 9600 tty1"
+"ln:345:respawn:survive -l 6 /sbin/launch"
+"#qt:5:respawn:/sbin/qt"
+""
+"# collie sp."
+"sy::respawn:/sbin/shsync\n";
 }
@@ -91,3 +89,2 @@ void FixIt::fixIt() {
 
-
 int main(int argc, char **argv) {
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index c48116d..3c9603c 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -86,3 +86,3 @@ void MainWindow::initUI() {
      */
-    QAction* newCon = new QAction(tr("New Connection"),
+    QAction* newCon = new QAction(tr("New Profile"),
                              Resource::loadPixmap( "new" ),
@@ -95,3 +95,3 @@ void MainWindow::initUI() {
 
-    QAction *saveCon = new QAction(tr("Save Connection"),
+    QAction *saveCon = new QAction( tr("Save Profile" ),
                       Resource::loadPixmap( "save" ), QString::null,
@@ -430,2 +430,3 @@ void MainWindow::slotQuickLaunch()  {
         create( newProf );
+        slotSaveSession();
     }
diff --git a/noncore/apps/opie-console/opie-console.control b/noncore/apps/opie-console/opie-console.control
index 693c72c..852451d 100644
--- a/noncore/apps/opie-console/opie-console.control
+++ b/noncore/apps/opie-console/opie-console.control
@@ -7,3 +7,3 @@ Architecture: arm
 Version: 0.6-$SUB_VERSION
-Depends: qpe-base, libopie1, lrzsz, opie-keytabs
+Depends: qpe-base, libopie1, opie-console-help-en, lrzsz, opie-keytabs
 License: GPL
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index 58b29ca..ccf2e08 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -13,3 +13,2 @@ HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
                profilemanager.h  \
-               configwidget.h \
                tabwidget.h \
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 6b607df..e2501a6 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -36,9 +36,9 @@ ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
 {
-        // Default profile
-        m_prof = Profile("New Profile", "serial", "default", Profile::Black, Profile::White, Profile::VT102);
+    // Default profile
+    m_prof = Profile(tr("New Profile"), "serial", "default", Profile::Black, Profile::White, Profile::VT102);
 
-        initUI();
+    initUI();
 
-        // Apply current profile
-        // plugin_plugin->load(profile);
+    // Apply current profile
+    // plugin_plugin->load(profile);
 }
@@ -125,4 +125,2 @@ void ProfileEditorDialog::initUI()
     m_name->setText(m_prof.name());
-    slotConActivated(  m_fact->external(m_prof.ioLayerName()  ) );
-    slotTermActivated( m_fact->external(m_prof.terminalName() ) );
     slotKeyActivated( "Default Keyboard" );
@@ -130,2 +128,4 @@ void ProfileEditorDialog::initUI()
     setCurrent( m_fact->external(m_prof.terminalName() ), m_termCmb );
+    slotConActivated(  m_fact->external(m_prof.ioLayerName()  ) );
+    slotTermActivated( m_fact->external(m_prof.terminalName() ) );
     m_autoConnect->setChecked(m_prof.autoConnect());
@@ -201,6 +201,9 @@ void ProfileEditorDialog::slotConActivated( const QString& str ) {
     // supports auto connect and then set it as prefered
-    //if (  (  )->layer()->supports()[0] == 1 ) {
     if ( m_conCmb ->currentText() == tr("Local Console") ) {
         m_autoConnect->setChecked( true );
+        m_prof.writeEntry("Terminal", Profile::Linux );
+        slotTermActivated( m_fact->external (m_prof.terminalName() ) );
     } else {
+        m_prof.writeEntry("Terminal", Profile::VT102 );
+        slotTermActivated( m_fact->external (m_prof.terminalName() ) );
         m_autoConnect->setChecked( false );
@@ -222,3 +225,3 @@ void ProfileEditorDialog::slotTermActivated( const QString& str ) {
 
-    if (m_term) {
+    if ( m_term ) {
         m_term->load( m_prof );