scrollviews for terminal and connetion tab

2 files changed, 31 insertions, 12 deletions

diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 1765d42..9890c3e 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -4,9 +4,9 @@
 #include <qmessagebox.h>
 #include <qstringlist.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
-
+#include <qscrollview.h>
 
 //#include "profileeditorplugins.h"
 #include "metafactory.h"
 #include "profileeditordialog.h"
@@ -52,8 +52,9 @@ Profile ProfileEditorDialog::profile() const
 void ProfileEditorDialog::initUI()
 {
     m_con = m_term = m_key = 0l;
 
+
     QVBoxLayout *mainLayout = new QVBoxLayout( this );
     tabWidget = new OTabWidget( this );
     tabWidget->setTabStyle(OTabWidget::TextTab);
     mainLayout->add(tabWidget);
@@ -63,13 +64,25 @@ void ProfileEditorDialog::initUI()
     m_tabTerm = new QWidget(this);
     m_tabCon  = new QWidget(this);
     m_tabKey  = new QWidget(this);
 
+    m_svCon = new QScrollView( m_tabCon );
+    m_svCon->setResizePolicy( QScrollView::AutoOneFit );
+    m_svCon->setHScrollBarMode( QScrollView::AlwaysOff );
+    m_svCon->setFrameShape( QFrame::NoFrame );
+    m_svTerm = new QScrollView( m_tabTerm );
+    m_svTerm->setResizePolicy( QScrollView::AutoOneFit );
+    m_svTerm->setHScrollBarMode( QScrollView::AlwaysOff );
+    m_svTerm->setFrameShape( QFrame::NoFrame );
+
     /* base layout for tabs */
     m_layCon  = new QHBoxLayout( m_tabCon , 2 );
     m_layTerm = new QHBoxLayout( m_tabTerm, 2 );
     m_layKey = new QHBoxLayout( m_tabKey, 2 );
 
+    m_layCon->addWidget( m_svCon );
+    m_layTerm->addWidget( m_svTerm );
+
     // profile tab
 
     QLabel *name = new QLabel(QObject::tr("Profile name"), tabprof);
     m_name = new QLineEdit(tabprof);
@@ -142,12 +155,12 @@ void ProfileEditorDialog::accept()
 	// Save profile and plugin profile
 	//if(plugin_plugin) plugin_plugin->save();
 
 	// Save general values
-	m_prof.setName(profName());
-	m_prof.setIOLayer(      m_fact->internal(m_conCmb ->currentText()  ) );
+	m_prof.setName( profName() );
+	m_prof.setIOLayer( m_fact->internal(m_conCmb ->currentText()  ) );
         m_prof.setTerminalName( m_fact->internal(m_termCmb->currentText()  ) );
-    m_prof.setAutoConnect( m_autoConnect->isChecked() );
+        m_prof.setAutoConnect( m_autoConnect->isChecked() );
 
         if (m_con )
             m_con->save( m_prof );
         if (m_term )
@@ -175,30 +188,33 @@ QCString ProfileEditorDialog::profType()const
 /*
  * we need to switch the widget
  */
 void ProfileEditorDialog::slotConActivated( const QString& str ) {
+
     delete m_con;
-    m_con = m_fact->newConnectionPlugin( str, m_tabCon );
+
+    m_con = m_fact->newConnectionPlugin( str, m_svCon->viewport() );
 
     if ( !m_con ) {
-        m_con = new NoOptions( str, m_tabCon, "name");
+        m_con = new NoOptions( str, m_svCon->viewport(), "name");
     }
     m_con->load( m_prof );
-    m_layCon->addWidget( m_con );
+    m_svCon->addChild( m_con );
+}
 
-    tabWidget->setCurrentTab( tabprof );
 
-}
 /*
  * we need to switch the widget
  */
 void ProfileEditorDialog::slotTermActivated( const QString& str ) {
+
     delete m_term;
-    m_term = m_fact->newTerminalPlugin( str, m_tabTerm );
+
+    m_term = m_fact->newTerminalPlugin( str, m_svTerm->viewport() );
 
     if (m_term) {
-        m_term->load(m_prof );
-        m_layTerm->addWidget( m_term );
+        m_term->load( m_prof );
+        m_svTerm->addChild( m_term );
     }
 }
 
 void ProfileEditorDialog::slotKeyActivated(const QString &str) {
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index 6216660..c731747 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -13,8 +13,9 @@ class QHBoxLayout;
 class QLineEdit;
 class QComboBox;
 class QCheckBox;
 class QLabel;
+class QScrollView;
 class ProfileDialogWidget;
 
 class ProfileEditorDialog : public QDialog {
     Q_OBJECT
@@ -46,8 +47,10 @@ private:
     QLineEdit *m_name;
     QComboBox *m_conCmb, *m_termCmb;
     QCheckBox *m_autoConnect;
 
+    QScrollView *m_svCon, *m_svTerm;
+
     QWidget *m_tabCon, *m_tabTerm, *m_tabKey;
     ProfileDialogWidget* m_con, *m_term, *m_key;
     QHBoxLayout *m_layCon, *m_layTerm, *m_layKey;
     OTabWidget *tabWidget;