Changeset 6193 for trunk/qt4-gui/src/settings/contactlist.cpp

Timestamp:

05/11/08 19:17:12 (8 months ago)

Author:

flynd

Message:

Revised r6191. scrollTo needs to be called for some cases. It's just the call triggered by layoutChanged that we want to ignore. And I don't see any reason to have this configurable.

Files:

• trunk/qt4-gui/src/settings/contactlist.cpp (modified) (4 diffs)

trunk/qt4-gui/src/settings/contactlist.cpp

@@ -161 +161 @@
   myBehaviourLayout->addWidget(myMainWinStickyCheck, 0, 1);
 
-  myAutoScrollCheck = new QCheckBox(tr("Automatic scrolling"));
-  myAutoScrollCheck->setToolTip(tr("Automatically scroll to the selected item if it was moved out of the view."));
-  myBehaviourLayout->addWidget(myAutoScrollCheck, 1, 1);
-
   QHBoxLayout* mySortByLayout = new QHBoxLayout();
   mySortByLabel = new QLabel(tr("Additional sorting:"));
@@ -180 +176 @@
   mySortByLabel->setBuddy(mySortByCombo);
   mySortByLayout->addWidget(mySortByCombo);
-  myBehaviourLayout->addLayout(mySortByLayout, 2, 1);
+  myBehaviourLayout->addLayout(mySortByLayout, 1, 1);
 
 
@@ -351 +347 @@
   myScrollBarCheck->setChecked(contactListConfig->allowScrollBar());
   mySysBackCheck->setChecked(contactListConfig->useSystemBackground());
-  myAutoScrollCheck->setChecked(contactListConfig->autoScroll());
 
   int numColumns = contactListConfig->columnCount();
@@ -424 +419 @@
   contactListConfig->setAllowScrollBar(myScrollBarCheck->isChecked());
   contactListConfig->setUseSystemBackground(mySysBackCheck->isChecked());
-  contactListConfig->setAutoScroll(myAutoScrollCheck->isChecked());
 
   for (unsigned short i = 0; i < MAX_COLUMNCOUNT; ++i)