aiden
/
settings
mirror of https://github.com/cutefishos/settings
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update interface name

Browse Source
pull/28/head
reionwong 5 years ago
parent ccb5f67633
commit ef191f3bc1
12 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File

2
CMakeLists.txt
Unescape Escape View File

@ -56,7 +56,7 @@ set(RESOURCES
)
qt5_add_dbus_adaptor(DBUS_SOURCES
src/org.cutefish.SettingsUI.xml
src/com.cutefish.SettingsUI.xml
src/application.h Application)
set_source_files_properties(${DBUS_SOURCES} PROPERTIES SKIP_AUTOGEN ON)

36
src/appearance.cpp
Unescape Escape View File

@ -30,9 +30,9 @@
Appearance::Appearance(QObject *parent)
: QObject(parent)
, m_interface("org.cutefish.Settings",
, m_interface("com.cutefish.Settings",
"/Theme",
"org.cutefish.Theme",
"com.cutefish.Theme",
QDBusConnection::sessionBus())
, m_dockSettings(new QSettings(QSettings::UserScope, "cutefishos", "dock"))
, m_kwinSettings(new QSettings(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/kwinrc",
@ -87,9 +87,9 @@ int Appearance::dockIconSize() const
void Appearance::setDockIconSize(int dockIconSize)
{
if (m_dockIconSize != dockIconSize) {
QDBusInterface iface("org.cutefish.Dock",
QDBusInterface iface("com.cutefish.Dock",
"/Dock",
"org.cutefish.Dock",
"com.cutefish.Dock",
QDBusConnection::sessionBus());
if (iface.isValid()) {
iface.call("setIconSize", dockIconSize);
@ -108,9 +108,9 @@ int Appearance::dockDirection() const
void Appearance::setDockDirection(int dockDirection)
{
if (m_dockDirection != dockDirection) {
QDBusInterface iface("org.cutefish.Dock",
QDBusInterface iface("com.cutefish.Dock",
"/Dock",
"org.cutefish.Dock",
"com.cutefish.Dock",
QDBusConnection::sessionBus());
if (iface.isValid()) {
iface.call("setDirection", dockDirection);
@ -131,9 +131,9 @@ void Appearance::setDockVisibility(int visibility)
if (m_dockVisibility != visibility) {
m_dockVisibility = visibility;
QDBusInterface iface("org.cutefish.Dock",
QDBusInterface iface("com.cutefish.Dock",
"/Dock",
"org.cutefish.Dock",
"com.cutefish.Dock",
QDBusConnection::sessionBus());
if (iface.isValid()) {
iface.call("setVisibility", visibility);
@ -162,9 +162,9 @@ void Appearance::setGenericFontFamily(const QString &name)
if (name.isEmpty())
return;
QDBusInterface iface("org.cutefish.Settings",
QDBusInterface iface("com.cutefish.Settings",
"/Theme",
"org.cutefish.Theme",
"com.cutefish.Theme",
QDBusConnection::sessionBus(), this);
if (iface.isValid()) {
iface.call("setSystemFont", name);
@ -176,9 +176,9 @@ void Appearance::setFixedFontFamily(const QString &name)
if (name.isEmpty())
return;
QDBusInterface iface("org.cutefish.Settings",
QDBusInterface iface("com.cutefish.Settings",
"/Theme",
"org.cutefish.Theme",
"com.cutefish.Theme",
QDBusConnection::sessionBus(), this);
if (iface.isValid()) {
iface.call("setSystemFixedFont", name);
@ -194,9 +194,9 @@ void Appearance::setFontPointSize(int fontPointSize)
{
m_fontPointSize = fontPointSize;
QDBusInterface iface("org.cutefish.Settings",
QDBusInterface iface("com.cutefish.Settings",
"/Theme",
"org.cutefish.Theme",
"com.cutefish.Theme",
QDBusConnection::sessionBus(), this);
if (iface.isValid()) {
iface.call("setSystemFontPointSize", m_fontPointSize * 1.0);
@ -205,9 +205,9 @@ void Appearance::setFontPointSize(int fontPointSize)
void Appearance::setAccentColor(int accentColor)
{
QDBusInterface iface("org.cutefish.Settings",
QDBusInterface iface("com.cutefish.Settings",
"/Theme",
"org.cutefish.Theme",
"com.cutefish.Theme",
QDBusConnection::sessionBus(), this);
if (iface.isValid()) {
iface.call("setAccentColor", accentColor);
@ -221,9 +221,9 @@ double Appearance::devicePixelRatio() const
void Appearance::setDevicePixelRatio(double value)
{
QDBusInterface iface("org.cutefish.Settings",
QDBusInterface iface("com.cutefish.Settings",
"/Theme",
"org.cutefish.Theme",
"com.cutefish.Theme",
QDBusConnection::sessionBus(), this);
if (iface.isValid()) {
iface.call("setDevicePixelRatio", value);

4
src/application.cpp
Unescape Escape View File

@ -49,8 +49,8 @@ Application::Application(int &argc, char **argv)
const QString module = parser.value(moduleOption);
if (!QDBusConnection::sessionBus().registerService("org.cutefish.SettingsUI")) {
QDBusInterface iface("org.cutefish.SettingsUI", "/SettingsUI", "org.cutefish.SettingsUI", QDBusConnection::sessionBus());
if (!QDBusConnection::sessionBus().registerService("com.cutefish.SettingsUI")) {
QDBusInterface iface("com.cutefish.SettingsUI", "/SettingsUI", "com.cutefish.SettingsUI", QDBusConnection::sessionBus());
if (iface.isValid())
iface.call("switchToPage", module);
return;

4
src/background.cpp
Unescape Escape View File

@ -15,9 +15,9 @@ static QVariantList getBackgroundPaths()
Background::Background(QObject *parent)
: QObject(parent)
, m_interface("org.cutefish.Settings",
, m_interface("com.cutefish.Settings",
"/Theme",
"org.cutefish.Theme",
"com.cutefish.Theme",
QDBusConnection::sessionBus(), this)
{
if (m_interface.isValid()) {

10
src/battery.cpp
Unescape Escape View File

@ -24,9 +24,9 @@
#include <QDBusReply>
#include <QDebug>
static const QString s_sServer = "org.cutefish.Settings";
static const QString s_sServer = "com.cutefish.Settings";
static const QString s_sPath = "/PrimaryBattery";
static const QString s_sInterface = "org.cutefish.PrimaryBattery";
static const QString s_sInterface = "com.cutefish.PrimaryBattery";
//DBus Battery Info Structure
struct BatteryInfo {
@ -55,9 +55,9 @@ Battery::Battery(QObject *parent)
"/org/freedesktop/UPower",
"org.freedesktop.UPower",
QDBusConnection::systemBus())
, m_interface("org.cutefish.Settings",
, m_interface("com.cutefish.Settings",
"/PrimaryBattery",
"org.cutefish.PrimaryBattery",
"com.cutefish.PrimaryBattery",
QDBusConnection::sessionBus())
, m_available(false)
, m_onBattery(false)
@ -176,7 +176,7 @@ bool Battery::showPercent()
void Battery::setPercentEnabled(bool value)
{
QDBusInterface("org.cutefish.Statusbar", "/Statusbar").call("setBatteryPercentage", value);
QDBusInterface("com.cutefish.Statusbar", "/Statusbar").call("setBatteryPercentage", value);
}
QString Battery::udi() const

4
src/brightness.cpp
Unescape Escape View File

@ -23,9 +23,9 @@
Brightness::Brightness(QObject *parent)
: QObject(parent)
, m_dbusConnection(QDBusConnection::sessionBus())
, m_iface("org.cutefish.Settings",
, m_iface("com.cutefish.Settings",
"/Brightness",
"org.cutefish.Brightness", m_dbusConnection)
"com.cutefish.Brightness", m_dbusConnection)
, m_value(0)
, m_enabled(false)
{

2
src/org.cutefish.SettingsUI.xml → src/com.cutefish.SettingsUI.xml
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.cutefish.SettingsUI">
<interface name="com.cutefish.SettingsUI">
<method name="switchToPage">
<arg name="name" type="s" direction="in"/>
</method>

4
src/cursor/cursorthememodel.cpp
Unescape Escape View File

@ -98,9 +98,9 @@ void CursorThemeModel::setCurrentTheme(const QString &theme)
m_currentTheme = theme;
emit currentThemeChanged();
QDBusInterface interface("org.cutefish.Settings",
QDBusInterface interface("com.cutefish.Settings",
"/Theme",
"org.cutefish.Theme",
"com.cutefish.Theme",
QDBusConnection::sessionBus());
if (interface.isValid())
interface.asyncCall("setCursorTheme", m_currentTheme);

4
src/cursor/mouse.cpp
Unescape Escape View File

@ -22,9 +22,9 @@
Mouse::Mouse(QObject *parent)
: QObject(parent)
, m_interface("org.cutefish.Settings",
, m_interface("com.cutefish.Settings",
"/Mouse",
"org.cutefish.Mouse",
"com.cutefish.Mouse",
QDBusConnection::sessionBus())
{
if (m_interface.isValid()) {

4
src/fonts/fonts.cpp
Unescape Escape View File

@ -104,9 +104,9 @@ void Fonts::save()
m_settings.setValue("XftHintStyle", KXftConfig::toStr(m_hinting));
m_settings.sync();
QDBusInterface interface("org.cutefish.Settings",
QDBusInterface interface("com.cutefish.Settings",
"/Theme",
"org.cutefish.Theme",
"com.cutefish.Theme",
QDBusConnection::sessionBus());
if (interface.isValid())
interface.asyncCall("applyXResources");

4
src/language.cpp
Unescape Escape View File

@ -42,9 +42,9 @@ static const QMap<QString, QString> s_displayName = {{"zh_CN", "简体中文"},
Language::Language(QObject *parent)
: QObject(parent)
, m_interface("org.cutefish.Settings",
, m_interface("com.cutefish.Settings",
"/Language",
"org.cutefish.Language",
"com.cutefish.Language",
QDBusConnection::sessionBus())
, m_currentLanguage(-1)
{

4
src/powermanager.cpp
Unescape Escape View File

@ -22,8 +22,8 @@
PowerManager::PowerManager(QObject *parent)
: QObject(parent)
, m_iface("org.cutefish.PowerManager",
"/CPUManagement", "org.cutefish.CPUManagement",
, m_iface("com.cutefish.PowerManager",
"/CPUManagement", "com.cutefish.CPUManagement",
QDBusConnection::sessionBus())
, m_mode(-1)
{

Write Preview
Loading…
Cancel
Save