summaryrefslogtreecommitdiff
authorsandman <sandman>2002-11-28 00:35:42 (UTC)
committer sandman <sandman>2002-11-28 00:35:42 (UTC)
commit57ad30fb514428e068142e31ee40aa1615291123 (patch) (unidiff)
treee5fd98fec4f207730e1e7e6cbda1044e96711cad
parent27fe94d8aec5ffff56b39eb89b0e36f2b1c229ed (diff)
downloadopie-57ad30fb514428e068142e31ee40aa1615291123.zip
opie-57ad30fb514428e068142e31ee40aa1615291123.tar.gz
opie-57ad30fb514428e068142e31ee40aa1615291123.tar.bz2
two small fixes for the new "no style" list:
- changes are saved on "OK" even when the embedded lineedit has the focus - the order of the entries not reversed on each invocation anymore
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/appearance2/appearance.cpp8
-rw-r--r--noncore/settings/appearance2/exceptlistitem.h2
2 files changed, 7 insertions, 3 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 22b12b4..f611799 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -283,12 +283,13 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
283 m_except-> setColumnAlignment ( 2, AlignCenter ); 283 m_except-> setColumnAlignment ( 2, AlignCenter );
284 m_except-> setAllColumnsShowFocus ( true ); 284 m_except-> setAllColumnsShowFocus ( true );
285 m_except-> setMinimumHeight ( 30 ); 285 m_except-> setMinimumHeight ( 30 );
286 m_except-> header ( )-> setClickEnabled ( false ); 286 m_except-> header ( )-> setClickEnabled ( false );
287 m_except-> header ( )-> setResizeEnabled ( false ); 287 m_except-> header ( )-> setResizeEnabled ( false );
288 m_except-> header ( )-> setMovingEnabled ( false ); 288 m_except-> header ( )-> setMovingEnabled ( false );
289 m_except-> setSorting ( -1 );
289 lay-> addMultiCellWidget ( m_except, 2, 6, 0, 0 ); 290 lay-> addMultiCellWidget ( m_except, 2, 6, 0, 0 );
290 291
291 connect ( m_except, SIGNAL( clicked ( QListViewItem *, const QPoint &, int )), this, SLOT( clickedExcept ( QListViewItem *, const QPoint &, int ))); 292 connect ( m_except, SIGNAL( clicked ( QListViewItem *, const QPoint &, int )), this, SLOT( clickedExcept ( QListViewItem *, const QPoint &, int )));
292 293
293 QToolButton *tb = new QToolButton ( tab ); 294 QToolButton *tb = new QToolButton ( tab );
294 tb-> setIconSet ( Resource::loadIconSet ( "appearance/add" )); 295 tb-> setIconSet ( Resource::loadIconSet ( "appearance/add" ));
@@ -315,16 +316,17 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
315 connect ( tb, SIGNAL( clicked ( )), this, SLOT( downExcept ( ))); 316 connect ( tb, SIGNAL( clicked ( )), this, SLOT( downExcept ( )));
316 317
317 lay-> setRowStretch ( 6, 10 ); 318 lay-> setRowStretch ( 6, 10 );
318 lay-> setColStretch ( 0, 10 ); 319 lay-> setColStretch ( 0, 10 );
319 320
320 QStringList sl = cfg. readListEntry ( "NoStyle", ';' ); 321 QStringList sl = cfg. readListEntry ( "NoStyle", ';' );
322 QListViewItem *lvit = 0;
321 for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) { 323 for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) {
322 int fl = ( *it ). left ( 1 ). toInt ( 0, 32 ); 324 int fl = ( *it ). left ( 1 ). toInt ( 0, 32 );
323 325
324 new ExceptListItem ( m_except, ( *it ). mid ( 1 ), fl & 0x01, fl & 0x02, fl & 0x04 ); 326 lvit = new ExceptListItem ( m_except, lvit, ( *it ). mid ( 1 ), fl & 0x01, fl & 0x02, fl & 0x04 );
325 } 327 }
326 328
327 329
328 vertLayout-> addSpacing ( 3 ); 330 vertLayout-> addSpacing ( 3 );
329 QFrame *f = new QFrame ( tab ); 331 QFrame *f = new QFrame ( tab );
330 f-> setFrameStyle ( QFrame::HLine | QFrame::Sunken ); 332 f-> setFrameStyle ( QFrame::HLine | QFrame::Sunken );
@@ -452,12 +454,14 @@ void Appearance::accept ( )
452 454
453 if ( item ) 455 if ( item )
454 item-> save ( config ); 456 item-> save ( config );
455 } 457 }
456 458
457 459
460 m_except-> setFocus ( ); // if the focus was on the embedded line-edit, we have to move it away first, so the contents are updated
461
458 QStringList sl; 462 QStringList sl;
459 for ( ExceptListItem *it = (ExceptListItem *) m_except-> firstChild ( ); it; it = (ExceptListItem *) it-> nextSibling ( )) { 463 for ( ExceptListItem *it = (ExceptListItem *) m_except-> firstChild ( ); it; it = (ExceptListItem *) it-> nextSibling ( )) {
460 int fl = 0; 464 int fl = 0;
461 fl |= ( it-> noStyle ( ) ? 0x01 : 0 ); 465 fl |= ( it-> noStyle ( ) ? 0x01 : 0 );
462 fl |= ( it-> noFont ( ) ? 0x02 : 0 ); 466 fl |= ( it-> noFont ( ) ? 0x02 : 0 );
463 fl |= ( it-> noDeco ( ) ? 0x04 : 0 ); 467 fl |= ( it-> noDeco ( ) ? 0x04 : 0 );
@@ -649,13 +653,13 @@ void Appearance::deleteSchemeClicked()
649 } 653 }
650} 654}
651 655
652 656
653void Appearance::addExcept ( ) 657void Appearance::addExcept ( )
654{ 658{
655 ExceptListItem *it = new ExceptListItem ( m_except, tr( "<new>" ), true, true, true ); 659 ExceptListItem *it = new ExceptListItem ( m_except, 0, tr( "<new>" ), true, true, true );
656 m_except-> ensureItemVisible ( it ); 660 m_except-> ensureItemVisible ( it );
657 m_except-> setSelected ( it, true ); 661 m_except-> setSelected ( it, true );
658} 662}
659 663
660void Appearance::delExcept ( ) 664void Appearance::delExcept ( )
661{ 665{
diff --git a/noncore/settings/appearance2/exceptlistitem.h b/noncore/settings/appearance2/exceptlistitem.h
index 5eda79c..7b4fa48 100644
--- a/noncore/settings/appearance2/exceptlistitem.h
+++ b/noncore/settings/appearance2/exceptlistitem.h
@@ -32,13 +32,13 @@
32#include <qpixmap.h> 32#include <qpixmap.h>
33#include <qimage.h> 33#include <qimage.h>
34#include <qpainter.h> 34#include <qpainter.h>
35 35
36class ExceptListItem : public QListViewItem { 36class ExceptListItem : public QListViewItem {
37public: 37public:
38 ExceptListItem ( QListView *lv, const QString &t, bool nostyle = true, bool nofont = true, bool nodeco = true ) : QListViewItem ( lv ) 38 ExceptListItem ( QListView *lv, QListViewItem *after, const QString &t, bool nostyle = true, bool nofont = true, bool nodeco = true ) : QListViewItem ( lv, after )
39 { 39 {
40 m_text = t; 40 m_text = t;
41 41
42 m_nofont = nofont; 42 m_nofont = nofont;
43 m_nostyle = nostyle; 43 m_nostyle = nostyle;
44 m_nodeco = nodeco; 44 m_nodeco = nodeco;