From d31877c3ac25706f0d8bc40face044ecc9253e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Mon, 4 Oct 2021 20:22:15 +0200 Subject: [PATCH] KDE: change kwin library name to kali-breeze --- src/themes/Kali/kwin5/CMakeLists.txt | 1 - .../Kali/kwin5/kdecoration/CMakeLists.txt | 11 +- src/themes/Kali/kwin5/kdecoration/breeze.json | 96 +----------- .../config/breezedecorationconfig.desktop | 146 ------------------ .../Kali/kwin5/libbreezecommon/CMakeLists.txt | 25 --- 5 files changed, 8 insertions(+), 271 deletions(-) delete mode 100644 src/themes/Kali/kwin5/kdecoration/config/breezedecorationconfig.desktop delete mode 100644 src/themes/Kali/kwin5/libbreezecommon/CMakeLists.txt diff --git a/src/themes/Kali/kwin5/CMakeLists.txt b/src/themes/Kali/kwin5/CMakeLists.txt index 0e6d108f..b94342d0 100644 --- a/src/themes/Kali/kwin5/CMakeLists.txt +++ b/src/themes/Kali/kwin5/CMakeLists.txt @@ -11,4 +11,3 @@ include(KDECMakeSettings) find_package(KDecoration2 REQUIRED) add_subdirectory(kdecoration) -add_subdirectory(libbreezecommon) diff --git a/src/themes/Kali/kwin5/kdecoration/CMakeLists.txt b/src/themes/Kali/kwin5/kdecoration/CMakeLists.txt index f99f3389..8e4fc02a 100644 --- a/src/themes/Kali/kwin5/kdecoration/CMakeLists.txt +++ b/src/themes/Kali/kwin5/kdecoration/CMakeLists.txt @@ -36,6 +36,7 @@ include_directories(${CMAKE_BINARY_DIR}/libbreezecommon) ### plugin classes set(breezedecoration_SRCS breezebutton.cpp + ../libbreezecommon/breezeboxshadowrenderer.cpp breezedecoration.cpp breezeexceptionlist.cpp breezesettingsprovider.cpp @@ -64,18 +65,17 @@ set(breezedecoration_config_PART_FORMS ki18n_wrap_ui(breezedecoration_config_PART_FORMS_HEADERS ${breezedecoration_config_PART_FORMS}) ### build library -add_library(breezedecoration MODULE +add_library(kali-breezedecoration MODULE ${breezedecoration_SRCS} ${breezedecoration_config_SRCS} ${breezedecoration_config_PART_FORMS_HEADERS}) -target_link_libraries(breezedecoration +target_link_libraries(kali-breezedecoration PUBLIC Qt5::Core Qt5::Gui Qt5::DBus PRIVATE - breezecommon5 KDecoration2::KDecoration KF5::ConfigCore KF5::CoreAddons @@ -86,12 +86,11 @@ target_link_libraries(breezedecoration KF5::WindowSystem) if(BREEZE_HAVE_X11) - target_link_libraries(breezedecoration + target_link_libraries(kali-breezedecoration PUBLIC Qt5::X11Extras XCB::XCB) endif() -install(TARGETS breezedecoration DESTINATION ${PLUGIN_INSTALL_DIR}/org.kde.kdecoration2) -install(FILES config/breezedecorationconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(TARGETS kali-breezedecoration DESTINATION ${PLUGIN_INSTALL_DIR}/org.kde.kdecoration2) diff --git a/src/themes/Kali/kwin5/kdecoration/breeze.json b/src/themes/Kali/kwin5/kdecoration/breeze.json index bc340182..b0feed05 100644 --- a/src/themes/Kali/kwin5/kdecoration/breeze.json +++ b/src/themes/Kali/kwin5/kdecoration/breeze.json @@ -1,99 +1,9 @@ { "KPlugin": { - "Description": "Window decoration using the Breeze visual style for the Plasma Desktop", - "Description[ar]": "زخرفة نوافذ تستخدم نمط «نسيم» المرئيّ لسطح مكتب «بلازما»", - "Description[ast]": "La decoración de ventanes pal escritoriu de Plasma qu'usa l'estilu visual Breeze", - "Description[az]": "Plazma Masaüstü üçün Breeze vizual üslubundan istifadə edən pəncərə dekorasiyası", - "Description[ca@valencia]": "Decoració de les finestres que usa l'estil visual Brisa per a l'escriptori de Plasma", - "Description[ca]": "Decoració de les finestres que usa l'estil visual Brisa per a l'escriptori Plasma", - "Description[cs]": "Dekorace oken pro pracovní plochu Plasma využívající styl Breeze", - "Description[da]": "Vinduesdekoration som bruger den visuelle stil Breeze til Plasma-skrivebordet", - "Description[de]": "Fensterdekoration im Breeze-Design für die Plasma-Arbeitsfläche", - "Description[el]": "Διακοσμήσεις παραθύρων με το στιλ του Breeze για την επιφάνεια εργασίας Plasma", - "Description[en_GB]": "Window decoration using the Breeze visual style for the Plasma Desktop", - "Description[es]": "Decoración de ventanas que usa el estilo visual Brisa para el escritorio Plasma", - "Description[et]": "Plasma töölaua akende dekoratsioon Breeze'i visuaalse stiiliga", - "Description[eu]": "Leiho apainketa Plasma mahaigainerako Breeze ikus-estiloa erabiliz", - "Description[fi]": "Breeze-tyyliä käyttävä ikkunan kehys Plasma-työpöydälle", - "Description[fr]": "Décorations de fenêtres utilisant le style visuel Breeze pour le bureau Plasma", - "Description[gl]": "Decoración de xanelas que usa o estilo visual Breeze para o escritorio Plasma.", - "Description[hu]": "A Breeze vizuális stílusát használó ablakdekoráció", - "Description[ia]": "Decoration de fenestra usante le stilo visual Breeze (Brisa) per le scriptorio de Plasma", - "Description[id]": "Dekorasi window menggunakan gaya visual Breeze untuk Desktop Plasma", - "Description[it]": "Decorazione per finestre che usa lo stile visuale di Brezza per il desktop Plasma", - "Description[ja]": "Plasma デスクトップのための Breeze スタイルを使用したウィンドウ装飾", - "Description[ko]": "Plasma 데스크톱의 Breeze 시각 스타일을 사용하는 창 장식", - "Description[lt]": "Langų dekoracijos, naudojant Breeze vaizdinį stilių, skirtą Plasma darbalaukiui", - "Description[nb]": "Vinduspynt som bruker Breeze-stilen for Plasma-skrivebordet", - "Description[nl]": "Vensterdecoratie met gebruik van de visuele stijl Breeze voor het Plasma bureaublad", - "Description[nn]": "Vindaugspynt som brukar Breeze-stilen for Plasma-skrivebordet", - "Description[pa]": "ਪਲਾਜ਼ਮਾ ਡੈਸਕਟਾਪ ਲਈ ਬਰੀਜ਼ ਦਿੱਖ ਸਟਾਈਲ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਵਿੰਡੋ ਸਜਾਵਟ", - "Description[pl]": "Wystrój okien przy użyciu stylu wizualnego Bryzy dla Pulpitu Plazmy", - "Description[pt]": "Decoração de janelas que usa o estilo visual Brisa para a Área de Trabalho Plasma", - "Description[pt_BR]": "Decoração de janelas que usa o estilo visual Breeze para o Plasma Desktop", - "Description[ro]": "Decorații de fereastră folosind stilul vizual Briză pentru biroul Plasma", - "Description[ru]": "Оформление окон Breeze", - "Description[sk]": "Dekorácia okien pomocou vizuálneho štýlu Vánok pre plochu Plasma", - "Description[sl]": "Okraski oken, ki uporabljajo vidni slog teme Sapica za namizje Plasma", - "Description[sr@ijekavian]": "Декорација прозора са Поветарцем као визуелним стилом за плазма површ.", - "Description[sr@ijekavianlatin]": "Dekoracija prozora sa Povetarcem kao vizuelnim stilom za plasma površ.", - "Description[sr@latin]": "Dekoracija prozora sa Povetarcem kao vizuelnim stilom za plasma površ.", - "Description[sr]": "Декорација прозора са Поветарцем као визуелним стилом за плазма површ.", - "Description[sv]": "Fönsterdekoration med den visuella stilen Breeze för Plasma skrivbord", - "Description[tg]": "Ороиши равзана бо истифодаи услуби намоёнии Насим барои мизи кории Plasma", - "Description[tr]": "Breeze görsel biçemini Plasma Masaüstü için kullanan pencere dekorasyonu", - "Description[uk]": "Обрамлення вікон з використанням візуального стилю Breeze для стільничного середовища Плазми", - "Description[x-test]": "xxWindow decoration using the Breeze visual style for the Plasma Desktopxx", - "Description[zh_CN]": "Breeze 微风视觉风格的 Plasma 桌面窗口装饰", - "Description[zh_TW]": "使用 Plasma 桌面 Breeze 視覺樣式的視窗裝飾", + "Description": "Window decoration using Kali's visual style for the Plasma Desktop", "EnabledByDefault": true, - "Id": "org.kde.breeze", - "Name": "Breeze", - "Name[ar]": "نسيم", - "Name[ast]": "Breeze", - "Name[az]": "Breeze", - "Name[ca@valencia]": "Brisa", - "Name[ca]": "Brisa", - "Name[cs]": "Breeze", - "Name[da]": "Breeze", - "Name[de]": "Breeze", - "Name[el]": "Breeze", - "Name[en_GB]": "Breeze", - "Name[es]": "Brisa", - "Name[et]": "Breeze", - "Name[eu]": "Breeze", - "Name[fi]": "Breeze", - "Name[fr]": "Breeze", - "Name[gl]": "Breeze", - "Name[hu]": "Breeze", - "Name[ia]": "Brisa (Breeze)", - "Name[id]": "Breeze", - "Name[it]": "Brezza", - "Name[ja]": "Breeze", - "Name[ko]": "Breeze", - "Name[lt]": "Breeze", - "Name[nb]": "Breeze", - "Name[nl]": "Breeze", - "Name[nn]": "Breeze", - "Name[pa]": "ਬਰੀਜ਼", - "Name[pl]": "Bryza", - "Name[pt]": "Brisa", - "Name[pt_BR]": "Breeze", - "Name[ro]": "Briză", - "Name[ru]": "Breeze", - "Name[sk]": "Vánok", - "Name[sl]": "Sapica", - "Name[sr@ijekavian]": "Поветарац", - "Name[sr@ijekavianlatin]": "Povetarac", - "Name[sr@latin]": "Povetarac", - "Name[sr]": "Поветарац", - "Name[sv]": "Breeze", - "Name[tg]": "Насим", - "Name[tr]": "Esinti", - "Name[uk]": "Breeze", - "Name[x-test]": "xxBreezexx", - "Name[zh_CN]": "Breeze 微风", - "Name[zh_TW]": "Breeze", + "Id": "org.kali.kali", + "Name": "Kali", "ServiceTypes": [ "org.kde.kdecoration2" ] diff --git a/src/themes/Kali/kwin5/kdecoration/config/breezedecorationconfig.desktop b/src/themes/Kali/kwin5/kdecoration/config/breezedecorationconfig.desktop deleted file mode 100644 index b5d0ad0e..00000000 --- a/src/themes/Kali/kwin5/kdecoration/config/breezedecorationconfig.desktop +++ /dev/null @@ -1,146 +0,0 @@ -[Desktop Entry] -Exec=kcmshell5 breezedecorationconfig -Icon=preferences-system-windows -Type=Service -X-KDE-ServiceTypes=KCModule - -X-KDE-Library=org.kde.kdecoration2/breezedecoration -X-KDE-PluginKeyword=kcmodule -X-KDE-ParentApp=kcontrol -X-KDE-Weight=60 - -Name=Breeze Window Decoration -Name[az]=Breeze Pəncərə Tərtibatı -Name[ca]=Decoració de les finestres Brisa -Name[ca@valencia]=Decoració de les finestres Brisa -Name[cs]=Dekorace oken Breeze -Name[da]=Breeze vinduesdekoration -Name[de]=Breeze-Fensterdekoration -Name[el]=Διακοσμήσεις παραθύρου Breeze -Name[en_GB]=Breeze Window Decoration -Name[es]=Decoración de ventanas Brisa -Name[et]=Breeze akna dekoratsioon -Name[eu]=Breeze leihoen apaindura -Name[fi]=Breeze-ikkunankehys -Name[fr]=Décoration de fenêtre Brise -Name[gl]=Decoración de xanela de Breeze -Name[hu]=Breeze ablakdekoráció -Name[ia]=Decoration de fenestra Breeze -Name[id]=Dekorasi Window Breeze -Name[it]=Decorazione delle finestre di Brezza -Name[ja]=Breeze ウィンドウ装飾 -Name[ko]=Breeze 창 장식 -Name[lt]=Breeze langų dekoracija -Name[nl]=Breeze vensterdecoratie -Name[nn]=Breeze-vindaugsdekorasjon -Name[pa]=ਬਰੀਜ਼ ਵਿੰਡੋ ਸਜਾਵਟ -Name[pl]=Wygląd okien Bryzy -Name[pt]=Decoração de Janelas Brisa -Name[pt_BR]=Decorações da janela Breeze -Name[ro]=Decorații pentru ferestre Briză -Name[ru]=Оформление окон Breeze -Name[sk]=Dekorácie okien Breeze -Name[sl]=Okraski oken Sapica -Name[sr]=Поветарчева декорација прозора -Name[sr@ijekavian]=Поветарчева декорација прозора -Name[sr@ijekavianlatin]=Povetarčeva dekoracija prozora -Name[sr@latin]=Povetarčeva dekoracija prozora -Name[sv]=Breeze fönsterdekoration -Name[tg]=Ороиши равзанаи Насим -Name[tr]=Breeze Pencere Dekorasyonu -Name[uk]=Декорації вікон Breeze -Name[x-test]=xxBreeze Window Decorationxx -Name[zh_CN]=Breeze 微风窗口装饰 -Name[zh_TW]=Breeze 視窗裝飾 -Comment=Modify the appearance of window decorations -Comment[ar]=عدّل مظهر زخرفات النّوافذ -Comment[az]=Pəncərə tərtibatının görünüşünü dəyişdirin -Comment[ca]=Modifica l'aparença de les decoracions de les finestres -Comment[ca@valencia]=Modifica l'aparença de les decoracions de les finestres -Comment[cs]=Změnit vzhled dekorace oken -Comment[da]=Ændr vinduesdekorationers udseende -Comment[de]=Das Erscheinungsbild der Fensterdekorationen ändern -Comment[el]=Τροποποίηση εμφάνισης της διακόσμησης παραθύρου -Comment[en_GB]=Modify the appearance of window decorations -Comment[es]=Modificar el aspecto de las decoraciones de las ventanas -Comment[et]=Akna dekoratsioonide välimuse muutmine -Comment[eu]=Aldatu leiho apainduren itxura -Comment[fi]=Muuta ikkunoiden kehysten ulkoasua -Comment[fr]=Modifier l'apparence des décorations des fenêtres -Comment[gl]=Modifica a aparencia da decoración da xanela -Comment[he]=התאם את מראה מסגרות החלונות -Comment[hu]=Az ablakdekorációk megjelenésének módosítása -Comment[ia]=Modifica le apparentia de decorationes de fenestra -Comment[id]=Memodifikasi penampilan dekorasi window -Comment[it]=Modifica l'aspetto delle decorazioni delle finestre -Comment[ja]=ウィンドウ装飾の外観を編集 -Comment[ko]=창 장식의 모습을 수정합니다 -Comment[lt]=Keisti lango dekoracijų išvaizdą -Comment[nb]=Endre utseende for vindusdekorasjoner -Comment[nl]=Wijzig het uiterlijk van vensterdecoraties -Comment[nn]=Endra utsjånad på vindaugspynt -Comment[pa]=ਵਿੰਡੋ ਸਜਾਵਟ ਦੀ ਦਿੱਖ ਨੂੰ ਸੋਧੋ -Comment[pl]=Zmień wygląd i wystrój okien -Comment[pt]=Modificar a aparência das decorações das janelas -Comment[pt_BR]=Modifica a aparência das decorações da janela -Comment[ro]=Modifică aspectul decorațiilor pentru ferestre -Comment[ru]=Настройка заголовков окон в стиле Breeze -Comment[sk]=Zmena vzhľadu dekorácie okien -Comment[sl]=Spremenite videz okraskov oken -Comment[sr]=Измените изглед декорација прозора -Comment[sr@ijekavian]=Измијените изглед декорација прозора -Comment[sr@ijekavianlatin]=Izmijenite izgled dekoracija prozora -Comment[sr@latin]=Izmenite izgled dekoracija prozora -Comment[sv]=Ändra utseendet hos fönsterdekorationer -Comment[tg]=Тағйир додани ороиши намуди зоҳирии равзанаҳо -Comment[tr]=Pencere dekorasyonlarının görünümünü değiştir -Comment[uk]=Зміна вигляду декорацій вікон -Comment[x-test]=xxModify the appearance of window decorationsxx -Comment[zh_CN]=修改窗口装饰外观 -Comment[zh_TW]=變更視窗裝飾外觀 -X-KDE-Keywords=breeze,decoration -X-KDE-Keywords[ar]=نسيم,زخرفة -X-KDE-Keywords[az]=breeze,dekorasiya -X-KDE-Keywords[ca]=breeze,brisa,decoració -X-KDE-Keywords[ca@valencia]=breeze,brisa,decoració -X-KDE-Keywords[cs]=breeze,dekorace -X-KDE-Keywords[da]=breeze,dekoration -X-KDE-Keywords[de]=Breeze,Dekoration -X-KDE-Keywords[el]=breeze,διακόσμηση -X-KDE-Keywords[en_GB]=breeze,decoration -X-KDE-Keywords[es]=breeze,brisa,decoración -X-KDE-Keywords[et]=breeze,dekoratsioon -X-KDE-Keywords[eu]=breeze,apainketa,apaindura -X-KDE-Keywords[fi]=breeze,decoration,kehys,koriste,koristus,ikkunakehys -X-KDE-Keywords[fr]=brise,décoration -X-KDE-Keywords[gl]=breeze,decoración -X-KDE-Keywords[he]=breeze,decoration,מסגרת -X-KDE-Keywords[hu]=breeze,dekoráció -X-KDE-Keywords[ia]=breeze,decoration -X-KDE-Keywords[id]=breeze,dekorasi -X-KDE-Keywords[it]=brezza,decorazione -X-KDE-Keywords[ja]=breeze,decoration -X-KDE-Keywords[ko]=breeze,decoration,장식 -X-KDE-Keywords[lt]=breeze,dekoracija -X-KDE-Keywords[nb]=beeze,dekorasjon -X-KDE-Keywords[nl]=breeze,decoratie -X-KDE-Keywords[nn]=breeze,dekorasjonar,pynt -X-KDE-Keywords[pa]=ਬਰੀਜ਼,ਸਜਾਵਟ -X-KDE-Keywords[pl]=breeze,dekoracja,bryza,wystrój -X-KDE-Keywords[pt]=brisa,decoração -X-KDE-Keywords[pt_BR]=breeze,decoração -X-KDE-Keywords[ro]=briză,breeze,decorare,decorație -X-KDE-Keywords[ru]=breeze,бриз,decoration,декорации окон,оформление окон -X-KDE-Keywords[sk]=vánok,dekorácia -X-KDE-Keywords[sl]=sapica,okraski -X-KDE-Keywords[sr]=breeze,decoration,Поветарац,декорација -X-KDE-Keywords[sr@ijekavian]=breeze,decoration,Поветарац,декорација -X-KDE-Keywords[sr@ijekavianlatin]=breeze,decoration,Povetarac,dekoracija -X-KDE-Keywords[sr@latin]=breeze,decoration,Povetarac,dekoracija -X-KDE-Keywords[sv]=breeze,dekoration -X-KDE-Keywords[tg]=насим,ороиш -X-KDE-Keywords[tr]=esinti,dekorasyon -X-KDE-Keywords[uk]=breeze,decoration,бриз,декорації,декорація,обрамлення -X-KDE-Keywords[x-test]=xxbreezexx,xxdecorationxx -X-KDE-Keywords[zh_CN]=breeze,微风,装饰,修饰 -X-KDE-Keywords[zh_TW]=breeze,decoration diff --git a/src/themes/Kali/kwin5/libbreezecommon/CMakeLists.txt b/src/themes/Kali/kwin5/libbreezecommon/CMakeLists.txt deleted file mode 100644 index c8765002..00000000 --- a/src/themes/Kali/kwin5/libbreezecommon/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -################# dependencies ################# -### Qt/KDE -find_package(Qt5 REQUIRED CONFIG COMPONENTS Widgets) - -################# breezestyle target ################# -set(breezecommon_LIB_SRCS - breezeboxshadowrenderer.cpp -) - -add_library(breezecommon5 ${breezecommon_LIB_SRCS}) - -generate_export_header(breezecommon5 - BASE_NAME breezecommon - EXPORT_FILE_NAME breezecommon_export.h) - -target_link_libraries(breezecommon5 - PUBLIC - Qt5::Core - Qt5::Gui) - -set_target_properties(breezecommon5 PROPERTIES - VERSION ${PROJECT_VERSION} - SOVERSION ${PROJECT_VERSION_MAJOR}) - -install(TARGETS breezecommon5 ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)