marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename satellite to plasma.phone

Browse source 
All interfaces are now consistent and start with 'org.kde.plasma.phone'

Reviewed-By: Marco Martin
This commit is contained in:
Vishesh Handa 2015-06-19 01:31:44 +02:00
parent 608be69047
commit df0fd34bc1
17 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -37,12 +37,12 @@ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAG
include(CheckIncludeFiles) include(CheckIncludeFiles)
plasma_install_package(look-and-feel org.kde.satellite.phone look-and-feel) plasma_install_package(look-and-feel org.kde.plasma.phone look-and-feel)
plasma_install_package(shell org.kde.satellite.phone shells) plasma_install_package(shell org.kde.plasma.phone shells)
install(DIRECTORY wallpaper/ DESTINATION "${WALLPAPER_INSTALL_DIR}/org.kde.satellite.lockers") install(DIRECTORY wallpaper/ DESTINATION "${WALLPAPER_INSTALL_DIR}/org.kde.plasma.phone.lockers")
install(DIRECTORY compositor/ install(DIRECTORY compositor/
DESTINATION ${DATA_INSTALL_DIR}/greenisland/org.kde.satellite.compositor.phone DESTINATION ${DATA_INSTALL_DIR}/greenisland/org.kde.plasma.phone.compositor
PATTERN .svn EXCLUDE PATTERN .svn EXCLUDE
PATTERN CMakeLists.txt EXCLUDE PATTERN CMakeLists.txt EXCLUDE
PATTERN Messages.sh EXCLUDE PATTERN Messages.sh EXCLUDE

2
README.md
View file

@ -38,6 +38,6 @@ http://comments.gmane.org/gmane.comp.handhelds.ofono/12178
phonesim -p 12345 -gui /usr/share/phonesim/default.xml phonesim -p 12345 -gui /usr/share/phonesim/default.xml
* from the oFono *source* directory, call /test/enable-modem to bring the modem up, the control UI should come up * from the oFono *source* directory, call /test/enable-modem to bring the modem up, the control UI should come up
* call test/online-modem to activate the test phonesim modem * call test/online-modem to activate the test phonesim modem
* start plasma with plasmashell -w -p org.kde.satellite.phone to start the phone homescreen in a window * start plasma with plasmashell -w -p org.kde.plasma.phone to start the phone homescreen in a window
Note that the oFono/phonesim part is necessary only if it's needed to test some part specific to telephony Note that the oFono/phonesim part is necessary only if it's needed to test some part specific to telephony

2
applets/quicksettings/package/contents/ui/main.qml
View file

@ -69,7 +69,7 @@ Item {
text: "Wireless" text: "Wireless"
icon: "network-wireless-on" icon: "network-wireless-on"
enabled: true enabled: true
settingsCommand: "active-settings -m org.kde.satellite.settings.wifi" settingsCommand: "active-settings -m org.kde.plasma.phone.settings.wifi"
} }
ListElement { ListElement {
text: "Alarms" text: "Alarms"

2
bin/plasma-phone.cmake
View file

@ -39,4 +39,4 @@ init --user &
mc-tool request ofono/ofono/account0 online mc-tool request ofono/ofono/account0 online
paplay /usr/share/sounds/freedesktop/stereo/message.oga & paplay /usr/share/sounds/freedesktop/stereo/message.oga &
exec /usr/bin/plasmashell -p org.kde.satellite.phone 2>/tmp/plasmashell_logs exec /usr/bin/plasmashell -p org.kde.plasma.phone 2>/tmp/plasmashell_logs

10
dbus/CMakeLists.txt
View file

@ -1,9 +1,9 @@
macro(satellite_install_dbus_service name) macro(plasma_phone_install_dbus_service name)
install(FILES ${name}.service install(FILES ${name}.service
DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/session.d) DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/session.d)
endmacro() endmacro()
satellite_install_dbus_service(org.kde.kde5) plasma_phone_install_dbus_service(org.kde.kde5)
satellite_install_dbus_service(org.kde.kglobalaccel) plasma_phone_install_dbus_service(org.kde.kglobalaccel)
satellite_install_dbus_service(org.kde.klauncher5) plasma_phone_install_dbus_service(org.kde.klauncher5)
satellite_install_dbus_service(org.kde.kuiserver) plasma_phone_install_dbus_service(org.kde.kuiserver)

4
look-and-feel/metadata.desktop
View file

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Name=Satellite Name=Plasma Phone
Comment=Plasma workspace for smartphones Comment=Plasma workspace for smartphones
Keywords=Phone, Workspace, Look and Feel Keywords=Phone, Workspace, Look and Feel
Type=Service Type=Service
@ -10,7 +10,7 @@ X-KDE-PluginInfo-Author=
X-KDE-PluginInfo-Category= X-KDE-PluginInfo-Category=
X-KDE-PluginInfo-Email= X-KDE-PluginInfo-Email=
X-KDE-PluginInfo-License=GPLv2+ X-KDE-PluginInfo-License=GPLv2+
X-KDE-PluginInfo-Name=org.kde.plasma.satellite X-KDE-PluginInfo-Name=org.kde.plasma.phone
X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Version=0.1
X-KDE-PluginInfo-Website= X-KDE-PluginInfo-Website=
X-Plasma-MainScript=defaults X-Plasma-MainScript=defaults

2
packaging/plasma-phone-components.spec
View file

@ -106,7 +106,7 @@ EOF
cat > %{buildroot}%{_kf5_configdir}/kdeglobals <<EOF cat > %{buildroot}%{_kf5_configdir}/kdeglobals <<EOF
[KDE] [KDE]
LookAndFeelPackage=org.kde.satellite.phone LookAndFeelPackage=org.kde.plasma.phone
[General] [General]
desktopFont=Oxygen Sans,9,-1,5,50,0,0,0,0,0 desktopFont=Oxygen Sans,9,-1,5,50,0,0,0,0,0

18
services/CMakeLists.txt
View file

@ -3,17 +3,17 @@ pkg_check_modules(SYSTEMD systemd REQUIRED)
execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemduserunitdir systemd OUTPUT_VARIABLE SYSTEMD_USER_UNIT_DIR) execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemduserunitdir systemd OUTPUT_VARIABLE SYSTEMD_USER_UNIT_DIR)
string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_USER_UNIT_DIR ${SYSTEMD_USER_UNIT_DIR}) string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_USER_UNIT_DIR ${SYSTEMD_USER_UNIT_DIR})
macro(satellite_install_service name) macro(plasma_phone_install_service name)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${name}.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/${name}.service) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${name}.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/${name}.service)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.service install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.service
DESTINATION ${SYSTEMD_USER_UNIT_DIR}) DESTINATION ${SYSTEMD_USER_UNIT_DIR})
endmacro() endmacro()
satellite_install_service(kactivitymanagerd) plasma_phone_install_service(kactivitymanagerd)
satellite_install_service(kded5) plasma_phone_install_service(kded5)
satellite_install_service(kdeinit5) plasma_phone_install_service(kdeinit5)
satellite_install_service(kglobalaccel5) plasma_phone_install_service(kglobalaccel5)
satellite_install_service(kuiserver5) plasma_phone_install_service(kuiserver5)
satellite_install_service(plasma-phone-compositor) plasma_phone_install_service(plasma-phone-compositor)
satellite_install_service(plasma-phone-ui) plasma_phone_install_service(plasma-phone-ui)
satellite_install_service(plasma-phone) plasma_phone_install_service(plasma-phone)

2
services/plasma-phone-compositor.service.cmake
View file

@ -15,7 +15,7 @@ Type=notify
Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket
EnvironmentFile=-/var/lib/environment/compositor/*.conf EnvironmentFile=-/var/lib/environment/compositor/*.conf
EnvironmentFile=-/var/lib/environment/greenisland/*.conf EnvironmentFile=-/var/lib/environment/greenisland/*.conf
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/greenisland $LIPSTICK_OPTIONS -p org.kde.satellite.compositor.phone ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/greenisland $LIPSTICK_OPTIONS -p org.kde.plasma.compositor.phone
Restart=on-failure Restart=on-failure
[Install] [Install]

2
services/plasma-phone-ui.service.cmake
View file

@ -12,7 +12,7 @@ After=plasma-phone-compositor.service
[Service] [Service]
Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket
EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf EnvironmentFile=-/var/lib/environment/plasma-phone/*.conf
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/plasmashell -p org.kde.satellite.phone -n ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/plasmashell -p org.kde.plasma.phone -n
ExecStop=@CMAKE_INSTALL_FULL_BINDIR@/kquitapp5 plasmashell ExecStop=@CMAKE_INSTALL_FULL_BINDIR@/kquitapp5 plasmashell
Restart=on-failure Restart=on-failure
BusName=org.kde.plasmashell BusName=org.kde.plasmashell

2
settingsmodules/CMakeLists.txt
View file

@ -1,4 +1,4 @@
plasma_install_package(wireless org.kde.satellite.settings.wifi packages package) plasma_install_package(wireless org.kde.plasma.phone.settings.wifi packages package)

2
settingsmodules/wireless/metadata.desktop
View file

@ -8,7 +8,7 @@ Icon=network-wireless
X-KDE-ServiceTypes=Active/SettingsModule X-KDE-ServiceTypes=Active/SettingsModule
X-KDE-PluginInfo-Author=Marco Martin X-KDE-PluginInfo-Author=Marco Martin
X-KDE-PluginInfo-Email=mart@kde.org X-KDE-PluginInfo-Email=mart@kde.org
X-KDE-PluginInfo-Name=org.kde.satellite.settings.wifi X-KDE-PluginInfo-Name=org.kde.plasma.phone.settings.wifi
X-KDE-PluginInfo-Version=1.0 X-KDE-PluginInfo-Version=1.0
X-KDE-PluginInfo-Website= X-KDE-PluginInfo-Website=
X-KDE-PluginInfo-Category=Networking X-KDE-PluginInfo-Category=Networking

2
shell/contents/defaults
View file

@ -1,5 +1,5 @@
[kdeglobals][KDE] [kdeglobals][KDE]
LookAndFeelPackage=org.kde.satellite.phone LookAndFeelPackage=org.kde.plasma.phone
[Desktop] [Desktop]
Containment=org.kde.phone.homescreen Containment=org.kde.phone.homescreen

2
shell/contents/layout.js
View file

@ -11,7 +11,7 @@ for (var j = 0; j < desktopsArray.length; j++) {
desktopsArray[j].currentConfigGroup = ["Wallpaper", desktopsArray[j].currentConfigGroup = ["Wallpaper",
desktopsArray[j].wallpaperPlugin, desktopsArray[j].wallpaperPlugin,
"General"]; "General"];
desktopsArray[j].writeConfig("Image", "org.kde.satellite.lockers"); desktopsArray[j].writeConfig("Image", "org.kde.plasma.phone.lockers");
} }
desktopsForActivity(id)[0].addWidget("org.kde.phone.notifications"); desktopsForActivity(id)[0].addWidget("org.kde.phone.notifications");

2
shell/contents/loader.qml
View file

@ -23,7 +23,7 @@ import QtQuick 2
Item { Item {
id: main id: main
property string shell : "org.kde.satellite.phone" property string shell : "org.kde.plasma.phone"
property bool willing : true property bool willing : true
property int priority : 10 property int priority : 10

2
shell/metadata.desktop
View file

@ -8,7 +8,7 @@ X-KDE-PluginInfo-Author=Aaron Seigo
X-KDE-PluginInfo-Category= X-KDE-PluginInfo-Category=
X-KDE-PluginInfo-Email=aseigo@kde.org X-KDE-PluginInfo-Email=aseigo@kde.org
X-KDE-PluginInfo-License=GPLv2+ X-KDE-PluginInfo-License=GPLv2+
X-KDE-PluginInfo-Name=org.kde.satellite.phone X-KDE-PluginInfo-Name=org.kde.plasma.phone
X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Version=0.1
X-KDE-PluginInfo-Website= X-KDE-PluginInfo-Website=

4
wallpaper/metadata.desktop
View file

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=Satellite Lockers Name=Plasma Phone Lockers
X-KDE-PluginInfo-Name=org.kde.satellite.lockers X-KDE-PluginInfo-Name=org.kde.plasma.phone.lockers
X-KDE-PluginInfo-Author=Jens Reuterberg X-KDE-PluginInfo-Author=Jens Reuterberg
X-KDE-PluginInfo-Email=jens@ohyran.se X-KDE-PluginInfo-Email=jens@ohyran.se
X-KDE-PluginInfo-License=LGPLv3 X-KDE-PluginInfo-License=LGPLv3