[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-desktop/amourphious/keyboard] kcms/keyboard: fixed warnings retlated to framework5 porting
From: shivam makkar <amourphious1992 () gmail ! com>
Date: 2014-05-16 21:39:12
Message-ID: E1WlPqS-0004v0-6C () scm ! kde ! org
[Download RAW message or body]
Git commit 2e0d36ad01772a517a487e8164abcf357a44f173 by shivam makkar.
Committed on 17/05/2014 at 03:08.
Pushed by makkar into branch 'amourphious/keyboard'.
fixed warnings retlated to framework5 porting
M +12 -5 kcms/keyboard/kcm_keyboard.ui
M +3 -3 kcms/keyboard/kcm_keyboard_widget.cpp
M +33 -15 kcms/keyboard/kcmmisc.cpp
M +4 -3 kcms/keyboard/kcmmisc.h
M +99 -97 kcms/keyboard/kcmmiscwidget.ui
M +2 -2 kcms/keyboard/xinput_helper.cpp
M +1 -1 kcms/keyboard/xinput_helper.h
http://commits.kde.org/plasma-desktop/2e0d36ad01772a517a487e8164abcf357a44f173
diff --git a/kcms/keyboard/kcm_keyboard.ui b/kcms/keyboard/kcm_keyboard.ui
old mode 100644
new mode 100755
index 0062d1c..1998272
--- a/kcms/keyboard/kcm_keyboard.ui
+++ b/kcms/keyboard/kcm_keyboard.ui
@@ -19,7 +19,7 @@
</attribute>
<layout class="QFormLayout" name="formLayout">
<property name="verticalSpacing">
- <number>0</number>
+ <number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
@@ -263,11 +263,11 @@
</widget>
</item>
<item row="2" column="1" colspan="2">
- <widget class="KKeySequenceWidget" name="kdeKeySequence">
+ <widget class="KKeySequenceWidget" name="kdeKeySequence" native="true">
<property name="whatsThis">
<string>This is a shortcut for switching layouts which is handled by KDE. It does not \
support modifier-only shortcuts and also may not work in some situations (e.g. if popup is active or from \
screensaver).</string> </property>
- <property name="multiKeyShortcutsAllowed">
+ <property name="multiKeyShortcutsAllowed" stdset="0">
<bool>false</bool>
</property>
</widget>
@@ -332,7 +332,7 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="previewbutton">
+ <widget class="QPushButton" name="previewButton">
<property name="enabled">
<bool>false</bool>
</property>
@@ -436,7 +436,7 @@
<attribute name="title">
<string>Advanced</string>
</attribute>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout_1">
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="configureKeyboardOptionsChk">
<property name="text">
@@ -460,6 +460,13 @@
</layout>
</widget>
</widget>
+ <customwidgets>
+ <customwidget>
+ <class>KKeySequenceWidget</class>
+ <extends>QWidget</extends>
+ <header>kkeysequencewidget.h</header>
+ </customwidget>
+ </customwidgets>
<resources/>
<connections/>
<slots>
diff --git a/kcms/keyboard/kcm_keyboard_widget.cpp b/kcms/keyboard/kcm_keyboard_widget.cpp
index 21685eb..2840e26 100644
--- a/kcms/keyboard/kcm_keyboard_widget.cpp
+++ b/kcms/keyboard/kcm_keyboard_widget.cpp
@@ -336,7 +336,7 @@ void KCMKeyboardWidget::initializeLayoutsUI()
connect(uiWidget->moveUpBtn, SIGNAL(clicked(bool)), this, SLOT(moveUp()));
connect(uiWidget->moveDownBtn, SIGNAL(clicked(bool)), this, SLOT(moveDown()));
- connect(uiWidget->previewbutton,SIGNAL(clicked(bool)),this,SLOT(previewLayout()));
+ connect(uiWidget->previewButton,SIGNAL(clicked(bool)),this,SLOT(previewLayout()));
connect(uiWidget->xkbGrpClearBtn, SIGNAL(clicked(bool)), this, SLOT(clearGroupShortcuts()));
connect(uiWidget->xkb3rdLevelClearBtn, SIGNAL(clicked(bool)), this, SLOT(clear3rdLevelShortcuts()));
@@ -344,7 +344,7 @@ void KCMKeyboardWidget::initializeLayoutsUI()
// connect(uiWidget->xkbGrpClearBtn, SIGNAL(triggered(QAction*)), this, SLOT(uiChanged()));
// connect(uiWidget->xkb3rdLevelClearBtn, SIGNAL(triggered(QAction*)), this, SLOT(uiChanged()));
connect(uiWidget->kdeKeySequence, SIGNAL(keySequenceChanged(QKeySequence)), this, SLOT(uiChanged()));
- connect(uiWidget->switchingPolicyButtonGroup, SIGNAL(clicked(int)), this, SLOT(uiChanged()));
+ connect(uiWidget->switchingPolicyButtonGroup, SIGNAL(clicked()), this, SLOT(uiChanged()));
connect(uiWidget->xkbGrpShortcutBtn, SIGNAL(clicked(bool)), this, SLOT(scrollToGroupShortcut()));
connect(uiWidget->xkb3rdLevelShortcutBtn, SIGNAL(clicked(bool)), this, \
SLOT(scrollTo3rdLevelShortcut())); @@ -417,7 +417,7 @@ void KCMKeyboardWidget::layoutSelectionChanged()
uiWidget->removeLayoutBtn->setEnabled( ! selected.isEmpty() );
QPair<int, int> rowsRange( getSelectedRowRange(selected) );
uiWidget->moveUpBtn->setEnabled( ! selected.isEmpty() && rowsRange.first > 0);
- uiWidget->previewbutton->setEnabled(! selected.isEmpty());
+ uiWidget->previewButton->setEnabled(! selected.isEmpty());
uiWidget->moveDownBtn->setEnabled( ! selected.isEmpty() && rowsRange.second < \
keyboardConfig->layouts.size()-1 ); }
diff --git a/kcms/keyboard/kcmmisc.cpp b/kcms/keyboard/kcmmisc.cpp
old mode 100644
new mode 100755
index 6f787ea..d14ac2e
--- a/kcms/keyboard/kcmmisc.cpp
+++ b/kcms/keyboard/kcmmisc.cpp
@@ -32,6 +32,7 @@
#include <QCheckBox>
#include <QWhatsThis>
#include <QX11Info>
+#include <QDebug>
#include <klocale.h>
#include <kconfig.h>
@@ -47,9 +48,10 @@ KCMiscKeyboardWidget::KCMiscKeyboardWidget(QWidget *parent)
{
ui.setupUi(this);
- ui.delay->setRange(100, 5000, 50);
- ui.delay->setSliderEnabled(false);
- ui.rate->setRange(0.2, 50, 5, false);
+ ui.delay->setRange(100, 5000);
+ ui.delay->setSingleStep(50);
+ ui.rate->setRange(0.2, 50);
+ ui.rate->setSingleStep(5);
sliderMax = (int)floor (0.5 + 2*(log(5000.0L)-log(100.0L)) / (log(5000.0L)-log(4999.0L)));
ui.delaySlider->setRange(0, sliderMax);
@@ -62,15 +64,25 @@ KCMiscKeyboardWidget::KCMiscKeyboardWidget(QWidget *parent)
ui.rateSlider->setPageStep(500);
ui.rateSlider->setTickInterval(498);
- connect(ui.keyboardRepeatButtonGroup, SIGNAL(clicked()), this, SLOT(changed()));
- connect(ui.keyboardRepeatButtonGroup, SIGNAL(changed(int)), this, \
SLOT(keyboardRepeatStateChanged(int))); + QList <QAbstractButton*> btns = \
ui.kbRepButtonGroup->buttons(); + for(int i = 0; i < btns.size(); i++){
+ ui.kbRepButtonGroup->setId(btns[i], i);
+ }
+
+ btns = ui.numButtonGroup->buttons();
+ for(int i = 0; i < btns.size(); i++){
+ ui.numButtonGroup->setId(btns[i], i);
+ }
+
+ connect(ui.kbRepButtonGroup, SIGNAL(buttonClicked(int)), this, SLOT(changed()));
+ connect(ui.kbRepButtonGroup, SIGNAL(buttonClicked(int)), this, SLOT(keyboardRepeatStateChanged(int)));
connect(ui.delay, SIGNAL(valueChanged(int)), this, SLOT(delaySpinboxChanged(int)));
connect(ui.delaySlider, SIGNAL(valueChanged(int)), this, SLOT(delaySliderChanged(int)));
connect(ui.rate, SIGNAL(valueChanged(double)), this, SLOT(rateSpinboxChanged(double)));
connect(ui.rateSlider, SIGNAL(valueChanged(int)), this, SLOT(rateSliderChanged(int)));
connect(ui.click, SIGNAL(valueChanged(int)), this, SLOT(changed()));
- connect(ui.numlockButtonGroup, SIGNAL(released(int)), this, SLOT(changed()));
+ connect(ui.numButtonGroup, SIGNAL(buttonReleased(int)), this, SLOT(changed()));
// Not sure why we need this - if XKB is not found the whole keyboard module won't be compiled
//#if !defined(HAVE_XTEST) && !defined(HAVE_XKB)
@@ -95,7 +107,7 @@ int KCMiscKeyboardWidget::getClick()
// set the slider and LCD values
void KCMiscKeyboardWidget::setRepeat(TriState keyboardRepeat, int delay_, double rate_)
{
- TriStateHelper::setTriState( ui.keyboardRepeatButtonGroup, keyboardRepeat );
+ TriStateHelper::setTriState( ui.kbRepButtonGroup, keyboardRepeat );
// ui.repeatBox->setChecked(r == AutoRepeatModeOn);
ui.delay->setValue(delay_);
ui.rate->setValue(rate_);
@@ -108,17 +120,22 @@ void KCMiscKeyboardWidget::setClickVolume(int v)
ui.click->setValue(v);
}
-TriState TriStateHelper::getTriState(const KButtonGroup* group)
+TriState TriStateHelper::getTriState(const QButtonGroup* group)
{
- int selected = group->selected();
+ int selected = group->checkedId();
return selected < 0 ? STATE_UNCHANGED : getTriState(selected);
}
-void TriStateHelper::setTriState(KButtonGroup* group, TriState state)
+void TriStateHelper::setTriState(QButtonGroup* group, TriState state)
{
- group->setSelected( getInt(state) );
+ QAbstractButton* checked = group->button(getInt(state));
+ if(checked){
+ checked->setChecked(true);
+ //qDebug()<<"button: "<<checked->text();
+ }
}
+
void KCMiscKeyboardWidget::load()
{
KConfigGroup config(KSharedConfig::openConfig("kcminputrc", KConfig::NoGlobals), "Keyboard");
@@ -152,7 +169,7 @@ void KCMiscKeyboardWidget::load()
// setRepeat(kbd.global_auto_repeat, ui.delay->value(), ui.rate->value());
numlockState = TriStateHelper::getTriState(config.readEntry( "NumLock", \
TriStateHelper::getInt(STATE_UNCHANGED) ));
- TriStateHelper::setTriState( ui.numlockButtonGroup, numlockState );
+ TriStateHelper::setTriState( ui.numButtonGroup, numlockState );
ui.delay->blockSignals(false);
ui.rate->blockSignals(false);
@@ -164,9 +181,10 @@ void KCMiscKeyboardWidget::save()
KConfigGroup config(KSharedConfig::openConfig("kcminputrc", KConfig::NoGlobals), "Keyboard");
clickVolume = getClick();
- keyboardRepeat = TriStateHelper::getTriState(ui.keyboardRepeatButtonGroup);
- numlockState = TriStateHelper::getTriState(ui.numlockButtonGroup);
+ keyboardRepeat = TriStateHelper::getTriState(ui.kbRepButtonGroup);
+ numlockState = TriStateHelper::getTriState(ui.numButtonGroup);
+ //qDebug()<<"kb: "<<keyboardRepeat<<" nmlck: "<<numlockState;
config.writeEntry("ClickVolume",clickVolume);
config.writeEntry("KeyboardRepeating", TriStateHelper::getInt(keyboardRepeat));
config.writeEntry("RepeatRate", ui.rate->value() );
@@ -179,7 +197,7 @@ void KCMiscKeyboardWidget::defaults()
{
setClickVolume(50);
setRepeat(STATE_ON, 660, 25);
- TriStateHelper::setTriState( ui.numlockButtonGroup, STATE_UNCHANGED );
+ TriStateHelper::setTriState( ui.numButtonGroup, STATE_UNCHANGED );
emit changed(true);
}
diff --git a/kcms/keyboard/kcmmisc.h b/kcms/keyboard/kcmmisc.h
old mode 100644
new mode 100755
index 411bdd2..1183fb1
--- a/kcms/keyboard/kcmmisc.h
+++ b/kcms/keyboard/kcmmisc.h
@@ -26,6 +26,7 @@
#include <QString>
#include <QWidget>
+#include <QButtonGroup>
class Ui_KeyboardConfigWidget;
@@ -33,11 +34,11 @@ enum TriState {
STATE_ON = 0, STATE_OFF = 1, STATE_UNCHANGED = 2
};
-class KButtonGroup;
+
class TriStateHelper {
public:
- static void setTriState(KButtonGroup* group, TriState state);
- static TriState getTriState(const KButtonGroup* group);
+ static void setTriState(QButtonGroup* group, TriState state);
+ static TriState getTriState(const QButtonGroup* group);
static TriState getTriState(int state) { return static_cast<TriState>(state); }
static int getInt(TriState state) { return static_cast<int>(state); }
diff --git a/kcms/keyboard/kcmmiscwidget.ui b/kcms/keyboard/kcmmiscwidget.ui
old mode 100644
new mode 100755
index 37fbaf4..25052e4
--- a/kcms/keyboard/kcmmiscwidget.ui
+++ b/kcms/keyboard/kcmmiscwidget.ui
@@ -7,88 +7,16 @@
<x>0</x>
<y>0</y>
<width>577</width>
- <height>361</height>
+ <height>452</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="KButtonGroup" name="numlockGroupBox">
- <property name="whatsThis">
- <string>If supported, this option allows you to setup the state of NumLock after KDE \
startup.<p>You can configure NumLock to be turned on or off, or configure KDE not to set NumLock \
state.</string>
- </property>
- <property name="title">
- <string>NumLock on KDE Startup</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_7">
- <item row="0" column="0">
- <widget class="KButtonGroup" name="numlockButtonGroup">
- <property name="flat">
- <bool>true</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout_6">
- <item row="0" column="0">
- <widget class="QRadioButton" name="RadioButton1">
- <property name="text">
- <string>T&urn on</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QRadioButton" name="RadioButton1_2">
- <property name="text">
- <string>Turn o&ff</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QRadioButton" name="RadioButton1_3">
- <property name="text">
- <string>Leave unchan&ged</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
<item row="1" column="0">
<widget class="QGroupBox" name="keyboardRepeatGroupBox">
<property name="title">
<string>Keyboard Repeat</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <widget class="KButtonGroup" name="keyboardRepeatButtonGroup">
- <property name="flat">
- <bool>true</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QRadioButton" name="keyboardRepeatOnRadioButton">
- <property name="text">
- <string>T&urn on</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QRadioButton" name="keyboardRepeatOffRadioButton">
- <property name="text">
- <string>Turn o&ff</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QRadioButton" name="keyboardRepeatUnchangedRadioButton">
- <property name="text">
- <string>Leave unchan&ged</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
<item row="0" column="1">
<spacer name="horizontalSpacer_2">
<property name="orientation">
@@ -156,11 +84,11 @@
</widget>
</item>
<item row="0" column="2">
- <widget class="KIntNumInput" name="delay">
+ <widget class="QSpinBox" name="delay" native="true">
<property name="whatsThis">
<string>If supported, this option allows you to set the delay after which a pressed key will \
start generating keycodes. The 'Repeat rate' option controls the frequency of these keycodes.</string> \
</property>
- <property name="suffix">
+ <property name="suffix" stdset="0">
<string> ms</string>
</property>
</widget>
@@ -210,11 +138,11 @@
</widget>
</item>
<item row="1" column="2">
- <widget class="KDoubleNumInput" name="rate">
+ <widget class="QDoubleSpinBox" name="rate" native="true">
<property name="whatsThis">
<string>If supported, this option allows you to set the rate at which keycodes are generated \
while a key is pressed.</string> </property>
- <property name="suffix">
+ <property name="suffix" stdset="0">
<string> repeats/s</string>
</property>
</widget>
@@ -222,6 +150,45 @@
</layout>
</widget>
</item>
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="keyboardRepeatButtonGroup">
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="keyboardRepeatOnRadioButton">
+ <property name="text">
+ <string>T&urn on</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">kbRepButtonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QRadioButton" name="keyboardRepeatOffRadioButton">
+ <property name="text">
+ <string>Turn o&ff</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">kbRepButtonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QRadioButton" name="keyboardRepeatUnchangedRadioButton">
+ <property name="text">
+ <string>Leave unchan&ged</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">kbRepButtonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -308,28 +275,63 @@
</property>
</widget>
</item>
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="numlockGroupBox">
+ <property name="whatsThis">
+ <string>If supported, this option allows you to setup the state of NumLock after KDE \
startup.<p>You can configure NumLock to be turned on or off, or configure KDE not to set NumLock \
state.</string> + </property>
+ <property name="title">
+ <string>NumLock on KDE Startup</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_7">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="numlocgroupBox">
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_6">
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="RadioButton1">
+ <property name="text">
+ <string>T&urn on</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">numButtonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QRadioButton" name="RadioButton1_2">
+ <property name="text">
+ <string>Turn o&ff</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">numButtonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QRadioButton" name="RadioButton1_3">
+ <property name="text">
+ <string>Leave unchan&ged</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">numButtonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KDoubleNumInput</class>
- <extends>QWidget</extends>
- <header>knuminput.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>KButtonGroup</class>
- <extends>QGroupBox</extends>
- <header>kbuttongroup.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>KIntNumInput</class>
- <extends>QWidget</extends>
- <header>knuminput.h</header>
- <container>1</container>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
+ <buttongroups>
+ <buttongroup name="kbRepButtonGroup"/>
+ <buttongroup name="numButtonGroup"/>
+ </buttongroups>
</ui>
diff --git a/kcms/keyboard/xinput_helper.cpp b/kcms/keyboard/xinput_helper.cpp
index b311579..b245e91 100644
--- a/kcms/keyboard/xinput_helper.cpp
+++ b/kcms/keyboard/xinput_helper.cpp
@@ -38,7 +38,7 @@ static int DEVICE_NONE = 0;
static int DEVICE_KEYBOARD = 1;
static int DEVICE_POINTER = 2;
-XInputEventNotifier::XInputEventNotifier(QWidget* parent):
+XInputEventNotifier::XInputEventNotifier(QWidget* /*parent*/):
XEventNotifier(), //TODO: destruct properly?
xinputEventType(-1)
{
@@ -92,7 +92,7 @@ static bool isRealKeyboard(const char* deviceName)
&& strstr(deviceName, "WMI hotkeys") == NULL;
}
-int XInputEventNotifier::getNewDeviceEventType(xcb_generic_event_t* event)
+int XInputEventNotifier::getNewDeviceEventType(xcb_generic_event_t* /*event*/)
{
int newDeviceType = DEVICE_NONE;
diff --git a/kcms/keyboard/xinput_helper.h b/kcms/keyboard/xinput_helper.h
index 343d7ed..35c1f05 100644
--- a/kcms/keyboard/xinput_helper.h
+++ b/kcms/keyboard/xinput_helper.h
@@ -29,7 +29,7 @@ class XInputEventNotifier: public XEventNotifier {
Q_OBJECT
public:
- XInputEventNotifier(QWidget* parent=NULL);
+ XInputEventNotifier(QWidget* = NULL);
void start();
void stop();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic