[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace/kcontrol/input
From: Darío Andrés Rodríguez <andresbajotierra () gmail ! co
Date: 2010-01-20 19:10:16
Message-ID: 1264014616.508283.20684.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1077725 by darioandres:
- Implement http://reviewboard.kde.org/r/1968/
- Use a NumInput (spinbox+slider) for the "Automatic selection delay" in order to \
improve the usability
- Added some translation contexts
- Fixed tab ordering
BUG: 206668
M +36 -73 kmousedlg.ui
M +0 -14 mouse.cpp
--- trunk/KDE/kdebase/workspace/kcontrol/input/kmousedlg.ui #1077724:1077725
@@ -163,9 +163,9 @@
</widget>
</item>
<item>
- <layout class="QHBoxLayout">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
- <spacer>
+ <spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -181,79 +181,35 @@
</spacer>
</item>
<item>
- <layout class="QGridLayout">
- <property name="margin">
+ <widget class="KIntNumInput" name="slAutoSelect">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="label">
+ <string comment="label. delay (on milliseconds) to automatically \
select icons">Delay</string> + </property>
+ <property name="minimum">
<number>0</number>
</property>
- <item row="0" column="0">
- <widget class="QLabel" name="lDelay">
- <property name="text">
- <string>Dela&y:</string>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
- <property name="buddy">
- <cstring>slAutoSelect</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2">
- <widget class="QSlider" name="slAutoSelect">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="minimumSize">
- <size>
- <width>250</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximum">
- <number>2000</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="lb_short">
- <property name="text">
- <string>Short</string>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QLabel" name="lb_long">
- <property name="text">
- <string>Long</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <property name="maximum">
+ <number>2000</number>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <property name="singleStep">
+ <number>125</number>
</property>
- </spacer>
+ <property name="suffix">
+ <string comment="milliseconds. time to automatically select the \
items"> ms</string> + </property>
+ <property name="sliderEnabled">
+ <bool>true</bool>
+ </property>
+ </widget>
</item>
</layout>
</item>
@@ -282,14 +238,21 @@
</item>
</layout>
</widget>
+ <customwidgets>
+ <customwidget>
+ <class>KIntNumInput</class>
+ <extends>QWidget</extends>
+ <header>knuminput.h</header>
+ </customwidget>
+ </customwidgets>
<tabstops>
<tabstop>rightHanded</tabstop>
<tabstop>leftHanded</tabstop>
+ <tabstop>cbScrollPolarity</tabstop>
+ <tabstop>doubleClick</tabstop>
<tabstop>singleClick</tabstop>
<tabstop>cb_pointershape</tabstop>
<tabstop>cbAutoSelect</tabstop>
- <tabstop>slAutoSelect</tabstop>
- <tabstop>doubleClick</tabstop>
</tabstops>
<includes>
<include location="global">kdialog.h</include>
--- trunk/KDE/kdebase/workspace/kcontrol/input/mouse.cpp #1077724:1077725
@@ -147,13 +147,6 @@
" want only to select the icon without activating it.");
generalTab->cbAutoSelect->setWhatsThis( wtstr );
-// slAutoSelect = new QSlider(0, 2000, 10, 0, QSlider::Horizontal, generalTab);
- generalTab->slAutoSelect->setSingleStep( 125 );
- generalTab->slAutoSelect->setPageStep( 125 );
- generalTab->slAutoSelect->setTickPosition( QSlider::TicksBelow );
- generalTab->slAutoSelect->setTickInterval( 250 );
- generalTab->slAutoSelect->setTracking( true );
-
wtstr = i18n("If you have checked the option to automatically select"
" icons, this slider allows you to select how long the mouse pointer"
" must be paused over the icon before it is selected.");
@@ -607,10 +600,6 @@
// Delay has a meaning only for autoselect
bool bDelay = generalTab->cbAutoSelect->isChecked() && ! \
generalTab->doubleClick->isChecked(); generalTab->slAutoSelect->setEnabled( bDelay \
);
- generalTab->lDelay->setEnabled( bDelay );
- generalTab->lb_short->setEnabled( bDelay );
- generalTab->lb_long->setEnabled( bDelay );
-
}
/** No descriptions */
@@ -837,10 +826,7 @@
void MouseConfig::slotSmartSliderEnabling()
{
bool enabled = generalTab->singleClick->isChecked() ? \
generalTab->cbAutoSelect->isChecked() : false;
- generalTab->lDelay->setEnabled(enabled);
generalTab->slAutoSelect->setEnabled(enabled);
- generalTab->lb_short->setEnabled(enabled);
- generalTab->lb_long->setEnabled(enabled);
}
#include "mouse.moc"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic