author | harlekin <harlekin> | 2002-10-24 14:44:59 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-24 14:44:59 (UTC) |
commit | 6c5fa32d4ca48498336f986ca4e8a05ad663e10e (patch) (side-by-side diff) | |
tree | 1c9a375b73bbc6137aa6de3f387509e775dd1784 /noncore | |
parent | a33f6eae4730a7ca0bec18b72becd3bc73a20aa5 (diff) | |
download | opie-6c5fa32d4ca48498336f986ca4e8a05ad663e10e.zip opie-6c5fa32d4ca48498336f986ca4e8a05ad663e10e.tar.gz opie-6c5fa32d4ca48498336f986ca4e8a05ad663e10e.tar.bz2 |
nicer layout, and a a qlineedit instead of _2_ QLCDs
-rw-r--r-- | noncore/apps/opie-console/BUGS | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/dialdialog.cpp | 51 | ||||
-rw-r--r-- | noncore/apps/opie-console/dialdialog.h | 5 |
3 files changed, 23 insertions, 36 deletions
diff --git a/noncore/apps/opie-console/BUGS b/noncore/apps/opie-console/BUGS index 694bc8b..8195dc5 100644 --- a/noncore/apps/opie-console/BUGS +++ b/noncore/apps/opie-console/BUGS @@ -31,5 +31,2 @@ connection its used on -- dial dialog - ugly , better use a qlineedit there to for showing or - disable - - exit / strg + d does not close conection / tab
\ No newline at end of file diff --git a/noncore/apps/opie-console/dialdialog.cpp b/noncore/apps/opie-console/dialdialog.cpp index 0d115bc..ac1e1db 100644 --- a/noncore/apps/opie-console/dialdialog.cpp +++ b/noncore/apps/opie-console/dialdialog.cpp @@ -24,19 +24,13 @@ DialDialog::DialDialog( QWidget* parent, const char* name, bool modal, WFlags f - LCD1 = new QLCDNumber( this, "LCD" ); - QFont LCD_font1( LCD1->font() ); - LCD_font1.setPointSize( 7 ); - LCD1->setFont( LCD_font1 ); - LCD1->setNumDigits( 8 ); - LCD1->setSegmentStyle( QLCDNumber::Flat ); - LCD1->setMaximumHeight( 30 ); - - LCD2 = new QLCDNumber( this, "LCD" ); - QFont LCD_font2( LCD2->font() ); - LCD_font2.setPointSize( 7 ); - LCD2->setFont( LCD_font2 ); - LCD2->setNumDigits( 8 ); - LCD2->setSegmentStyle( QLCDNumber::Flat ); - LCD2->setMaximumHeight( 30 ); - - QGridLayout *layout = new QGridLayout( this , 4, 3 ); + m_dialLine = new QLineEdit( this ); + m_dialLine->setReadOnly( true ); + m_dialLine->setFrame( false ); + m_dialLine->setAlignment( Qt::AlignLeft ); + QFont dialLine_font( m_dialLine->font() ); + dialLine_font.setBold( TRUE ); + dialLine_font.setPointSize( 18 ); + m_dialLine->setFont( dialLine_font ); + + QWidget* dialWidget = new QWidget( this ); + QGridLayout *layout = new QGridLayout( dialWidget , 4, 3 ); @@ -44,3 +38,3 @@ DialDialog::DialDialog( QWidget* parent, const char* name, bool modal, WFlags f - QPushButton *number0 = new QPushButton( this ); + QPushButton *number0 = new QPushButton( dialWidget ); number0->setText( QString( "0" ) ); @@ -54,3 +48,3 @@ DialDialog::DialDialog( QWidget* parent, const char* name, bool modal, WFlags f for ( int i = 0 ; i < 9; i++ ) { - QPushButton *number = new QPushButton( this ); + QPushButton *number = new QPushButton( dialWidget ); number->setText( QString( "%1" ).arg( i + 1 ) ); @@ -74,10 +68,9 @@ DialDialog::DialDialog( QWidget* parent, const char* name, bool modal, WFlags f - mainLayout->addStretch( 0 ); + mainLayout->addStretch( 2 ); mainLayout->addWidget( textLabel ); - QHBoxLayout *lcdLayout = new QHBoxLayout(mainLayout); - lcdLayout->addWidget( LCD1 ); - lcdLayout->addWidget( LCD2 ); - mainLayout->addStretch( 0 ); - mainLayout->addLayout( layout ); - mainLayout->addStretch( 0 ); + mainLayout->addStretch( 1 ); + mainLayout->addWidget( m_dialLine ); + mainLayout->addStretch( 2 ); + mainLayout->addWidget( dialWidget ); + mainLayout->addStretch( 4 ); } @@ -104,7 +97,3 @@ void DialDialog::setNumber( QString number ) { - QString n1; - if(number.length() > 8) n1 = number.left(number.length() - 8); - QString n2 = number.right(8); - LCD1->display( n1.toInt() ); - LCD2->display( n2.toInt() ); + m_dialLine->setText( QString("%1").arg( number ) ); } diff --git a/noncore/apps/opie-console/dialdialog.h b/noncore/apps/opie-console/dialdialog.h index 4a74b66..6da26a1 100644 --- a/noncore/apps/opie-console/dialdialog.h +++ b/noncore/apps/opie-console/dialdialog.h @@ -6,3 +6,4 @@ #include <qstring.h> -#include <qlcdnumber.h> +#include <qlineedit.h> + @@ -23,3 +24,3 @@ private: QString m_number; - QLCDNumber *LCD1, *LCD2; + QLineEdit *m_dialLine; |