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

Port KComboBox to QComboBox

Browse source 
None of the features it adds ontop of `QComboBox` are used.

Allows to drop the dependency on KCompletion.

Signed-off-by: Eike Hein <eike.hein@mbition.io>
This commit is contained in:
Kai Uwe Broulik 2022-02-22 16:47:43 +01:00 committed by Kai Uwe Broulik
parent ad4bbba08a
commit aef8ba8d1a
19 changed files with 37 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -86,7 +86,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
) )
# required frameworks by config modules # required frameworks by config modules
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
Completion
Declarative Declarative
KCMUtils KCMUtils
NewStuff NewStuff

1
src/effects/desktopgrid/CMakeLists.txt
View file

@ -31,7 +31,6 @@ kconfig_add_kcfg_files(kwin_desktopgrid_config_SRCS desktopgridconfig.kcfgc)
kwin_add_effect_config(kwin_desktopgrid_config ${kwin_desktopgrid_config_SRCS}) kwin_add_effect_config(kwin_desktopgrid_config ${kwin_desktopgrid_config_SRCS})
target_link_libraries(kwin_desktopgrid_config target_link_libraries(kwin_desktopgrid_config
KF5::Completion
KF5::ConfigWidgets KF5::ConfigWidgets
KF5::CoreAddons KF5::CoreAddons
KF5::GlobalAccel KF5::GlobalAccel

4
src/effects/desktopgrid/desktopgrid_config.cpp
View file

@ -75,8 +75,8 @@ DesktopGridEffectConfig::DesktopGridEffectConfig(QWidget* parent, const QVariant
DesktopGridConfig::instance(KWIN_CONFIG); DesktopGridConfig::instance(KWIN_CONFIG);
addConfig(DesktopGridConfig::self(), m_ui); addConfig(DesktopGridConfig::self(), m_ui);
connect(m_ui->kcfg_LayoutMode, qOverload<int>(&KComboBox::currentIndexChanged), this, &DesktopGridEffectConfig::layoutSelectionChanged); connect(m_ui->kcfg_LayoutMode, qOverload<int>(&QComboBox::currentIndexChanged), this, &DesktopGridEffectConfig::layoutSelectionChanged);
connect(m_ui->desktopNameAlignmentCombo, qOverload<int>(&KComboBox::currentIndexChanged), this, &DesktopGridEffectConfig::markAsChanged); connect(m_ui->desktopNameAlignmentCombo, qOverload<int>(&QComboBox::currentIndexChanged), this, &DesktopGridEffectConfig::markAsChanged);
connect(m_ui->clickBehaviorButtonGroup, qOverload<int>(&QButtonGroup::buttonClicked), this, &DesktopGridEffectConfig::markAsChanged); connect(m_ui->clickBehaviorButtonGroup, qOverload<int>(&QButtonGroup::buttonClicked), this, &DesktopGridEffectConfig::markAsChanged);
connect(m_ui->shortcutEditor, &KShortcutsEditor::keyChange, this, &DesktopGridEffectConfig::markAsChanged); connect(m_ui->shortcutEditor, &KShortcutsEditor::keyChange, this, &DesktopGridEffectConfig::markAsChanged);

9
src/effects/desktopgrid/desktopgrid_config.ui
View file

@ -92,7 +92,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="KComboBox" name="desktopNameAlignmentCombo"> <widget class="QComboBox" name="desktopNameAlignmentCombo">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -115,7 +115,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="KComboBox" name="kcfg_LayoutMode"> <widget class="QComboBox" name="kcfg_LayoutMode">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -255,11 +255,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
<customwidget> <customwidget>
<class>KShortcutsEditor</class> <class>KShortcutsEditor</class>
<extends>QWidget</extends> <extends>QWidget</extends>

1
src/effects/presentwindows/CMakeLists.txt
View file

@ -34,7 +34,6 @@ kconfig_add_kcfg_files(kwin_presentwindows_config_SRCS presentwindowsconfig.kcfg
kwin_add_effect_config(kwin_presentwindows_config ${kwin_presentwindows_config_SRCS}) kwin_add_effect_config(kwin_presentwindows_config ${kwin_presentwindows_config_SRCS})
target_link_libraries(kwin_presentwindows_config target_link_libraries(kwin_presentwindows_config
KF5::Completion
KF5::ConfigWidgets KF5::ConfigWidgets
KF5::CoreAddons KF5::CoreAddons
KF5::GlobalAccel KF5::GlobalAccel

19
src/effects/presentwindows/presentwindows_config.ui
View file

@ -133,7 +133,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="KComboBox" name="kcfg_LeftButtonWindow"> <widget class="QComboBox" name="kcfg_LeftButtonWindow">
<item> <item>
<property name="text"> <property name="text">
<string>No action</string> <string>No action</string>
@ -177,7 +177,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="KComboBox" name="kcfg_MiddleButtonWindow"> <widget class="QComboBox" name="kcfg_MiddleButtonWindow">
<item> <item>
<property name="text"> <property name="text">
<string>No action</string> <string>No action</string>
@ -226,7 +226,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="KComboBox" name="kcfg_RightButtonWindow"> <widget class="QComboBox" name="kcfg_RightButtonWindow">
<item> <item>
<property name="text"> <property name="text">
<string>No action</string> <string>No action</string>
@ -287,7 +287,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="KComboBox" name="kcfg_LeftButtonDesktop"> <widget class="QComboBox" name="kcfg_LeftButtonDesktop">
<item> <item>
<property name="text"> <property name="text">
<string>No action</string> <string>No action</string>
@ -321,7 +321,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="KComboBox" name="kcfg_MiddleButtonDesktop"> <widget class="QComboBox" name="kcfg_MiddleButtonDesktop">
<item> <item>
<property name="text"> <property name="text">
<string>No action</string> <string>No action</string>
@ -355,7 +355,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="KComboBox" name="kcfg_RightButtonDesktop"> <widget class="QComboBox" name="kcfg_RightButtonDesktop">
<item> <item>
<property name="text"> <property name="text">
<string>No action</string> <string>No action</string>
@ -429,7 +429,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="KComboBox" name="kcfg_LayoutMode"> <widget class="QComboBox" name="kcfg_LayoutMode">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -466,11 +466,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
<customwidget> <customwidget>
<class>KShortcutsEditor</class> <class>KShortcutsEditor</class>
<extends>QWidget</extends> <extends>QWidget</extends>

1
src/effects/showfps/CMakeLists.txt
View file

@ -28,7 +28,6 @@ kconfig_add_kcfg_files(kwin_showfps_config_SRCS showfpsconfig.kcfgc)
kwin_add_effect_config(kwin_showfps_config ${kwin_showfps_config_SRCS}) kwin_add_effect_config(kwin_showfps_config ${kwin_showfps_config_SRCS})
target_link_libraries(kwin_showfps_config target_link_libraries(kwin_showfps_config
KF5::Completion
KF5::ConfigWidgets KF5::ConfigWidgets
KF5::CoreAddons KF5::CoreAddons
KF5::I18n KF5::I18n

7
src/effects/showfps/showfps_config.ui
View file

@ -31,7 +31,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="KComboBox" name="kcfg_TextPosition"> <widget class="QComboBox" name="kcfg_TextPosition">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -164,11 +164,6 @@
<extends>QWidget</extends> <extends>QWidget</extends>
<header>kfontrequester.h</header> <header>kfontrequester.h</header>
</customwidget> </customwidget>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections/> <connections/>

2
src/kcmkwin/kwinoptions/CMakeLists.txt
View file

@ -29,7 +29,7 @@ kconfig_add_kcfg_files(kcm_kwinoptions_PART_SRCS kwinoptions_kdeglobals_settings
qt_add_dbus_interface(kcm_kwinoptions_PART_SRCS ${KWin_SOURCE_DIR}/src/org.kde.kwin.Effects.xml kwin_effects_interface) qt_add_dbus_interface(kcm_kwinoptions_PART_SRCS ${KWin_SOURCE_DIR}/src/org.kde.kwin.Effects.xml kwin_effects_interface)
add_library(kcm_kwinoptions MODULE ${kcm_kwinoptions_PART_SRCS}) add_library(kcm_kwinoptions MODULE ${kcm_kwinoptions_PART_SRCS})
target_link_libraries(kcm_kwinoptions kwin Qt::DBus KF5::KCMUtils KF5::Completion KF5::I18n KF5::ConfigWidgets KF5::Service KF5::WindowSystem) target_link_libraries(kcm_kwinoptions kwin Qt::DBus KF5::KCMUtils KF5::I18n KF5::ConfigWidgets KF5::Service KF5::WindowSystem)
install(TARGETS kcm_kwinoptions DESTINATION ${KDE_INSTALL_PLUGINDIR}) install(TARGETS kcm_kwinoptions DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ############### ########### install files ###############

25
src/kcmkwin/kwinoptions/actions.ui
View file

@ -34,7 +34,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="KComboBox" name="kcfg_CommandWindow1"> <widget class="QComboBox" name="kcfg_CommandWindow1">
<property name="whatsThis"> <property name="whatsThis">
<string>In this row you can customize left click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame).</string> <string>In this row you can customize left click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame).</string>
</property> </property>
@ -74,7 +74,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="KComboBox" name="kcfg_CommandWindow2"> <widget class="QComboBox" name="kcfg_CommandWindow2">
<property name="whatsThis"> <property name="whatsThis">
<string>In this row you can customize middle click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame).</string> <string>In this row you can customize middle click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame).</string>
</property> </property>
@ -114,7 +114,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="KComboBox" name="kcfg_CommandWindow3"> <widget class="QComboBox" name="kcfg_CommandWindow3">
<property name="whatsThis"> <property name="whatsThis">
<string>In this row you can customize right click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame).</string> <string>In this row you can customize right click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame).</string>
</property> </property>
@ -154,7 +154,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="KComboBox" name="kcfg_CommandWindowWheel"> <widget class="QComboBox" name="kcfg_CommandWindowWheel">
<property name="whatsThis"> <property name="whatsThis">
<string>In this row you can customize behavior when scrolling into an inactive inner window ('inner' means: not titlebar, not frame).</string> <string>In this row you can customize behavior when scrolling into an inactive inner window ('inner' means: not titlebar, not frame).</string>
</property> </property>
@ -200,7 +200,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="KComboBox" name="kcfg_CommandAllKey"> <widget class="QComboBox" name="kcfg_CommandAllKey">
<property name="whatsThis"> <property name="whatsThis">
<string>Here you select whether holding the Meta key or Alt key will allow you to perform the following actions.</string> <string>Here you select whether holding the Meta key or Alt key will allow you to perform the following actions.</string>
</property> </property>
@ -256,7 +256,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="KComboBox" name="kcfg_CommandAll1"> <widget class="QComboBox" name="kcfg_CommandAll1">
<property name="whatsThis"> <property name="whatsThis">
<string>In this row you can customize left click behavior when clicking into the titlebar or the frame.</string> <string>In this row you can customize left click behavior when clicking into the titlebar or the frame.</string>
</property> </property>
@ -326,7 +326,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="KComboBox" name="kcfg_CommandAll2"> <widget class="QComboBox" name="kcfg_CommandAll2">
<property name="whatsThis"> <property name="whatsThis">
<string>In this row you can customize middle click behavior when clicking into the titlebar or the frame.</string> <string>In this row you can customize middle click behavior when clicking into the titlebar or the frame.</string>
</property> </property>
@ -396,7 +396,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="KComboBox" name="kcfg_CommandAll3"> <widget class="QComboBox" name="kcfg_CommandAll3">
<property name="whatsThis"> <property name="whatsThis">
<string>In this row you can customize right click behavior when clicking into the titlebar or the frame.</string> <string>In this row you can customize right click behavior when clicking into the titlebar or the frame.</string>
</property> </property>
@ -466,7 +466,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="KComboBox" name="kcfg_CommandAllWheel"> <widget class="QComboBox" name="kcfg_CommandAllWheel">
<property name="whatsThis"> <property name="whatsThis">
<string>Here you can customize KDE's behavior when scrolling with the mouse wheel in a window while pressing the modifier key.</string> <string>Here you can customize KDE's behavior when scrolling with the mouse wheel in a window while pressing the modifier key.</string>
</property> </property>
@ -527,13 +527,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

9
src/kcmkwin/kwinoptions/advanced.ui
View file

@ -71,7 +71,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="KComboBox" name="kcfg_Placement"> <widget class="QComboBox" name="kcfg_Placement">
<property name="whatsThis"> <property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The placement policy determines where a new window will appear on the desktop.&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Smart&lt;/span&gt; will try to achieve a minimum overlap of windows&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Maximizing&lt;/span&gt; will try to maximize every window to fill the whole screen. It might be useful to selectively affect placement of some windows using the window-specific settings.&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Cascade&lt;/span&gt; will cascade the windows&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Random&lt;/span&gt; will use a random position&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Centered&lt;/span&gt; will place the window centered&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Zero-cornered&lt;/span&gt; will place the window in the top-left corner&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Under mouse&lt;/span&gt; will place the window under the pointer&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The placement policy determines where a new window will appear on the desktop.&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Smart&lt;/span&gt; will try to achieve a minimum overlap of windows&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Maximizing&lt;/span&gt; will try to maximize every window to fill the whole screen. It might be useful to selectively affect placement of some windows using the window-specific settings.&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Cascade&lt;/span&gt; will cascade the windows&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Random&lt;/span&gt; will use a random position&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Centered&lt;/span&gt; will place the window centered&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Zero-cornered&lt;/span&gt; will place the window in the top-left corner&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Under mouse&lt;/span&gt; will place the window under the pointer&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
@ -144,13 +144,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

9
src/kcmkwin/kwinoptions/focus.ui
View file

@ -109,7 +109,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="KComboBox" name="kcfg_FocusStealingPreventionLevel"> <widget class="QComboBox" name="kcfg_FocusStealingPreventionLevel">
<property name="whatsThis"> <property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option specifies how much KWin will try to prevent unwanted focus stealing caused by unexpected activation of new windows. (Note: This feature does not work with the &lt;span style=&quot; font-style:italic;&quot;&gt;Focus under mouse&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;Focus strictly under mouse&lt;/span&gt; focus policies.) &lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;None:&lt;/span&gt; Prevention is turned off and new windows always become activated.&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Low:&lt;/span&gt; Prevention is enabled; when some window does not have support for the underlying mechanism and KWin cannot reliably decide whether to activate the window or not, it will be activated. This setting may have both worse and better results than the medium level, depending on the applications.&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Medium:&lt;/span&gt; Prevention is enabled.&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;High:&lt;/span&gt; New windows get activated only if no window is currently active or if they belong to the currently active application. This setting is probably not really usable when not using mouse focus policy.&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Extreme:&lt;/span&gt; All windows must be explicitly activated by the user.&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Windows that are prevented from stealing focus are marked as demanding attention, which by default means their taskbar entry will be highlighted. This can be changed in the Notifications control module.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option specifies how much KWin will try to prevent unwanted focus stealing caused by unexpected activation of new windows. (Note: This feature does not work with the &lt;span style=&quot; font-style:italic;&quot;&gt;Focus under mouse&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;Focus strictly under mouse&lt;/span&gt; focus policies.) &lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;None:&lt;/span&gt; Prevention is turned off and new windows always become activated.&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Low:&lt;/span&gt; Prevention is enabled; when some window does not have support for the underlying mechanism and KWin cannot reliably decide whether to activate the window or not, it will be activated. This setting may have both worse and better results than the medium level, depending on the applications.&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Medium:&lt;/span&gt; Prevention is enabled.&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;High:&lt;/span&gt; New windows get activated only if no window is currently active or if they belong to the currently active application. This setting is probably not really usable when not using mouse focus policy.&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Extreme:&lt;/span&gt; All windows must be explicitly activated by the user.&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Windows that are prevented from stealing focus are marked as demanding attention, which by default means their taskbar entry will be highlighted. This can be changed in the Notifications control module.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
@ -253,13 +253,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>

29
src/kcmkwin/kwinoptions/mouse.ui
View file

@ -31,7 +31,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="KComboBox" name="kcfg_TitlebarDoubleClickCommand"> <widget class="QComboBox" name="kcfg_TitlebarDoubleClickCommand">
<property name="whatsThis"> <property name="whatsThis">
<string>Behavior on &lt;em&gt;double&lt;/em&gt; click into the titlebar.</string> <string>Behavior on &lt;em&gt;double&lt;/em&gt; click into the titlebar.</string>
</property> </property>
@ -93,7 +93,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="KComboBox" name="kcfg_CommandTitlebarWheel"> <widget class="QComboBox" name="kcfg_CommandTitlebarWheel">
<property name="whatsThis"> <property name="whatsThis">
<string>Behavior on &lt;em&gt;mouse wheel&lt;/em&gt; scroll over the titlebar.</string> <string>Behavior on &lt;em&gt;mouse wheel&lt;/em&gt; scroll over the titlebar.</string>
</property> </property>
@ -221,7 +221,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="KComboBox" name="kcfg_CommandActiveTitlebar1"> <widget class="QComboBox" name="kcfg_CommandActiveTitlebar1">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -274,7 +274,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="KComboBox" name="kcfg_CommandInactiveTitlebar1"> <widget class="QComboBox" name="kcfg_CommandInactiveTitlebar1">
<property name="whatsThis"> <property name="whatsThis">
<string>Behavior on &lt;em&gt;left&lt;/em&gt; click into the titlebar or frame of an &lt;em&gt;inactive&lt;/em&gt; window.</string> <string>Behavior on &lt;em&gt;left&lt;/em&gt; click into the titlebar or frame of an &lt;em&gt;inactive&lt;/em&gt; window.</string>
</property> </property>
@ -336,7 +336,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="KComboBox" name="kcfg_CommandActiveTitlebar2"> <widget class="QComboBox" name="kcfg_CommandActiveTitlebar2">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -389,7 +389,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="2" column="2">
<widget class="KComboBox" name="kcfg_CommandInactiveTitlebar2"> <widget class="QComboBox" name="kcfg_CommandInactiveTitlebar2">
<property name="whatsThis"> <property name="whatsThis">
<string>Behavior on &lt;em&gt;left&lt;/em&gt; click into the titlebar or frame of an &lt;em&gt;inactive&lt;/em&gt; window.</string> <string>Behavior on &lt;em&gt;left&lt;/em&gt; click into the titlebar or frame of an &lt;em&gt;inactive&lt;/em&gt; window.</string>
</property> </property>
@ -451,7 +451,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="KComboBox" name="kcfg_CommandActiveTitlebar3"> <widget class="QComboBox" name="kcfg_CommandActiveTitlebar3">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -504,7 +504,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="2"> <item row="3" column="2">
<widget class="KComboBox" name="kcfg_CommandInactiveTitlebar3"> <widget class="QComboBox" name="kcfg_CommandInactiveTitlebar3">
<property name="whatsThis"> <property name="whatsThis">
<string>Behavior on &lt;em&gt;left&lt;/em&gt; click into the titlebar or frame of an &lt;em&gt;inactive&lt;/em&gt; window.</string> <string>Behavior on &lt;em&gt;left&lt;/em&gt; click into the titlebar or frame of an &lt;em&gt;inactive&lt;/em&gt; window.</string>
</property> </property>
@ -606,7 +606,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="KComboBox" name="kcfg_MaximizeButtonLeftClickCommand"> <widget class="QComboBox" name="kcfg_MaximizeButtonLeftClickCommand">
<property name="whatsThis"> <property name="whatsThis">
<string>Behavior on &lt;em&gt;left&lt;/em&gt; click onto the maximize button.</string> <string>Behavior on &lt;em&gt;left&lt;/em&gt; click onto the maximize button.</string>
</property> </property>
@ -641,7 +641,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="KComboBox" name="kcfg_MaximizeButtonMiddleClickCommand"> <widget class="QComboBox" name="kcfg_MaximizeButtonMiddleClickCommand">
<property name="whatsThis"> <property name="whatsThis">
<string>Behavior on &lt;em&gt;middle&lt;/em&gt; click onto the maximize button.</string> <string>Behavior on &lt;em&gt;middle&lt;/em&gt; click onto the maximize button.</string>
</property> </property>
@ -676,7 +676,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="KComboBox" name="kcfg_MaximizeButtonRightClickCommand"> <widget class="QComboBox" name="kcfg_MaximizeButtonRightClickCommand">
<property name="whatsThis"> <property name="whatsThis">
<string>Behavior on &lt;em&gt;right&lt;/em&gt; click onto the maximize button.</string> <string>Behavior on &lt;em&gt;right&lt;/em&gt; click onto the maximize button.</string>
</property> </property>
@ -715,13 +715,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets>
<tabstops> <tabstops>
<tabstop>kcfg_TitlebarDoubleClickCommand</tabstop> <tabstop>kcfg_TitlebarDoubleClickCommand</tabstop>
<tabstop>kcfg_CommandTitlebarWheel</tabstop> <tabstop>kcfg_CommandTitlebarWheel</tabstop>

1
src/kcmkwin/kwinoptions/windows.cpp
View file

@ -11,7 +11,6 @@
#include <QCheckBox> #include <QCheckBox>
#include <QRadioButton> #include <QRadioButton>
#include <QLabel> #include <QLabel>
#include <KComboBox>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QFormLayout> #include <QFormLayout>
#include <QtDBus> #include <QtDBus>

1
src/kcmkwin/kwinoptions/windows.h
View file

@ -20,7 +20,6 @@
class QRadioButton; class QRadioButton;
class QCheckBox; class QCheckBox;
class QPushButton; class QPushButton;
class KComboBox;
class QGroupBox; class QGroupBox;
class QLabel; class QLabel;
class QSlider; class QSlider;

1
src/kcmkwin/kwinscreenedges/CMakeLists.txt
View file

@ -28,7 +28,6 @@ add_library(kcm_kwinscreenedges MODULE ${kcm_kwinscreenedges_PART_SRCS})
set(kcm_screenedges_LIBS set(kcm_screenedges_LIBS
Qt::DBus Qt::DBus
KF5::Completion
KF5::ConfigCore KF5::ConfigCore
KF5::ConfigWidgets KF5::ConfigWidgets
KF5::KCMUtils KF5::KCMUtils

7
src/kcmkwin/kwinscreenedges/main.ui
View file

@ -152,7 +152,7 @@
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
<widget class="KComboBox" name="kcfg_ElectricBorders"> <widget class="QComboBox" name="kcfg_ElectricBorders">
<item> <item>
<property name="text"> <property name="text">
<string comment="Switch desktop on edge">Disabled</string> <string comment="Switch desktop on edge">Disabled</string>
@ -265,11 +265,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
<customwidget> <customwidget>
<class>KWin::Monitor</class> <class>KWin::Monitor</class>
<extends>QWidget</extends> <extends>QWidget</extends>

1
src/kcmkwin/kwintabbox/CMakeLists.txt
View file

@ -23,7 +23,6 @@ add_library(kcm_kwintabbox MODULE ${kcm_kwintabbox_PART_SRCS})
target_link_libraries(kcm_kwintabbox target_link_libraries(kcm_kwintabbox
Qt::Quick Qt::Quick
KF5::Completion
KF5::GlobalAccel KF5::GlobalAccel
KF5::I18n KF5::I18n
KF5::KCMUtils KF5::KCMUtils

7
src/kcmkwin/kwintabbox/main.ui
View file

@ -43,7 +43,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="KComboBox" name="switchingModeCombo"> <widget class="QComboBox" name="switchingModeCombo">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -586,11 +586,6 @@
<extends>QWidget</extends> <extends>QWidget</extends>
<header>kkeysequencewidget.h</header> <header>kkeysequencewidget.h</header>
</customwidget> </customwidget>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>kcfg_HighlightWindows</tabstop> <tabstop>kcfg_HighlightWindows</tabstop>