Change patch /usr/share/lipstick-glacier-home-qt6 -> /usr/share/glacier-

home
nemomobile-ux · Jul 16, 2024 · 59d91ea · 59d91ea
1 parent 19ab4ec
commit 59d91ea
Show file tree

Hide file tree

Showing 22 changed files with 42 additions and 42 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,7 +48,7 @@ if(USE_SYSTEMD)
 endif()
 
 install(FILES data/nemovars.conf
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/lipstick-glacier-home-qt6)
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/glacier-home)
 install(FILES
     data/90-glacier-powerkey.conf
     data/90-glacier-devlock.conf
@@ -61,6 +61,6 @@ add_custom_target(translations DEPENDS ${QM_FILES})
 add_dependencies(lipstick translations)
 
 install(FILES ${QM_FILES}
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/lipstick-glacier-home-qt6/translations)
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/glacier-home/translations)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -61,6 +61,6 @@ target_link_libraries(lipstick PUBLIC
 install(TARGETS lipstick RUNTIME
     DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(DIRECTORY qml
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/lipstick-glacier-home-qt6)
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/glacier-home)
 install(FILES ${PUBLIC_HEADERS}
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glacier-home)
diff --git a/src/main.cpp b/src/main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char** argv)
     HomeApplication app(argc, argv, QString());
 
     QTranslator* myappTranslator = new QTranslator(&app);
