diff --git a/CMakeLists.txt b/CMakeLists.txt index b735cb3..367289f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ set(RESOURCES ) qt5_add_dbus_adaptor(DBUS_SRCS - src/org.cutefish.Launcher.xml + src/com.cutefish.Launcher.xml src/launcher.h Launcher launcheradaptor diff --git a/qml/AllAppsView.qml b/qml/AllAppsView.qml index efd1405..78825ae 100644 --- a/qml/AllAppsView.qml +++ b/qml/AllAppsView.qml @@ -32,7 +32,7 @@ ListView { property var sourceModel: launcherModel property var modelCount: sourceModel.count - property int iconSize: 128 + FishUI.Units.largeSpacing * 2 + property int iconSize: root.iconSize + FishUI.Units.largeSpacing * 2 property int cellWidth: iconSize + calcExtraSpacing(iconSize, control.width) property int cellHeight: iconSize + calcExtraSpacing(iconSize, control.height) diff --git a/qml/main.qml b/qml/main.qml index c091e35..f72fad0 100755 --- a/qml/main.qml +++ b/qml/main.qml @@ -37,6 +37,7 @@ Item { property real verticalSpacing: launcher.screenRect.height * 0.01 property real maxSpacing: horizontalSpacing > verticalSpacing ? horizontalSpacing : verticalSpacing property bool showed: launcher.showed + property int iconSize: root.height < 960 ? 96 : 128 onShowedChanged: { if (showed) diff --git a/src/org.cutefish.Launcher.xml b/src/com.cutefish.Launcher.xml similarity index 84% rename from src/org.cutefish.Launcher.xml rename to src/com.cutefish.Launcher.xml index d831a56..1624aee 100644 --- a/src/org.cutefish.Launcher.xml +++ b/src/com.cutefish.Launcher.xml @@ -1,6 +1,6 @@ - + diff --git a/src/launcher.cpp b/src/launcher.cpp index a55a981..c4e7b11 100644 --- a/src/launcher.cpp +++ b/src/launcher.cpp @@ -32,9 +32,9 @@ Launcher::Launcher(bool firstShow, QQuickView *w) : QQuickView(w) - , m_dockInterface("org.cutefish.Dock", + , m_dockInterface("com.cutefish.Dock", "/Dock", - "org.cutefish.Dock", QDBusConnection::sessionBus()) + "com.cutefish.Dock", QDBusConnection::sessionBus()) , m_hideTimer(new QTimer) , m_showed(false) , m_leftMargin(0) @@ -66,7 +66,7 @@ Launcher::Launcher(bool firstShow, QQuickView *w) connect(&m_dockInterface, SIGNAL(primaryGeometryChanged()), this, SLOT(updateMargins())); connect(&m_dockInterface, SIGNAL(directionChanged()), this, SLOT(updateMargins())); } else { - QDBusServiceWatcher *watcher = new QDBusServiceWatcher("org.cutefish.Dock", + QDBusServiceWatcher *watcher = new QDBusServiceWatcher("com.cutefish.Dock", QDBusConnection::sessionBus(), QDBusServiceWatcher::WatchForUnregistration, this); @@ -131,9 +131,9 @@ bool Launcher::dockAvailable() bool Launcher::isPinedDock(const QString &desktop) { - QDBusInterface iface("org.cutefish.Dock", + QDBusInterface iface("com.cutefish.Dock", "/Dock", - "org.cutefish.Dock", + "com.cutefish.Dock", QDBusConnection::sessionBus()); if (!iface.isValid()) diff --git a/src/launchermodel.cpp b/src/launchermodel.cpp index b231982..2d700a6 100755 --- a/src/launchermodel.cpp +++ b/src/launchermodel.cpp @@ -156,9 +156,9 @@ void LauncherModel::sendToDock(const QString &key) int index = findById(key); if (index != -1) { - QDBusMessage message = QDBusMessage::createMethodCall("org.cutefish.Dock", + QDBusMessage message = QDBusMessage::createMethodCall("com.cutefish.Dock", "/Dock", - "org.cutefish.Dock", + "com.cutefish.Dock", "add"); message.setArguments(QList() << key); QDBusConnection::sessionBus().asyncCall(message); @@ -170,9 +170,9 @@ void LauncherModel::removeFromDock(const QString &desktop) int index = findById(desktop); if (index != -1) { - QDBusMessage message = QDBusMessage::createMethodCall("org.cutefish.Dock", + QDBusMessage message = QDBusMessage::createMethodCall("com.cutefish.Dock", "/Dock", - "org.cutefish.Dock", + "com.cutefish.Dock", "remove"); message.setArguments(QList() << desktop); QDBusConnection::sessionBus().asyncCall(message); diff --git a/src/main.cpp b/src/main.cpp index 46efc6f..67e9f3f 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,9 +34,9 @@ #include #include -#define DBUS_NAME "org.cutefish.Launcher" +#define DBUS_NAME "com.cutefish.Launcher" #define DBUS_PATH "/Launcher" -#define DBUS_INTERFACE "org.cutefish.Launcher" +#define DBUS_INTERFACE "com.cutefish.Launcher" int main(int argc, char *argv[]) {