yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use KShortcutsEditor directly instead of subclass

Browse source 
We don't need the GlobalShortcutsEditor anymore as the action type
can now be set as a property.
This commit is contained in:
Martin Gräßlin 2013-09-09 06:57:06 +02:00
parent 5ff8d2389e
commit e7a9655223
11 changed files with 71 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
effects/cube/cube_config.ui
View file

@ -83,13 +83,16 @@
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0" colspan="2">
<widget class="KWin::GlobalShortcutsEditor" name="editor" native="true">
<widget class="KShortcutsEditor" name="editor" native="true">
<property name="minimumSize">
<size>
<width>0</width>
<height>200</height>
</size>
</property>
<property name="actionTypes">
<enum>KShortcutsEditor::GlobalAction</enum>
</property>
</widget>
</item>
</layout>
@ -506,9 +509,9 @@ otherwise it will remain active</string>
<container>1</container>
</customwidget>
<customwidget>
<class>KWin::GlobalShortcutsEditor</class>
<class>KShortcutsEditor</class>
<extends>QWidget</extends>
<header location="global">kwineffects.h</header>
<header location="global">KShortcutsEditor</header>
<container>1</container>
</customwidget>
</customwidgets>

9
effects/desktopgrid/desktopgrid_config.ui
View file

@ -201,13 +201,16 @@
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2">
<widget class="KWin::GlobalShortcutsEditor" name="shortcutEditor" native="true">
<widget class="KShortcutsEditor" name="shortcutEditor" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="actionTypes">
<enum>KShortcutsEditor::GlobalAction</enum>
</property>
</widget>
</item>
</layout>
@ -227,9 +230,9 @@
<header>knuminput.h</header>
</customwidget>
<customwidget>
<class>KWin::GlobalShortcutsEditor</class>
<class>KShortcutsEditor</class>
<extends>QWidget</extends>
<header location="global">kwineffects.h</header>
<header location="global">KShortcutsEditor</header>
<container>1</container>
</customwidget>
</customwidgets>

9
effects/flipswitch/flipswitch_config.ui
View file

@ -205,13 +205,16 @@
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2">
<widget class="KWin::GlobalShortcutsEditor" name="shortcutEditor" native="true">
<widget class="KShortcutsEditor" name="shortcutEditor" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="actionTypes">
<enum>KShortcutsEditor::GlobalAction</enum>
</property>
</widget>
</item>
</layout>
@ -226,9 +229,9 @@
<header>knuminput.h</header>
</customwidget>
<customwidget>
<class>KWin::GlobalShortcutsEditor</class>
<class>KShortcutsEditor</class>
<extends>QWidget</extends>
<header location="global">kwineffects.h</header>
<header location="global">KShortcutsEditor</header>
<container>1</container>
</customwidget>
</customwidgets>

10
effects/lookingglass/lookingglass_config.ui
View file

@ -12,7 +12,11 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="2">
<widget class="KWin::GlobalShortcutsEditor" name="editor" native="true"/>
<widget class="KShortcutsEditor" name="editor" native="true">
<property name="actionTypes">
<enum>KShortcutsEditor::GlobalAction</enum>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
@ -49,9 +53,9 @@
<header>knuminput.h</header>
</customwidget>
<customwidget>
<class>KWin::GlobalShortcutsEditor</class>
<class>KShortcutsEditor</class>
<extends>QWidget</extends>
<header location="global">kwineffects.h</header>
<header location="global">KShortcutsEditor</header>
<container>1</container>
</customwidget>
</customwidgets>

10
effects/magnifier/magnifier_config.ui
View file

@ -85,7 +85,11 @@
</widget>
</item>
<item>
<widget class="KWin::GlobalShortcutsEditor" name="editor" native="true"/>
<widget class="KShortcutsEditor" name="editor" native="true">
<property name="actionTypes">
<enum>KShortcutsEditor::GlobalAction</enum>
</property>
</widget>
</item>
</layout>
</widget>
@ -96,9 +100,9 @@
<header>knuminput.h</header>
</customwidget>
<customwidget>
<class>KWin::GlobalShortcutsEditor</class>
<class>KShortcutsEditor</class>
<extends>QWidget</extends>
<header location="global">kwineffects.h</header>
<header location="global">KShortcutsEditor</header>
<container>1</container>
</customwidget>
</customwidgets>

9
effects/mouseclick/mouseclick_config.ui
View file