-    if (myappTranslator->load(QLocale(), QLatin1String("glacier-home"), QLatin1String("_"), QLatin1String("/usr/share/lipstick-glacier-home-qt6/translations/"))) {
+    if (myappTranslator->load(QLocale(), QLatin1String("glacier-home"), QLatin1String("_"), QLatin1String("/usr/share/glacier-home/translations/"))) {
         qCDebug(lcGlacierHomeCoreLog) << "translation.load() success" << QLocale::system().name();
         if (app.installTranslator(myappTranslator)) {
             qCDebug(lcGlacierHomeCoreLog) << "installTranslator() success" << QLocale::system().name();
@@ -62,7 +62,7 @@ int main(int argc, char** argv)
         qCDebug(lcGlacierHomeCoreLog) << "translation.load() failed" << QLocale::system().name();
     }
 
-    QmlPath::append("/usr/share/lipstick-glacier-home-qt6/qml");
+    QmlPath::append("/usr/share/glacier-home/qml");
     QGuiApplication::setFont(QFont("Open Sans"));
 
     FileUtils* fileUtils = new FileUtils();
@@ -108,8 +108,8 @@ int main(int argc, char** argv)
     app.engine()->rootContext()->setContextProperty("usegeoclue2", false);
 #endif
 
-    app.setCompositorPath("/usr/share/lipstick-glacier-home-qt6/qml/GlacierCompositor.qml");
-    app.setQmlPath("/usr/share/lipstick-glacier-home-qt6/qml/MainScreen.qml");
+    app.setCompositorPath("/usr/share/glacier-home/qml/GlacierCompositor.qml");
+    app.setQmlPath("/usr/share/glacier-home/qml/MainScreen.qml");
 
     // Give these to the environment inside the lipstick homescreen
     // Fixes a bug where some applications wouldn't launch, eg. terminal or browser

diff --git a/src/models/controlcenterbuttonsmodel.cpp b/src/models/controlcenterbuttonsmodel.cpp
@@ -73,11 +73,11 @@ QVariant ControlCenterButtonsModel::data(const QModelIndex& index, int role) con
 QStringList ControlCenterButtonsModel::allButtons()
 {
     /*
-     * All button must be here /usr/share/lipstick-glacier-home-qt6/qml/feedspage/
+     * All button must be here /usr/share/glacier-home/qml/feedspage/
      * and name must be <SomeThing>ControlButton.qml
      */
     QStringList allButtons;
-    QDir directory("/usr/share/lipstick-glacier-home-qt6/qml/feedspage/");
+    QDir directory("/usr/share/glacier-home/qml/feedspage/");
     QStringList controlButtons = directory.entryList(QStringList() << "*?ControlButton.qml", QDir::Files);
     foreach (QString filename, controlButtons) {
         allButtons << filename.remove(".qml");

diff --git a/src/qml/AppLauncher.qml b/src/qml/AppLauncher.qml
@@ -198,7 +198,7 @@ Flickable{
                         if(modelData) {
                             launcherItem.iconCaption.text = modelData.object.title
                             launcherItem.isFolder = modelData.object.type == LauncherModel.Folder
-                            launcherItem.source = modelData.object.iconId == "" ? "/usr/share/lipstick-glacier-home-qt6/qml/theme/default-icon.png" : (modelData.object.iconId.indexOf("/") == 0 ? "file://" : "image://theme/") + modelData.object.iconId
+                            launcherItem.source = modelData.object.iconId == "" ? "/usr/share/glacier-home/qml/theme/default-icon.png" : (modelData.object.iconId.indexOf("/") == 0 ? "file://" : "image://theme/") + modelData.object.iconId
                         }
                     }
                 }

diff --git a/src/qml/Lockscreen.qml b/src/qml/Lockscreen.qml
@@ -59,7 +59,7 @@ Image {
     ConfigurationValue{
         id: lockScreenWallpaper
         key: (differentWallpaper.value == true) ? "/home/glacier/lockScreen/wallpaperImage" : "/home/glacier/homeScreen/wallpaperImage"
-        defaultValue: "/usr/share/lipstick-glacier-home-qt6/qml/images/graphics-wallpaper-home.jpg"
+        defaultValue: "/usr/share/glacier-home/qml/images/graphics-wallpaper-home.jpg"
     }
 
     ConfigurationValue{

diff --git a/src/qml/applauncher/FolderView.qml b/src/qml/applauncher/FolderView.qml
@@ -140,7 +140,7 @@ Item{
                 width: folderGridView.cellWidth
                 height: folderGridView.cellHeight
                 isFolder: model.object.type == LauncherModel.Folder
-                source: model.object.iconId == "" || isFolder ? "/usr/share/lipstick-glacier-home-qt6/qml/theme/default-icon.png" : (model.object.iconId.indexOf("/") == 0 ? "file://" : "image://theme/") + model.object.iconId
+                source: model.object.iconId == "" || isFolder ? "/usr/share/glacier-home/qml/theme/default-icon.png" : (model.object.iconId.indexOf("/") == 0 ? "file://" : "image://theme/") + model.object.iconId
                 iconCaption.text: model.object.title
                 iconCaption.color: Theme.textColor
                 folderModel:folderGridView.model

diff --git a/src/qml/applauncher/LauncherItemDelegate.qml b/src/qml/applauncher/LauncherItemDelegate.qml
@@ -82,7 +82,7 @@ Item {
                 asynchronous: true
                 onStatusChanged: {
                     if (iconImage.status == Image.Error) {
-                        iconImage.source = "/usr/share/lipstick-glacier-home-qt6/qml/theme/default-icon.png"
+                        iconImage.source = "/usr/share/glacier-home/qml/theme/default-icon.png"
                     }
                 }
             }

diff --git a/src/qml/applauncher/LauncherItemFolder.qml b/src/qml/applauncher/LauncherItemFolder.qml
@@ -116,7 +116,7 @@ Item {
 
                             onStatusChanged: {
                                 if (iconImage.status == Image.Error) {
-                                    iconImage.source = "/usr/share/lipstick-glacier-home-qt6/qml/theme/default-icon.png"
+                                    iconImage.source = "/usr/share/glacier-home/qml/theme/default-icon.png"
                                 }
                             }
                         }

diff --git a/src/qml/applauncher/SearchListView.qml b/src/qml/applauncher/SearchListView.qml
@@ -351,7 +351,7 @@ Item {
                         }
                     }
                 } else {
-                    return "/usr/share/lipstick-glacier-home-qt6/qml/theme/default-icon.png"
+                    return "/usr/share/glacier-home/qml/theme/default-icon.png"
                 }
             }
 
@@ -370,7 +370,7 @@ Item {
                 anchors.leftMargin: Theme.itemSpacingLarge
                 onStatusChanged: {
                     if (iconImage.status == Image.Error) {
-                        iconImage.source = "/usr/share/lipstick-glacier-home-qt6/qml/theme/default-icon.png"
+                        iconImage.source = "/usr/share/glacier-home/qml/theme/default-icon.png"
                     }
                 }
             }

diff --git a/src/qml/appswitcher/CloseButton.qml b/src/qml/appswitcher/CloseButton.qml
@@ -28,7 +28,7 @@ Image {
     id: closeButton
     signal clicked()
 
-    source: '/usr/share/lipstick-glacier-home-qt6/qml/images/closeapp.svg'
+    source: '/usr/share/glacier-home/qml/images/closeapp.svg'
     sourceSize.width: width
     sourceSize.height: height
 

diff --git a/src/qml/feedspage/CellularDataControlButton.qml b/src/qml/feedspage/CellularDataControlButton.qml
@@ -26,7 +26,7 @@ import Nemo.Connectivity
 ControlButton{
     id: cellularDataControlButton
 
-    image: cellularRegistration.status ? "image://theme/exchange-alt" :"/usr/share/lipstick-glacier-home-qt6/qml/theme/nosim.png"
+    image: cellularRegistration.status ? "image://theme/exchange-alt" :"/usr/share/glacier-home/qml/theme/nosim.png"
     assignedSettingsPage: "mobile"
     activated: cellularNetworkTechnology.connected
 

diff --git a/src/qml/feedspage/ControlCenter.qml b/src/qml/feedspage/ControlCenter.qml
@@ -74,7 +74,7 @@ Item{
             id: buttonRepeater
             model: controlCenterButtonModel
             delegate: Loader{
-                source: "/usr/share/lipstick-glacier-home-qt6/qml/feedspage/"+path+".qml"
+                source: "/usr/share/glacier-home/qml/feedspage/"+path+".qml"
             }
         }
     }

diff --git a/src/qml/mainscreen/Wallpaper.qml b/src/qml/mainscreen/Wallpaper.qml
@@ -45,7 +45,7 @@ Item {
     ConfigurationValue {
         id: wallpaperSource
         key: "/home/glacier/homeScreen/wallpaperImage"
-        defaultValue: "/usr/share/lipstick-glacier-home-qt6/qml/images/wallpaper-portrait-bubbles.png"
+        defaultValue: "/usr/share/glacier-home/qml/images/wallpaper-portrait-bubbles.png"
     }
 
     Image {

diff --git a/src/qml/notifications/NofiticationImage.js b/src/qml/notifications/NofiticationImage.js
@@ -1,6 +1,6 @@
 .pragma library
 
-var defaultIcon = "/usr/share/lipstick-glacier-home-qt6/qml/images/glacier.svg"
+var defaultIcon = "/usr/share/glacier-home/qml/images/glacier.svg"
 
 function iconAlias(icon) {
 

diff --git a/src/qml/statusbar/BatteryIndicator.qml b/src/qml/statusbar/BatteryIndicator.qml
@@ -71,13 +71,13 @@ StatusbarItem {
         id: batteryStatus
     }
 
-    source: "/usr/share/lipstick-glacier-home-qt6/qml/theme/battery"+chargeValue+".png"
+    source: "/usr/share/glacier-home/qml/theme/battery"+chargeValue+".png"
 
     NemoIcon {
         width: parent.width
         height: parent.height
         anchors.centerIn: parent
-        source: "/usr/share/lipstick-glacier-home-qt6/qml/theme/battery_grid.png"
+        source: "/usr/share/glacier-home/qml/theme/battery_grid.png"
 
         color: if(batteryStatus.status === MceBatteryStatus.Ok) {
                    Theme.textColor

diff --git a/src/qml/statusbar/BluetoothIndicator.qml b/src/qml/statusbar/BluetoothIndicator.qml
@@ -36,7 +36,7 @@ StatusbarItem {
     id: bluetoothIndicator
     iconSize:       parent.height * 0.671875
     iconSizeHeight: parent.height
-    source: "/usr/share/lipstick-glacier-home-qt6/qml/theme/icon_bluetooth.png"
+    source: "/usr/share/glacier-home/qml/theme/icon_bluetooth.png"
     visible: bluetoothTechnology.powered
 
     transparent: true

diff --git a/src/qml/statusbar/DataStatusItem.qml b/src/qml/statusbar/DataStatusItem.qml
@@ -39,7 +39,7 @@ StatusbarItem{
     iconSize: statusbarRight.height
     visible: false
     transparent: !cellularNetworkTechnology.connected
-    source: "/usr/share/lipstick-glacier-home-qt6/qml/theme/data_unknown.png"
+    source: "/usr/share/glacier-home/qml/theme/data_unknown.png"
 
     OfonoManager {
         id: manager
@@ -64,15 +64,15 @@ StatusbarItem{
 
     function formatValue() {
         if(cellularDataTechnology.technology == "2" || cellularDataTechnology.technology == "gsm") {
-            dataStatus.source = "/usr/share/lipstick-glacier-home-qt6/qml/theme/data_gprs.png"
+            dataStatus.source = "/usr/share/glacier-home/qml/theme/data_gprs.png"
         }else if(cellularDataTechnology.technology == "2.5" || cellularDataTechnology.technology == "gprs") {
-            dataStatus.source = "/usr/share/lipstick-glacier-home-qt6/qml/theme/data_egprs.png"
+            dataStatus.source = "/usr/share/glacier-home/qml/theme/data_egprs.png"
         }else if(cellularDataTechnology.technology == "3" || cellularDataTechnology.technology == "umts") {
-            dataStatus.source = "/usr/share/lipstick-glacier-home-qt6/qml/theme/data_utms.png"
+            dataStatus.source = "/usr/share/glacier-home/qml/theme/data_utms.png"
         }else if(cellularDataTechnology.technology == "3.5" || cellularDataTechnology.technology == "hspa") {
-            dataStatus.source = "/usr/share/lipstick-glacier-home-qt6/qml/theme/data_hspa.png"
+            dataStatus.source = "/usr/share/glacier-home/qml/theme/data_hspa.png"
         }else if(cellularDataTechnology.technology == "4" || cellularDataTechnology.technology == "lte") {
-            dataStatus.source = "/usr/share/lipstick-glacier-home-qt6/qml/theme/data_lte.png"
+            dataStatus.source = "/usr/share/glacier-home/qml/theme/data_lte.png"
         }
 
         if(cellularDataTechnology.technology == "unknown" || cellularDataTechnology.technology == "") {

diff --git a/src/qml/statusbar/LocationIndicator.qml b/src/qml/statusbar/LocationIndicator.qml
@@ -41,7 +41,7 @@ StatusbarItem {
     visible: loactionLevel.value != 0
     transparent: (usegeoclue2) ? !geoAgent.inUse : false
 
-    source: "/usr/share/lipstick-glacier-home-qt6/qml/theme/icon_gps.png"
+    source: "/usr/share/glacier-home/qml/theme/icon_gps.png"
 
     ConfigurationValue {
         id: loactionLevel

diff --git a/src/qml/statusbar/NfcIndicator.qml b/src/qml/statusbar/NfcIndicator.qml
@@ -27,7 +27,7 @@ StatusbarItem {
     id: nfcIndicator
     iconSize:       parent.height * 0.671875
     iconSizeHeight: parent.height
-    source: "/usr/share/lipstick-glacier-home-qt6/qml/theme/icon_nfc.png"
+    source: "/usr/share/glacier-home/qml/theme/icon_nfc.png"
     visible: nfcSettings.enabled
 
     NfcSettings{

diff --git a/src/qml/statusbar/SimIndicator.qml b/src/qml/statusbar/SimIndicator.qml
@@ -80,7 +80,7 @@ Row {
             width: simIndicator.height
             height: simIndicator.height
 
-            source: "/usr/share/lipstick-glacier-home-qt6/qml/theme/nosim.png"
+            source: "/usr/share/glacier-home/qml/theme/nosim.png"
             iconSize:       simIndicator.height
             iconSizeHeight: simIndicator.height
 
@@ -100,13 +100,13 @@ Row {
             function recalcIcon() {
                 // TODO FIXUP enabling/Disabling
                 /*if(!model.enabled) {
-                    cellStatus.source = "/usr/share/lipstick-glacier-home-qt6/qml/theme/disabled-sim.png"
+                    cellStatus.source = "/usr/share/glacier-home/qml/theme/disabled-sim.png"
                 } else */if(!cellularRegistrationStatus.status) {
-                    cellStatus.source = "/usr/share/lipstick-glacier-home-qt6/qml/theme/nosim.png"
+                    cellStatus.source = "/usr/share/glacier-home/qml/theme/nosim.png"
                 } else if(cellularRegistrationStatus.strength > 20){
-                    cellStatus.source = "/usr/share/lipstick-glacier-home-qt6/qml/theme/icon_signal_" + Math.ceil(cellularRegistrationStatus.strength/20) + ".png"
+                    cellStatus.source = "/usr/share/glacier-home/qml/theme/icon_signal_" + Math.ceil(cellularRegistrationStatus.strength/20) + ".png"
                 } else {
-                    cellStatus.source = "/usr/share/lipstick-glacier-home-qt6/qml/theme/icon_signal_0.png"
+                    cellStatus.source = "/usr/share/glacier-home/qml/theme/icon_signal_0.png"
                 }
             }
         }

diff --git a/src/qml/statusbar/WifiIndicator.qml b/src/qml/statusbar/WifiIndicator.qml
@@ -39,15 +39,15 @@ StatusbarItem {
     source: {
         if (wlan.connected) {
             if (networkManager.defaultRoute.strength >= 59) {
-                return "/usr/share/lipstick-glacier-home-qt6/qml/theme/icon_wifi_4.png"
+                return "/usr/share/glacier-home/qml/theme/icon_wifi_4.png"
             } else if (networkManager.defaultRoute.strength >= 55) {
-                return "/usr/share/lipstick-glacier-home-qt6/qml/theme/icon_wifi_3.png"
+                return "/usr/share/glacier-home/qml/theme/icon_wifi_3.png"
             } else if (networkManager.defaultRoute.strength >= 50) {
-                return "/usr/share/lipstick-glacier-home-qt6/qml/theme/icon_wifi_2.png"
+                return "/usr/share/glacier-home/qml/theme/icon_wifi_2.png"
             } else if (networkManager.defaultRoute.strength >= 40) {
-                return "/usr/share/lipstick-glacier-home-qt6/qml/theme/icon_wifi_1.png"
+                return "/usr/share/glacier-home/qml/theme/icon_wifi_1.png"
             } else {
-                return "/usr/share/lipstick-glacier-home-qt6/qml/theme/icon_wifi_0.png"
+                return "/usr/share/glacier-home/qml/theme/icon_wifi_0.png"
             }
         }
         return "image://theme/icon_wifi_touch"