Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:seral79:WinFT
como
add-effect-config.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File add-effect-config.patch of Package como
diff --git a/como/base/config-como.h.cmake b/como/base/config-como.h.cmake index 908b7fc8a..75c673d5f 100644 --- a/como/base/config-como.h.cmake +++ b/como/base/config-como.h.cmake @@ -6,7 +6,7 @@ #cmakedefine01 COMO_BUILD_DECORATIONS #cmakedefine01 COMO_BUILD_TABBOX -#define KWIN_CONFIG "kwinrc" +#define KWIN_CONFIG "theseus-shiprc" #define COMO_VERSION_STRING "${CMAKE_PROJECT_VERSION}" #define KDE_PLASMA_VERSION_STRING "${KDE_PLASMA_VERSION}" #define XCB_VERSION_STRING "${XCB_VERSION}" diff --git a/como/desktop/CMakeLists.txt b/como/desktop/CMakeLists.txt index a86134b2a..c45c01012 100644 --- a/como/desktop/CMakeLists.txt +++ b/como/desktop/CMakeLists.txt @@ -10,6 +10,7 @@ target_link_libraries(desktop base ) +set(desktop_dbus_src "") qt6_add_dbus_interface( desktop_dbus_src ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf6_org.freedesktop.ScreenSaver.xml diff --git a/como/desktop/kconf_update/kwin-6.0-delete-desktop-switching-shortcuts.cpp b/como/desktop/kconf_update/kwin-6.0-delete-desktop-switching-shortcuts.cpp index 6edaf891a..96d906f18 100644 --- a/como/desktop/kconf_update/kwin-6.0-delete-desktop-switching-shortcuts.cpp +++ b/como/desktop/kconf_update/kwin-6.0-delete-desktop-switching-shortcuts.cpp @@ -24,7 +24,7 @@ int main(int argc, char** argv) for (const QString& actionName : actionNames) { QAction action; action.setObjectName(actionName); - action.setProperty("componentName", QStringLiteral("kwin")); + action.setProperty("componentName", QStringLiteral("theseus-ship")); action.setProperty("componentDisplayName", QStringLiteral("KWin")); KGlobalAccel::self()->setShortcut(&action, {QKeySequence()}, KGlobalAccel::NoAutoloading); KGlobalAccel::self()->removeAllShortcuts(&action); diff --git a/como/desktop/kconf_update/kwin-6.0-reset-active-mouse-screen.cpp b/como/desktop/kconf_update/kwin-6.0-reset-active-mouse-screen.cpp index 0efcc1dd6..6d1a933cb 100644 --- a/como/desktop/kconf_update/kwin-6.0-reset-active-mouse-screen.cpp +++ b/como/desktop/kconf_update/kwin-6.0-reset-active-mouse-screen.cpp @@ -9,7 +9,7 @@ int main() { - auto config = KSharedConfig::openConfig(QStringLiteral("kwinrc")); + auto config = KSharedConfig::openConfig(QStringLiteral("theseus-shiprc")); KConfigGroup windows = config->group(QStringLiteral("Windows")); if (!windows.exists()) { diff --git a/como/input/wayland/kglobalaccel/runtime/component.cpp b/como/input/wayland/kglobalaccel/runtime/component.cpp index f94b453e1..d62e79839 100644 --- a/como/input/wayland/kglobalaccel/runtime/component.cpp +++ b/como/input/wayland/kglobalaccel/runtime/component.cpp @@ -161,7 +161,7 @@ void Component::deactivateShortcuts(bool temporarily) { for (auto shortcut : std::as_const(_current->_actionsMap)) { if (temporarily // - && _uniqueName == QLatin1String("kwin") // + && _uniqueName == QLatin1String("theseus-ship") // && shortcut->uniqueName() == QLatin1String("Block Global Shortcuts")) { continue; } diff --git a/como/render/CMakeLists.txt b/como/render/CMakeLists.txt index bfe06efe5..7811c7eda 100644 --- a/como/render/CMakeLists.txt +++ b/como/render/CMakeLists.txt @@ -150,6 +150,7 @@ qt6_add_resources(render gl/resources.qrc) kconfig_add_kcfg_files(render config/render_settings.kcfgc) kconfig_add_kcfg_files(render post/kconfig/color_correct_settings.kcfgc) +set(render_dbus_SRCS "") qt6_add_dbus_adaptor(render_dbus_SRCS dbus/org.kde.kwin.Compositing.xml dbus/compositing.h diff --git a/como/render/post/night_color_setup.h b/como/render/post/night_color_setup.h index 3ba4ef66f..055ca57e0 100644 --- a/como/render/post/night_color_setup.h +++ b/como/render/post/night_color_setup.h @@ -17,7 +17,7 @@ template<typename Input, typename NightColor> void init_night_color_shortcuts(Input& input, NightColor& manager) { auto toggleAction = new QAction(manager.qobject.get()); - toggleAction->setProperty("componentName", "kwin"); + toggleAction->setProperty("componentName", "theseus-ship"); toggleAction->setObjectName(QStringLiteral("Toggle Night Color")); toggleAction->setText(i18n("Toggle Night Light")); diff --git a/como/win/CMakeLists.txt b/como/win/CMakeLists.txt index a1332c257..fb899b851 100644 --- a/como/win/CMakeLists.txt +++ b/como/win/CMakeLists.txt @@ -176,6 +176,7 @@ if (COMO_BUILD_TABBOX) target_link_libraries(win PRIVATE Qt::GuiPrivate) endif() +set(win_dbus_src "") qt6_add_dbus_adaptor(win_dbus_src dbus/org.kde.KWin.VirtualDesktopManager.xml dbus/virtual_desktop_manager.h diff --git a/como/win/shortcut_set.h b/como/win/shortcut_set.h index 7c9692e09..cc15d5af6 100644 --- a/como/win/shortcut_set.h +++ b/como/win/shortcut_set.h @@ -204,7 +204,7 @@ void window_shortcut_updated(Space& space, Win* window) // new shortcut action = new QAction(space.qobject.get()); space.base.mod.input->setup_action_for_global_accel(action); - action->setProperty("componentName", QStringLiteral("kwin")); + action->setProperty("componentName", QStringLiteral("theseus-ship")); action->setObjectName(key); action->setText(i18n("Activate Window (%1)", win::caption(window))); QObject::connect(action, &QAction::triggered, window->qobject.get(), [&space, window] { diff --git a/como/win/shortcuts_init.h b/como/win/shortcuts_init.h index 001435e2f..a8b3e7bbf 100644 --- a/como/win/shortcuts_init.h +++ b/como/win/shortcuts_init.h @@ -37,7 +37,7 @@ QAction* add_subspace_action(Manager& manager, Slot slot) { auto a = new QAction(manager.qobject.get()); - a->setProperty("componentName", QStringLiteral("kwin")); + a->setProperty("componentName", QStringLiteral("theseus-ship")); a->setObjectName(name); a->setText(label); @@ -57,7 +57,7 @@ QAction* add_subspace_action(Manager& manager, Slot slot) { auto a = new QAction(manager.qobject.get()); - a->setProperty("componentName", QStringLiteral("kwin")); + a->setProperty("componentName", QStringLiteral("theseus-ship")); a->setObjectName(name.arg(value)); a->setText(label.subs(value).toString()); a->setData(value); @@ -272,7 +272,7 @@ QAction* prepare_shortcut_action(Space& space, QVariant const& data) { auto action = new QAction(space.qobject.get()); - action->setProperty("componentName", QStringLiteral("kwin")); + action->setProperty("componentName", QStringLiteral("theseus-ship")); action->setObjectName(actionName); action->setText(description); diff --git a/como/win/tabbox/tabbox.h b/como/win/tabbox/tabbox.h index ad7d089cb..eafdd65d9 100644 --- a/como/win/tabbox/tabbox.h +++ b/como/win/tabbox/tabbox.h @@ -913,7 +913,7 @@ private: const QKeySequence& shortcut = QKeySequence()) { auto a = new QAction(qobject.get()); - a->setProperty("componentName", QStringLiteral("kwin")); + a->setProperty("componentName", QStringLiteral("theseus-ship")); a->setObjectName(QString::fromUtf8(action_name.untranslatedText())); a->setText(action_name.toString()); diff --git a/plugins/effects/CMakeLists.txt b/plugins/effects/CMakeLists.txt index b2c9d1c1d..46d17062b 100644 --- a/plugins/effects/CMakeLists.txt +++ b/plugins/effects/CMakeLists.txt @@ -67,8 +67,8 @@ add_subdirectory(blendchanges) add_subdirectory(blur) add_subdirectory(colorblindnesscorrection) add_subdirectory(colorpicker) -add_subdirectory(cube) -add_subdirectory(cubeslide) +# add_subdirectory(cube) +# add_subdirectory(cubeslide) add_subdirectory(dialogparent) add_subdirectory(diminactive) add_subdirectory(dimscreen) diff --git a/plugins/effects/blur/CMakeLists.txt b/plugins/effects/blur/CMakeLists.txt index bd627aeea..9488faf18 100644 --- a/plugins/effects/blur/CMakeLists.txt +++ b/plugins/effects/blur/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries(blur PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_blur_config_SRCS blur_config.cpp) ki18n_wrap_ui(kwin_blur_config_SRCS blur_config.ui) kconfig_add_kcfg_files(kwin_blur_config_SRCS blurconfig.kcfgc) diff --git a/plugins/effects/colorblindnesscorrection/CMakeLists.txt b/plugins/effects/colorblindnesscorrection/CMakeLists.txt index 03b89506e..89772bffb 100644 --- a/plugins/effects/colorblindnesscorrection/CMakeLists.txt +++ b/plugins/effects/colorblindnesscorrection/CMakeLists.txt @@ -15,7 +15,7 @@ target_link_libraries(colorblindnesscorrection PRIVATE ) # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) kcmutils_add_qml_kcm(kwin_colorblindnesscorrection_config SOURCES colorblindnesscorrection_config.cpp INSTALL_NAMESPACE "kwin/effects/configs" diff --git a/plugins/effects/colorblindnesscorrection/colorblindnesscorrection_settings.kcfg b/plugins/effects/colorblindnesscorrection/colorblindnesscorrection_settings.kcfg index 98e3cd43f..92f2fd327 100644 --- a/plugins/effects/colorblindnesscorrection/colorblindnesscorrection_settings.kcfg +++ b/plugins/effects/colorblindnesscorrection/colorblindnesscorrection_settings.kcfg @@ -7,7 +7,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kwinrc" /> + <kcfgfile name="theseus-shiprc" /> <group name="Effect-colorblindnesscorrection"> <entry name="Mode" type="UInt"> <default>0</default> diff --git a/plugins/effects/cube/CMakeLists.txt b/plugins/effects/cube/CMakeLists.txt index f2920652e..665028de2 100644 --- a/plugins/effects/cube/CMakeLists.txt +++ b/plugins/effects/cube/CMakeLists.txt @@ -25,7 +25,7 @@ install(FILES data/cubecap.png DESTINATION ${KDE_INSTALL_DATADIR}/kwin) ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_cube_config_SRCS cube_config.cpp) ki18n_wrap_ui(kwin_cube_config_SRCS cube_config.ui) kconfig_add_kcfg_files(kwin_cube_config_SRCS cubeconfig.kcfgc) diff --git a/plugins/effects/cube/cube_config.cpp b/plugins/effects/cube/cube_config.cpp index c887090b3..5476b7302 100644 --- a/plugins/effects/cube/cube_config.cpp +++ b/plugins/effects/cube/cube_config.cpp @@ -34,8 +34,8 @@ CubeEffectConfig::CubeEffectConfig(QObject* parent, const KPluginMetaData& data) m_ui.tabWidget->setTabText(0, i18nc("@title:tab Basic Settings", "Basic")); m_ui.tabWidget->setTabText(1, i18nc("@title:tab Advanced Settings", "Advanced")); - // Shortcut config. The shortcut belongs to the component "kwin"! - m_actionCollection = new KActionCollection(widget(), QStringLiteral("kwin")); + // Shortcut config. The shortcut belongs to the component "theseus-ship"! + m_actionCollection = new KActionCollection(widget(), QStringLiteral("theseus-ship")); m_actionCollection->setComponentDisplayName(i18n("KWin")); m_actionCollection->setConfigGroup(QStringLiteral("Cube")); diff --git a/plugins/effects/cubeslide/CMakeLists.txt b/plugins/effects/cubeslide/CMakeLists.txt index cbaaa2400..bd9169d4a 100644 --- a/plugins/effects/cubeslide/CMakeLists.txt +++ b/plugins/effects/cubeslide/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries(cubeslide PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_cubeslide_config_SRCS cubeslide_config.cpp) ki18n_wrap_ui(kwin_cubeslide_config_SRCS cubeslide_config.ui) kconfig_add_kcfg_files(kwin_cubeslide_config_SRCS cubeslideconfig.kcfgc) diff --git a/plugins/effects/diminactive/CMakeLists.txt b/plugins/effects/diminactive/CMakeLists.txt index 531b8e2fc..6231760c8 100644 --- a/plugins/effects/diminactive/CMakeLists.txt +++ b/plugins/effects/diminactive/CMakeLists.txt @@ -22,7 +22,7 @@ target_link_libraries(diminactive PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_diminactive_config_SRCS diminactive_config.cpp) ki18n_wrap_ui(kwin_diminactive_config_SRCS diminactive_config.ui) kconfig_add_kcfg_files(kwin_diminactive_config_SRCS diminactiveconfig.kcfgc) diff --git a/plugins/effects/glide/CMakeLists.txt b/plugins/effects/glide/CMakeLists.txt index 7488cbaac..6b42afda8 100644 --- a/plugins/effects/glide/CMakeLists.txt +++ b/plugins/effects/glide/CMakeLists.txt @@ -22,7 +22,7 @@ target_link_libraries(glide PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_glide_config_SRCS glide_config.cpp) ki18n_wrap_ui(kwin_glide_config_SRCS glide_config.ui) kconfig_add_kcfg_files(kwin_glide_config_SRCS glideconfig.kcfgc) diff --git a/plugins/effects/invert/CMakeLists.txt b/plugins/effects/invert/CMakeLists.txt index b45242ef4..a805893a3 100644 --- a/plugins/effects/invert/CMakeLists.txt +++ b/plugins/effects/invert/CMakeLists.txt @@ -20,7 +20,7 @@ target_link_libraries(invert PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_invert_config_SRCS invert_config.cpp) kwin_add_effect_config(kwin_invert_config ${kwin_invert_config_SRCS}) diff --git a/plugins/effects/invert/invert_config.cpp b/plugins/effects/invert/invert_config.cpp index 44bb8ca28..561f6c521 100644 --- a/plugins/effects/invert/invert_config.cpp +++ b/plugins/effects/invert/invert_config.cpp @@ -27,8 +27,8 @@ InvertEffectConfig::InvertEffectConfig(QObject* parent, const KPluginMetaData& d { QVBoxLayout* layout = new QVBoxLayout(widget()); - // Shortcut config. The shortcut belongs to the component "kwin"! - KActionCollection* actionCollection = new KActionCollection(widget(), QStringLiteral("kwin")); + // Shortcut config. The shortcut belongs to the component "theseus-ship"! + KActionCollection* actionCollection = new KActionCollection(widget(), QStringLiteral("theseus-ship")); actionCollection->setComponentDisplayName(i18n("KWin")); QAction* a = actionCollection->addAction(QStringLiteral("Invert")); diff --git a/plugins/effects/login/package/contents/ui/config.ui b/plugins/effects/login/package/contents/ui/config.ui index a567e7f67..922f13ae6 100644 --- a/plugins/effects/login/package/contents/ui/config.ui +++ b/plugins/effects/login/package/contents/ui/config.ui @@ -7,8 +7,8 @@ SPDX-License-Identifier: GPL-2.0-or-later --> <ui version="4.0"> - <class>KWin::LoginEffectConfigForm</class> - <widget class="QWidget" name="KWin::LoginEffectConfigForm"> + <class>como::LoginEffectConfigForm</class> + <widget class="QWidget" name="como::LoginEffectConfigForm"> <property name="geometry"> <rect> <x>0</x> diff --git a/plugins/effects/lookingglass/CMakeLists.txt b/plugins/effects/lookingglass/CMakeLists.txt index 6acbad2df..28ca2e254 100644 --- a/plugins/effects/lookingglass/CMakeLists.txt +++ b/plugins/effects/lookingglass/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries(lookingglass PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_lookingglass_config_SRCS lookingglass_config.cpp) ki18n_wrap_ui(kwin_lookingglass_config_SRCS lookingglass_config.ui) kconfig_add_kcfg_files(kwin_lookingglass_config_SRCS lookingglassconfig.kcfgc) diff --git a/plugins/effects/lookingglass/lookingglass_config.cpp b/plugins/effects/lookingglass/lookingglass_config.cpp index 86a8c8fb6..c740e4251 100644 --- a/plugins/effects/lookingglass/lookingglass_config.cpp +++ b/plugins/effects/lookingglass/lookingglass_config.cpp @@ -39,8 +39,8 @@ LookingGlassEffectConfig::LookingGlassEffectConfig(QObject* parent, const KPlugi connect( m_ui.editor, &KShortcutsEditor::keyChange, this, &LookingGlassEffectConfig::markAsChanged); - // Shortcut config. The shortcut belongs to the component "kwin"! - m_actionCollection = new KActionCollection(widget(), QStringLiteral("kwin")); + // Shortcut config. The shortcut belongs to the component "theseus-ship"! + m_actionCollection = new KActionCollection(widget(), QStringLiteral("theseus-ship")); m_actionCollection->setComponentDisplayName(i18n("KWin")); m_actionCollection->setConfigGroup(QStringLiteral("LookingGlass")); diff --git a/plugins/effects/magiclamp/CMakeLists.txt b/plugins/effects/magiclamp/CMakeLists.txt index b5033c171..e93b1812b 100644 --- a/plugins/effects/magiclamp/CMakeLists.txt +++ b/plugins/effects/magiclamp/CMakeLists.txt @@ -22,7 +22,7 @@ target_link_libraries(magiclamp PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_magiclamp_config_SRCS magiclamp_config.cpp) ki18n_wrap_ui(kwin_magiclamp_config_SRCS magiclamp_config.ui) kconfig_add_kcfg_files(kwin_magiclamp_config_SRCS magiclampconfig.kcfgc) diff --git a/plugins/effects/magnifier/CMakeLists.txt b/plugins/effects/magnifier/CMakeLists.txt index 9f931f8a7..5899b6312 100644 --- a/plugins/effects/magnifier/CMakeLists.txt +++ b/plugins/effects/magnifier/CMakeLists.txt @@ -24,7 +24,7 @@ target_link_libraries(magnifier PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_magnifier_config_SRCS magnifier_config.cpp) ki18n_wrap_ui(kwin_magnifier_config_SRCS magnifier_config.ui) kconfig_add_kcfg_files(kwin_magnifier_config_SRCS magnifierconfig.kcfgc) diff --git a/plugins/effects/magnifier/magnifier_config.cpp b/plugins/effects/magnifier/magnifier_config.cpp index f52cc7862..3d02091f1 100644 --- a/plugins/effects/magnifier/magnifier_config.cpp +++ b/plugins/effects/magnifier/magnifier_config.cpp @@ -38,8 +38,8 @@ MagnifierEffectConfig::MagnifierEffectConfig(QObject* parent, const KPluginMetaD connect(m_ui.editor, &KShortcutsEditor::keyChange, this, &KCModule::markAsChanged); - // Shortcut config. The shortcut belongs to the component "kwin"! - m_actionCollection = new KActionCollection(this, QStringLiteral("kwin")); + // Shortcut config. The shortcut belongs to the component "theseus-ship"! + m_actionCollection = new KActionCollection(this, QStringLiteral("theseus-ship")); m_actionCollection->setComponentDisplayName(i18n("KWin")); m_actionCollection->setConfigGroup(QStringLiteral("Magnifier")); diff --git a/plugins/effects/mouseclick/CMakeLists.txt b/plugins/effects/mouseclick/CMakeLists.txt index 2886b0562..ac9fbe3bd 100644 --- a/plugins/effects/mouseclick/CMakeLists.txt +++ b/plugins/effects/mouseclick/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries(mouseclick PRIVATE ########################## ## configurtion dialog ########################## -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_mouseclick_config_SRCS mouseclick_config.cpp) ki18n_wrap_ui(kwin_mouseclick_config_SRCS mouseclick_config.ui) kconfig_add_kcfg_files(kwin_mouseclick_config_SRCS mouseclickconfig.kcfgc) diff --git a/plugins/effects/mouseclick/mouseclick_config.cpp b/plugins/effects/mouseclick/mouseclick_config.cpp index 4487bd607..641ff34be 100644 --- a/plugins/effects/mouseclick/mouseclick_config.cpp +++ b/plugins/effects/mouseclick/mouseclick_config.cpp @@ -30,8 +30,8 @@ MouseClickEffectConfig::MouseClickEffectConfig(QObject* parent, const KPluginMet connect(m_ui.editor, &KShortcutsEditor::keyChange, this, &KCModule::markAsChanged); - // Shortcut config. The shortcut belongs to the component "kwin"! - m_actionCollection = new KActionCollection(this, QStringLiteral("kwin")); + // Shortcut config. The shortcut belongs to the component "theseus-ship"! + m_actionCollection = new KActionCollection(this, QStringLiteral("theseus-ship")); m_actionCollection->setComponentDisplayName(i18n("KWin")); QAction* a = m_actionCollection->addAction(QStringLiteral("ToggleMouseClick")); diff --git a/plugins/effects/mousemark/CMakeLists.txt b/plugins/effects/mousemark/CMakeLists.txt index d78c22637..81bb4ca3f 100644 --- a/plugins/effects/mousemark/CMakeLists.txt +++ b/plugins/effects/mousemark/CMakeLists.txt @@ -24,7 +24,7 @@ target_link_libraries(mousemark PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_mousemark_config_SRCS mousemark_config.cpp) ki18n_wrap_ui(kwin_mousemark_config_SRCS mousemark_config.ui) kconfig_add_kcfg_files(kwin_mousemark_config_SRCS mousemarkconfig.kcfgc) diff --git a/plugins/effects/mousemark/mousemark_config.cpp b/plugins/effects/mousemark/mousemark_config.cpp index 11b8e6a3b..b7663b07d 100644 --- a/plugins/effects/mousemark/mousemark_config.cpp +++ b/plugins/effects/mousemark/mousemark_config.cpp @@ -33,8 +33,8 @@ MouseMarkEffectConfig::MouseMarkEffectConfig(QObject* parent, const KPluginMetaD MouseMarkConfig::instance(KWIN_CONFIG); addConfig(MouseMarkConfig::self(), widget()); - // Shortcut config. The shortcut belongs to the component "kwin"! - m_actionCollection = new KActionCollection(this, QStringLiteral("kwin")); + // Shortcut config. The shortcut belongs to the component "theseus-ship"! + m_actionCollection = new KActionCollection(this, QStringLiteral("theseus-ship")); m_actionCollection->setComponentDisplayName(i18n("KWin")); QAction* a = m_actionCollection->addAction(QStringLiteral("ClearMouseMarks")); diff --git a/plugins/effects/overview/CMakeLists.txt b/plugins/effects/overview/CMakeLists.txt index cc2b226be..0ca88039c 100644 --- a/plugins/effects/overview/CMakeLists.txt +++ b/plugins/effects/overview/CMakeLists.txt @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: BSD-3-Clause -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) add_subdirectory(kcm) endif() diff --git a/plugins/effects/overview/kcm/overvieweffectkcm.cpp b/plugins/effects/overview/kcm/overvieweffectkcm.cpp index 8f703ba8d..4acbb74a7 100644 --- a/plugins/effects/overview/kcm/overvieweffectkcm.cpp +++ b/plugins/effects/overview/kcm/overvieweffectkcm.cpp @@ -29,7 +29,7 @@ OverviewEffectConfig::OverviewEffectConfig(QObject* parent, const KPluginMetaDat OverviewConfig::instance(KWIN_CONFIG); addConfig(OverviewConfig::self(), widget()); - auto actionCollection = new KActionCollection(this, QStringLiteral("kwin")); + auto actionCollection = new KActionCollection(this, QStringLiteral("theseus-ship")); actionCollection->setComponentDisplayName(i18n("KWin")); actionCollection->setConfigGroup(QStringLiteral("Overview")); diff --git a/plugins/effects/showpaint/CMakeLists.txt b/plugins/effects/showpaint/CMakeLists.txt index ab437e2bf..cad1fc9fc 100644 --- a/plugins/effects/showpaint/CMakeLists.txt +++ b/plugins/effects/showpaint/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries(showpaint PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_showpaint_config_SRCS showpaint_config.cpp) ki18n_wrap_ui(kwin_showpaint_config_SRCS showpaint_config.ui) diff --git a/plugins/effects/showpaint/showpaint_config.cpp b/plugins/effects/showpaint/showpaint_config.cpp index 65194abbd..909d4184c 100644 --- a/plugins/effects/showpaint/showpaint_config.cpp +++ b/plugins/effects/showpaint/showpaint_config.cpp @@ -24,7 +24,7 @@ ShowPaintEffectConfig::ShowPaintEffectConfig(QObject* parent, const KPluginMetaD { m_ui.setupUi(widget()); - auto* actionCollection = new KActionCollection(this, QStringLiteral("kwin")); + auto* actionCollection = new KActionCollection(this, QStringLiteral("theseus-ship")); actionCollection->setComponentDisplayName(i18n("KWin")); actionCollection->setConfigGroup(QStringLiteral("ShowPaint")); diff --git a/plugins/effects/slide/CMakeLists.txt b/plugins/effects/slide/CMakeLists.txt index 8c1788173..5fb73a3d6 100644 --- a/plugins/effects/slide/CMakeLists.txt +++ b/plugins/effects/slide/CMakeLists.txt @@ -23,7 +23,7 @@ target_link_libraries(slide PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_slide_config_SRCS slide_config.cpp) ki18n_wrap_ui(kwin_slide_config_SRCS slide_config.ui) kconfig_add_kcfg_files(kwin_slide_config_SRCS slideconfig.kcfgc) diff --git a/plugins/effects/thumbnailaside/CMakeLists.txt b/plugins/effects/thumbnailaside/CMakeLists.txt index 3988cd19a..361f3e5d1 100644 --- a/plugins/effects/thumbnailaside/CMakeLists.txt +++ b/plugins/effects/thumbnailaside/CMakeLists.txt @@ -24,7 +24,7 @@ target_link_libraries(thumbnailaside PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_thumbnailaside_config_SRCS thumbnailaside_config.cpp) ki18n_wrap_ui(kwin_thumbnailaside_config_SRCS thumbnailaside_config.ui) kconfig_add_kcfg_files(kwin_thumbnailaside_config_SRCS thumbnailasideconfig.kcfgc) diff --git a/plugins/effects/thumbnailaside/thumbnailaside_config.cpp b/plugins/effects/thumbnailaside/thumbnailaside_config.cpp index a0eaccddf..7a84df830 100644 --- a/plugins/effects/thumbnailaside/thumbnailaside_config.cpp +++ b/plugins/effects/thumbnailaside/thumbnailaside_config.cpp @@ -37,8 +37,8 @@ ThumbnailAsideEffectConfig::ThumbnailAsideEffectConfig(QObject* parent, const KP ThumbnailAsideConfig::instance(KWIN_CONFIG); addConfig(ThumbnailAsideConfig::self(), widget()); - // Shortcut config. The shortcut belongs to the component "kwin"! - m_actionCollection = new KActionCollection(this, QStringLiteral("kwin")); + // Shortcut config. The shortcut belongs to the component "theseus-ship"! + m_actionCollection = new KActionCollection(this, QStringLiteral("theseus-ship")); m_actionCollection->setComponentDisplayName(i18n("KWin")); m_actionCollection->setConfigGroup(QStringLiteral("ThumbnailAside")); diff --git a/plugins/effects/trackmouse/CMakeLists.txt b/plugins/effects/trackmouse/CMakeLists.txt index ee0f8d1cd..82c02a435 100644 --- a/plugins/effects/trackmouse/CMakeLists.txt +++ b/plugins/effects/trackmouse/CMakeLists.txt @@ -26,7 +26,7 @@ target_link_libraries(trackmouse PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_trackmouse_config_SRCS trackmouse_config.cpp) ki18n_wrap_ui(kwin_trackmouse_config_SRCS trackmouse_config.ui) kconfig_add_kcfg_files(kwin_trackmouse_config_SRCS trackmouseconfig.kcfgc) diff --git a/plugins/effects/trackmouse/trackmouse_config.cpp b/plugins/effects/trackmouse/trackmouse_config.cpp index 4edc8bc64..42acb2115 100644 --- a/plugins/effects/trackmouse/trackmouse_config.cpp +++ b/plugins/effects/trackmouse/trackmouse_config.cpp @@ -35,7 +35,7 @@ TrackMouseEffectConfig::TrackMouseEffectConfig(QObject* parent, const KPluginMet addConfig(TrackMouseConfig::self(), widget()); - m_actionCollection = new KActionCollection(this, QStringLiteral("kwin")); + m_actionCollection = new KActionCollection(this, QStringLiteral("theseus-ship")); m_actionCollection->setComponentDisplayName(i18n("KWin")); m_actionCollection->setConfigGroup(QStringLiteral("TrackMouse")); m_actionCollection->setConfigGlobal(true); diff --git a/plugins/effects/translucency/package/contents/ui/config.ui b/plugins/effects/translucency/package/contents/ui/config.ui index 1748afcab..a6237a4de 100644 --- a/plugins/effects/translucency/package/contents/ui/config.ui +++ b/plugins/effects/translucency/package/contents/ui/config.ui @@ -7,8 +7,8 @@ SPDX-License-Identifier: GPL-2.0-or-later --> <ui version="4.0"> - <class>KWin::TranslucencyEffectConfigForm</class> - <widget class="QWidget" name="KWin::TranslucencyEffectConfigForm"> + <class>como::TranslucencyEffectConfigForm</class> + <widget class="QWidget" name="como::TranslucencyEffectConfigForm"> <property name="geometry"> <rect> <x>0</x> diff --git a/plugins/effects/windowaperture/package/contents/code/main.js b/plugins/effects/windowaperture/package/contents/code/main.js index 60f4e592b..a2137ff8c 100644 --- a/plugins/effects/windowaperture/package/contents/code/main.js +++ b/plugins/effects/windowaperture/package/contents/code/main.js @@ -188,12 +188,12 @@ var badBadWindowsEffect = { let time = 0; switch (border) { - case KWin.ElectricTop: - case KWin.ElectricBottom: + case como.ElectricTop: + case como.ElectricBottom: time = Math.min(1, (Math.abs(deltaProgress.height) / (effectScreen.geometry.height / 2))) * badBadWindowsEffect.duration; break; - case KWin.ElectricLeft: - case KWin.ElectricRight: + case como.ElectricLeft: + case como.ElectricRight: time = Math.min(1, (Math.abs(deltaProgress.width) / (effectScreen.geometry.width / 2))) * badBadWindowsEffect.duration; break; default: diff --git a/plugins/effects/windowview/CMakeLists.txt b/plugins/effects/windowview/CMakeLists.txt index e13a1b86a..183a837d4 100644 --- a/plugins/effects/windowview/CMakeLists.txt +++ b/plugins/effects/windowview/CMakeLists.txt @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: BSD-3-Clause -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) add_subdirectory(kcm) endif() diff --git a/plugins/effects/windowview/kcm/windowvieweffectkcm.cpp b/plugins/effects/windowview/kcm/windowvieweffectkcm.cpp index 7e4960295..31d2e2583 100644 --- a/plugins/effects/windowview/kcm/windowvieweffectkcm.cpp +++ b/plugins/effects/windowview/kcm/windowvieweffectkcm.cpp @@ -30,7 +30,7 @@ WindowViewEffectConfig::WindowViewEffectConfig(QObject* parent, const KPluginMet WindowViewConfig::instance(KWIN_CONFIG); addConfig(WindowViewConfig::self(), widget()); - auto actionCollection = new KActionCollection(widget(), QStringLiteral("kwin")); + auto actionCollection = new KActionCollection(widget(), QStringLiteral("theseus-ship")); actionCollection->setComponentDisplayName(i18n("KWin")); actionCollection->setConfigGroup(QStringLiteral("windowview")); diff --git a/plugins/effects/wobblywindows/CMakeLists.txt b/plugins/effects/wobblywindows/CMakeLists.txt index a660b4e39..ce9e12f63 100644 --- a/plugins/effects/wobblywindows/CMakeLists.txt +++ b/plugins/effects/wobblywindows/CMakeLists.txt @@ -22,7 +22,7 @@ target_link_libraries(wobblywindows PRIVATE ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_wobblywindows_config_SRCS wobblywindows_config.cpp) ki18n_wrap_ui(kwin_wobblywindows_config_SRCS wobblywindows_config.ui) kconfig_add_kcfg_files(kwin_wobblywindows_config_SRCS wobblywindowsconfig.kcfgc) diff --git a/plugins/effects/zoom/CMakeLists.txt b/plugins/effects/zoom/CMakeLists.txt index 102e70991..6dc3e14de 100644 --- a/plugins/effects/zoom/CMakeLists.txt +++ b/plugins/effects/zoom/CMakeLists.txt @@ -35,7 +35,7 @@ endif() ####################################### # Config -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) set(kwin_zoom_config_SRCS zoom_config.cpp) ki18n_wrap_ui(kwin_zoom_config_SRCS zoom_config.ui) kconfig_add_kcfg_files(kwin_zoom_config_SRCS zoomconfig.kcfgc) diff --git a/plugins/effects/zoom/zoom_config.cpp b/plugins/effects/zoom/zoom_config.cpp index e63803736..b9edafe66 100644 --- a/plugins/effects/zoom/zoom_config.cpp +++ b/plugins/effects/zoom/zoom_config.cpp @@ -40,8 +40,8 @@ ZoomEffectConfig::ZoomEffectConfig(QObject* parent, const KPluginMetaData& data) m_ui->kcfg_EnableTextCaretTracking->setVisible(false); #endif - // Shortcut config. The shortcut belongs to the component "kwin"! - KActionCollection* actionCollection = new KActionCollection(this, QStringLiteral("kwin")); + // Shortcut config. The shortcut belongs to the component "theseus-ship"! + KActionCollection* actionCollection = new KActionCollection(this, QStringLiteral("theseus-ship")); actionCollection->setComponentDisplayName(i18n("KWin")); actionCollection->setConfigGroup(QStringLiteral("Zoom")); actionCollection->setConfigGlobal(true); diff --git a/plugins/scripts/videowall/package/contents/code/main.js b/plugins/scripts/videowall/package/contents/code/main.js index 509ac035e..aed768812 100644 --- a/plugins/scripts/videowall/package/contents/code/main.js +++ b/plugins/scripts/videowall/package/contents/code/main.js @@ -26,7 +26,7 @@ function isVideoPlayer(client) { function setup(window) { window.fullScreenChanged.connect(() => { if (window.fullScreen && isVideoPlayer(window)) { - window.frameGeometry = workspace.clientArea(KWin.FullArea, window); + window.frameGeometry = workspace.clientArea(como.FullArea, window); } }); } diff --git a/plugins/scripts/videowall/package/contents/ui/config.ui b/plugins/scripts/videowall/package/contents/ui/config.ui index 274a6b30c..199ab4d9e 100644 --- a/plugins/scripts/videowall/package/contents/ui/config.ui +++ b/plugins/scripts/videowall/package/contents/ui/config.ui @@ -7,8 +7,8 @@ SPDX-License-Identifier: GPL-2.0-or-later --> <ui version="4.0"> - <class>KWin::VideoWallConfigForm</class> - <widget class="QWidget" name="KWin::VideoWallConfigForm"> + <class>como::VideoWallConfigForm</class> + <widget class="QWidget" name="como::VideoWallConfigForm"> <property name="geometry"> <rect> <x>0</x> diff --git a/tests/integration/global_shortcuts.cpp b/tests/integration/global_shortcuts.cpp index 4da438349..bfd6360e5 100644 --- a/tests/integration/global_shortcuts.cpp +++ b/tests/integration/global_shortcuts.cpp @@ -80,7 +80,7 @@ TEST_CASE("global shortcuts", "[input]") QKeySequence const seq(mod_test_data.qt | key_test_data.qt); auto action = std::make_unique<QAction>(); - action->setProperty("componentName", "kwin"); + action->setProperty("componentName", "theseus-ship"); action->setObjectName("globalshortcuts-test-non-latin-layout"); QSignalSpy triggeredSpy(action.get(), &QAction::triggered); @@ -106,7 +106,7 @@ TEST_CASE("global shortcuts", "[input]") { // Verifies that a shortcut with a consumed shift modifier triggers create the action. auto action = std::make_unique<QAction>(); - action->setProperty("componentName", "kwin"); + action->setProperty("componentName", "theseus-ship"); action->setObjectName(QStringLiteral("globalshortcuts-test-consumed-shift")); QSignalSpy triggeredSpy(action.get(), &QAction::triggered); @@ -137,7 +137,7 @@ TEST_CASE("global shortcuts", "[input]") // another key should stop triggering the shortcut. auto action = std::make_unique<QAction>(); - action->setProperty("componentName", "kwin"); + action->setProperty("componentName", "theseus-ship"); action->setObjectName(QStringLiteral("globalshortcuts-test-consumed-shift")); QSignalSpy triggeredSpy(action.get(), &QAction::triggered); @@ -207,7 +207,7 @@ TEST_CASE("global shortcuts", "[input]") { // BUG 370341 auto action = std::make_unique<QAction>(); - action->setProperty("componentName", QStringLiteral("kwin")); + action->setProperty("componentName", QStringLiteral("theseus-ship")); action->setObjectName(QStringLiteral("globalshortcuts-test-meta-shift-w")); QSignalSpy triggeredSpy(action.get(), &QAction::triggered); QVERIFY(triggeredSpy.isValid()); @@ -237,7 +237,7 @@ TEST_CASE("global shortcuts", "[input]") { // BUG 390110 auto action = std::make_unique<QAction>(); - action->setProperty("componentName", QStringLiteral("kwin")); + action->setProperty("componentName", QStringLiteral("theseus-ship")); action->setObjectName(QStringLiteral("globalshortcuts-accent")); QSignalSpy triggeredSpy(action.get(), &QAction::triggered); @@ -258,7 +258,7 @@ TEST_CASE("global shortcuts", "[input]") SECTION("keypad") { auto zero_action = std::make_unique<QAction>(); - zero_action->setProperty("componentName", QStringLiteral("kwin")); + zero_action->setProperty("componentName", QStringLiteral("theseus-ship")); zero_action->setObjectName(QStringLiteral("globalshortcuts-test-keypad-0")); QSignalSpy zero_action_spy(zero_action.get(), &QAction::triggered); @@ -268,7 +268,7 @@ TEST_CASE("global shortcuts", "[input]") KGlobalAccel::NoAutoloading); auto insert_action = std::make_unique<QAction>(); - insert_action->setProperty("componentName", QStringLiteral("kwin")); + insert_action->setProperty("componentName", QStringLiteral("theseus-ship")); insert_action->setObjectName(QStringLiteral("globalshortcuts-test-keypad-ins")); QSignalSpy insert_action_spy(insert_action.get(), &QAction::triggered); diff --git a/tests/integration/lockscreen.cpp b/tests/integration/lockscreen.cpp index 8ec5861a5..9711d2a3d 100644 --- a/tests/integration/lockscreen.cpp +++ b/tests/integration/lockscreen.cpp @@ -630,7 +630,7 @@ TEST_CASE("lockscreen", "[base]") QSignalSpy actionSpy(action.get(), &QAction::triggered); QVERIFY(actionSpy.isValid()); - action->setProperty("componentName", "kwin"); + action->setProperty("componentName", "theseus-ship"); action->setObjectName("LockScreentestKeyboardShortcut"); KGlobalAccel::self()->setDefaultShortcut( diff --git a/tests/integration/no_global_shortcuts.cpp b/tests/integration/no_global_shortcuts.cpp index 88dd820ff..91ae6571b 100644 --- a/tests/integration/no_global_shortcuts.cpp +++ b/tests/integration/no_global_shortcuts.cpp @@ -166,7 +166,7 @@ TEST_CASE("no global shortcuts", "[input]") SECTION("kglobalaccel") { std::unique_ptr<QAction> action(new QAction(nullptr)); - action->setProperty("componentName", "kwin"); + action->setProperty("componentName", "theseus-ship"); action->setObjectName(QStringLiteral("globalshortcuts-test-meta-shift-w")); QSignalSpy triggeredSpy(action.get(), &QAction::triggered); QVERIFY(triggeredSpy.isValid()); diff --git a/tests/integration/xdg-shell_window.cpp b/tests/integration/xdg-shell_window.cpp index 5857191fd..d1cebffec 100644 --- a/tests/integration/xdg-shell_window.cpp +++ b/tests/integration/xdg-shell_window.cpp @@ -748,7 +748,7 @@ TEST_CASE("xdg-shell window", "[win]") QVERIFY(desktopFileNameChangedSpy.wait()); QCOMPARE(iconChangedSpy.count(), 1); QCOMPARE(QString::fromUtf8(c->control->desktop_file_name), dfPath); - QCOMPARE(c->control->icon.name(), QStringLiteral("kwin")); + QCOMPARE(c->control->icon.name(), QStringLiteral("theseus-ship")); } SECTION("caption simplified") diff --git a/tests/plasma/main_wayland.cpp b/tests/plasma/main_wayland.cpp index 1fe95dc34..4b3412eed 100644 --- a/tests/plasma/main_wayland.cpp +++ b/tests/plasma/main_wayland.cpp @@ -219,7 +219,7 @@ int main(int argc, char* argv[]) using base_t = base::wayland::xwl_platform<base_mod>; base_t base({ - .config = base::config(KConfig::OpenFlag::FullConfig, "kwinrc"), + .config = base::config(KConfig::OpenFlag::FullConfig, "theseus-shiprc"), .socket_name = parser.value(options.socket).toStdString(), .flags = flags, .mode = parser.isSet(options.xwl) ? base::operation_mode::xwayland diff --git a/tests/plasma/main_x11.cpp b/tests/plasma/main_x11.cpp index 283deac93..ef489f210 100644 --- a/tests/plasma/main_x11.cpp +++ b/tests/plasma/main_x11.cpp @@ -128,7 +128,7 @@ int main(int argc, char* argv[]) crash_count = parser.value("crashes").toInt(); using base_t = base::x11::platform<base_mod>; - base_t base(base::config(KConfig::OpenFlag::FullConfig, "kwinrc")); + base_t base(base::config(KConfig::OpenFlag::FullConfig, "theseus-shiprc")); KCrash::setEmergencySaveFunction(crash_handler); base::x11::platform_init_crash_count(base, crash_count);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