@ -245,13 +245,16 @@
</widget>
</item>
<item>
<widget class="KWin::GlobalShortcutsEditor" name="editor" native="true">
<widget class="KShortcutsEditor" name="editor" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="actionTypes">
<enum>KShortcutsEditor::GlobalAction</enum>
</property>
</widget>
</item>
</layout>
@ -283,9 +286,9 @@
<header>knuminput.h</header>
</customwidget>
<customwidget>
<class>KWin::GlobalShortcutsEditor</class>
<class>KShortcutsEditor</class>
<extends>QWidget</extends>
<header location="global">kwineffects.h</header>
<header location="global">KShortcutsEditor</header>
<container>1</container>
</customwidget>
</customwidgets>

10
effects/mousemark/mousemark_config.ui
View file

@ -76,7 +76,11 @@
</widget>
</item>
<item>
<widget class="KWin::GlobalShortcutsEditor" name="editor" native="true"/>
<widget class="KShortcutsEditor" name="editor" native="true">
<property name="actionTypes">
<enum>KShortcutsEditor::GlobalAction</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_3">
@ -105,9 +109,9 @@
<header>knuminput.h</header>
</customwidget>
<customwidget>
<class>KWin::GlobalShortcutsEditor</class>
<class>KShortcutsEditor</class>
<extends>QWidget</extends>
<header location="global">kwineffects.h</header>
<header location="global">KShortcutsEditor</header>
<container>1</container>
</customwidget>
</customwidgets>

9
effects/presentwindows/presentwindows_config.ui
View file

@ -18,13 +18,16 @@
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2">
<widget class="KWin::GlobalShortcutsEditor" name="shortcutEditor" native="true">
<widget class="KShortcutsEditor" name="shortcutEditor" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="actionTypes">
<enum>KShortcutsEditor::GlobalAction</enum>
</property>
</widget>
</item>
</layout>
@ -459,9 +462,9 @@
<header>kcombobox.h</header>
</customwidget>
<customwidget>
<class>KWin::GlobalShortcutsEditor</class>
<class>KShortcutsEditor</class>
<extends>QWidget</extends>
<header location="global">kwineffects.h</header>
<header location="global">KShortcutsEditor</header>
<container>1</container>
</customwidget>
</customwidgets>

10
effects/thumbnailaside/thumbnailaside_config.ui
View file

@ -117,7 +117,11 @@
</widget>
</item>
<item>
<widget class="KWin::GlobalShortcutsEditor" name="editor" native="true"/>
<widget class="KShortcutsEditor" name="editor" native="true">
<property name="actionTypes">
<enum>KShortcutsEditor::GlobalAction</enum>
</property>
</widget>
</item>
</layout>
</widget>
@ -128,9 +132,9 @@
<header>knuminput.h</header>
</customwidget>
<customwidget>
<class>KWin::GlobalShortcutsEditor</class>
<class>KShortcutsEditor</class>
<extends>QWidget</extends>
<header location="global">kwineffects.h</header>
<header location="global">KShortcutsEditor</header>
<container>1</container>
</customwidget>
</customwidgets>

10
effects/windowgeometry/windowgeometry_config.ui
View file

@ -26,15 +26,19 @@
</widget>
</item>
<item>
<widget class="KWin::GlobalShortcutsEditor" name="shortcuts" native="true"/>
<widget class="KShortcutsEditor" name="shortcuts" native="true">
<property name="actionTypes">
<enum>KShortcutsEditor::GlobalAction</enum>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KWin::GlobalShortcutsEditor</class>
<class>KShortcutsEditor</class>
<extends>QWidget</extends>
<header location="global">kwineffects.h</header>
<header location="global">KShortcutsEditor</header>
<container>1</container>
</customwidget>
</customwidgets>

9
effects/zoom/zoom_config.ui
View file

@ -164,22 +164,25 @@
</widget>
</item>
<item>
<widget class="KWin::GlobalShortcutsEditor" name="editor" native="true">
<widget class="KShortcutsEditor" name="editor" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="actionTypes">
<enum>KShortcutsEditor::GlobalAction</enum>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KWin::GlobalShortcutsEditor</class>
<class>KShortcutsEditor</class>
<extends>QWidget</extends>
<header location="global">kwineffects.h</header>
<header location="global">KShortcutsEditor</header>
<container>1</container>
</customwidget>
</customwidgets>