1 files changed, 22 insertions, 12 deletions

diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index 779f6ef..a90b4a1 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -26,4 +26,8 @@
 */
 
+#include "buttonsettings.h"
+#include "buttonutils.h"
+#include "remapdlg.h"
+
 #include <opie2/odevice.h>
 
@@ -33,8 +37,6 @@
 #include <qlabel.h>
 #include <qtimer.h>
+#include <qscrollview.h>
 
-#include "buttonsettings.h"
-#include "buttonutils.h"
-#include "remapdlg.h"
 
 using namespace Opie::Core;
@@ -66,6 +68,14 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *,  bool, WFlags
 
 	QVBoxLayout *toplay = new QVBoxLayout ( this, 3, 3 );
+    QScrollView*mainview = new QScrollView(this);
+    mainview->setResizePolicy( QScrollView::AutoOneFit );
+
+    toplay->addWidget(mainview);
+    QFrame*framehold=new QFrame(mainview->viewport());
+    framehold->setFrameStyle(QFrame::NoFrame|QFrame::Plain);
+    mainview->addChild(framehold);
+    toplay = new QVBoxLayout (framehold, 3, 3 );
 
-	QLabel *l = new QLabel ( tr( "<center>Press or hold the button you want to remap.</center>" ), this );
+    QLabel *l = new QLabel ( tr( "<center>Press or hold the button you want to remap.</center>" ), framehold );
 	toplay-> addWidget ( l );
 
@@ -83,5 +93,5 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *,  bool, WFlags
 	for ( QValueList<ODeviceButton>::ConstIterator it = buttons. begin ( ); it != buttons. end ( ); it++ ) {
 		if ( it != buttons. begin ( )) {
-			QFrame *f = new QFrame ( this );
+            QFrame *f = new QFrame ( framehold );
 			f-> setFrameStyle ( QFrame::Sunken | QFrame::VLine );
 			lay-> addMultiCellWidget ( f, i, i, 0, 3 );
@@ -97,30 +107,30 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *,  bool, WFlags
 		bi-> m_hdirty = false;
 
-		l = new QLabel ( this );
+        l = new QLabel ( framehold );
 		l-> setPixmap (( *it ). pixmap ( ));
 
 		lay-> addMultiCellWidget ( l, i, i + 1, 0, 0 );
 
-		l = new QLabel ( tr( "Press:" ), this );
+        l = new QLabel ( tr( "Press:" ), framehold );
 		lay-> addWidget ( l, i, 1, AlignLeft | AlignBottom );
-		l = new QLabel ( tr( "Hold:" ), this );
+        l = new QLabel ( tr( "Hold:" ), framehold );
 		lay-> addWidget ( l, i + 1, 1, AlignLeft | AlignTop );
 
-		l = new QLabel ( this );
+        l = new QLabel ( framehold );
 		l-> setFixedSize ( 16, 16 );
 		lay-> addWidget ( l, i, 2, AlignLeft | AlignBottom );
 		bi-> m_picon = l;
 
-		l = new QLabel ( this );
+        l = new QLabel ( framehold );
 		l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
 		lay-> addWidget ( l, i, 3, AlignLeft | AlignBottom );
 		bi-> m_plabel = l;
 
-		l = new QLabel ( this );
+        l = new QLabel ( framehold );
 		l-> setFixedSize ( 16, 16 );
 		lay-> addWidget ( l, i + 1, 2, AlignLeft | AlignTop );
 		bi-> m_hicon = l;
 
-		l = new QLabel ( this );
+        l = new QLabel ( framehold );
 		l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
 		lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop );