Commit df0fd34b authored by Vishesh Handa's avatar Vishesh Handa

Rename satellite to plasma.phone

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

Reviewed-By: Marco Martin
parent 608be690
......@@ -37,12 +37,12 @@ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAG
include(CheckIncludeFiles)
plasma_install_package(look-and-feel org.kde.satellite.phone look-and-feel)
plasma_install_package(shell org.kde.satellite.phone shells)
install(DIRECTORY wallpaper/ DESTINATION "${WALLPAPER_INSTALL_DIR}/org.kde.satellite.lockers")
plasma_install_package(look-and-feel org.kde.plasma.phone look-and-feel)
plasma_install_package(shell org.kde.plasma.phone shells)
install(DIRECTORY wallpaper/ DESTINATION "${WALLPAPER_INSTALL_DIR}/org.kde.plasma.phone.lockers")
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 CMakeLists.txt EXCLUDE
PATTERN Messages.sh EXCLUDE
......
......@@ -38,6 +38,6 @@ http://comments.gmane.org/gmane.comp.handhelds.ofono/12178
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
* 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
......@@ -69,7 +69,7 @@ Item {
text: "Wireless"
icon: "network-wireless-on"
enabled: true
settingsCommand: "active-settings -m org.kde.satellite.settings.wifi"
settingsCommand: "active-settings -m org.kde.plasma.phone.settings.wifi"
}
ListElement {
text: "Alarms"
......
......@@ -39,4 +39,4 @@ init --user &
mc-tool request ofono/ofono/account0 online
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
macro(satellite_install_dbus_service name)
macro(plasma_phone_install_dbus_service name)
install(FILES ${name}.service
DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/session.d)
endmacro()
satellite_install_dbus_service(org.kde.kde5)
satellite_install_dbus_service(org.kde.kglobalaccel)
satellite_install_dbus_service(org.kde.klauncher5)
satellite_install_dbus_service(org.kde.kuiserver)
plasma_phone_install_dbus_service(org.kde.kde5)
plasma_phone_install_dbus_service(org.kde.kglobalaccel)
plasma_phone_install_dbus_service(org.kde.klauncher5)
plasma_phone_install_dbus_service(org.kde.kuiserver)
[Desktop Entry]
Name=Satellite
Name=Plasma Phone
Comment=Plasma workspace for smartphones
Keywords=Phone, Workspace, Look and Feel
Type=Service
......@@ -10,7 +10,7 @@ X-KDE-PluginInfo-Author=
X-KDE-PluginInfo-Category=
X-KDE-PluginInfo-Email=
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-Website=
X-Plasma-MainScript=defaults
......@@ -106,7 +106,7 @@ EOF
cat > %{buildroot}%{_kf5_configdir}/kdeglobals <<EOF
[KDE]
LookAndFeelPackage=org.kde.satellite.phone
LookAndFeelPackage=org.kde.plasma.phone
[General]
desktopFont=Oxygen Sans,9,-1,5,50,0,0,0,0,0
......
......@@ -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)
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)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.service
DESTINATION ${SYSTEMD_USER_UNIT_DIR})
endmacro()
satellite_install_service(kactivitymanagerd)
satellite_install_service(kded5)
satellite_install_service(kdeinit5)
satellite_install_service(kglobalaccel5)
satellite_install_service(kuiserver5)
satellite_install_service(plasma-phone-compositor)
satellite_install_service(plasma-phone-ui)
satellite_install_service(plasma-phone)
plasma_phone_install_service(kactivitymanagerd)
plasma_phone_install_service(kded5)
plasma_phone_install_service(kdeinit5)
plasma_phone_install_service(kglobalaccel5)
plasma_phone_install_service(kuiserver5)
plasma_phone_install_service(plasma-phone-compositor)
plasma_phone_install_service(plasma-phone-ui)
plasma_phone_install_service(plasma-phone)
......@@ -15,7 +15,7 @@ Type=notify
Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket
EnvironmentFile=-/var/lib/environment/compositor/*.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
[Install]
......
......@@ -12,7 +12,7 @@ After=plasma-phone-compositor.service
[Service]
Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/dbus/user_bus_socket
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
Restart=on-failure
BusName=org.kde.plasmashell
......
plasma_install_package(wireless org.kde.satellite.settings.wifi packages package)
plasma_install_package(wireless org.kde.plasma.phone.settings.wifi packages package)
......@@ -8,7 +8,7 @@ Icon=network-wireless
X-KDE-ServiceTypes=Active/SettingsModule
X-KDE-PluginInfo-Author=Marco Martin
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-Website=
X-KDE-PluginInfo-Category=Networking
......
[kdeglobals][KDE]
LookAndFeelPackage=org.kde.satellite.phone
LookAndFeelPackage=org.kde.plasma.phone
[Desktop]
Containment=org.kde.phone.homescreen
......
......@@ -11,7 +11,7 @@ for (var j = 0; j < desktopsArray.length; j++) {
desktopsArray[j].currentConfigGroup = ["Wallpaper",
desktopsArray[j].wallpaperPlugin,
"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");
......
......@@ -23,7 +23,7 @@ import QtQuick 2
Item {
id: main
property string shell : "org.kde.satellite.phone"
property string shell : "org.kde.plasma.phone"
property bool willing : true
property int priority : 10
......
......@@ -8,7 +8,7 @@ X-KDE-PluginInfo-Author=Aaron Seigo
X-KDE-PluginInfo-Category=
X-KDE-PluginInfo-Email=aseigo@kde.org
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-Website=
[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-Email=jens@ohyran.se
X-KDE-PluginInfo-License=LGPLv3
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment