summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/settings/button/buttonsettings.cpp34
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
@@ -25,6 +25,10 @@
*/
+#include "buttonsettings.h"
+#include "buttonutils.h"
+#include "remapdlg.h"
+
#include <opie2/odevice.h>
#include <qpe/applnk.h>
@@ -32,10 +36,8 @@
#include <qlayout.h>
#include <qlabel.h>
#include <qtimer.h>
+#include <qscrollview.h>
-#include "buttonsettings.h"
-#include "buttonutils.h"
-#include "remapdlg.h"
using namespace Opie::Core;
@@ -65,8 +67,16 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *, bool, WFlags
setCaption ( tr( "Button Settings" ));
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 );
QGridLayout *lay = new QGridLayout ( toplay );
@@ -82,7 +92,7 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *, bool, WFlags
int index = 0;
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 );
i++;
@@ -96,32 +106,32 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *, bool, WFlags
bi-> m_pdirty = false;
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 );
bi-> m_hlabel = l;