Merge pull request #63 from JamiKettunen/focal

Build for Ubuntu Touch 20.04 Focal
timsueberkrueb · Feb 2, 2023 · 56f3676 · 56f3676
2 parents 27a8223 + 4b20691
commit 56f3676
Show file tree

Hide file tree

Showing 35 changed files with 64 additions and 65 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 # Webber
 
-Webber installs local shortcuts for webpages on Ubuntu touch.
+Webber installs local shortcuts for webpages on Ubuntu Touch.
 
 <a href="https://open-store.io/app/webber.timsueberkrueb"><img width="256" src="https://open-store.io/badges/en_US.svg" alt="OpenStore" /></a>
 
 ## Build using clickable
 
-Install [clickable](https://clickable-ut.dev), the build tool for Ubuntu touch apps.
+Install [clickable](https://clickable-ut.dev), the build tool for Ubuntu Touch apps.
 
 To build and start the application on your phone, run:
 

diff --git a/clickable.yaml b/clickable.yaml
@@ -2,6 +2,7 @@ clickable_minimum_required: 7.6.0
 
 builder: rust
 rust_channel: nightly-2022-11-22
+framework: ubuntu-sdk-20.04
 kill: webber
 
 dependencies_host:

diff --git a/manifest.json b/manifest.json
@@ -12,5 +12,5 @@
     },
     "version": "0.6.0",
     "maintainer": "Tim Süberkrüb <[email protected]>",
-    "framework" : "ubuntu-sdk-16.04"
+    "framework" : "ubuntu-sdk-20.04"
 }
diff --git a/po/ar.po b/po/ar.po
@@ -23,7 +23,7 @@ msgid "About"
 msgstr "حول"
 
 #: qml/AboutDialog.qml:100
-msgid "Webapp shortcut creator for Ubuntu touch"
+msgid "Webapp shortcut creator for Ubuntu Touch"
 msgstr "صانع اختصارات تطبيقات الإنترنت لأوبونتو توتش"
 
 #: qml/AboutDialog.qml:115

diff --git a/po/de.po b/po/de.po
@@ -23,7 +23,7 @@ msgid "About"
 msgstr "Über"
 
 #: qml/AboutDialog.qml:100
-msgid "Webapp shortcut creator for Ubuntu touch"
+msgid "Webapp shortcut creator for Ubuntu Touch"
 msgstr "Web-App Shortcut-Tool für Ubuntu Touch"
 
 #: qml/AboutDialog.qml:115

diff --git a/po/es.po b/po/es.po
@@ -23,8 +23,8 @@ msgid "About"
 msgstr "Acerca de"
 
 #: qml/AboutDialog.qml:100
-msgid "Webapp shortcut creator for Ubuntu touch"
-msgstr "Creador de atajos Webapp para Ubuntu touch"
+msgid "Webapp shortcut creator for Ubuntu Touch"
+msgstr "Creador de atajos Webapp para Ubuntu Touch"
 
 #: qml/AboutDialog.qml:115
 msgid "Rate"

diff --git a/po/fr.po b/po/fr.po
@@ -21,7 +21,7 @@ msgid "About"
 msgstr "À propos"
 
 #: qml/AboutDialog.qml:100
-msgid "Webapp shortcut creator for Ubuntu touch"
+msgid "Webapp shortcut creator for Ubuntu Touch"
 msgstr "Créateur de raccourcis vers des applications Web pour Ubuntu Touch"
 
 #: qml/AboutDialog.qml:115

diff --git a/po/it.po b/po/it.po
@@ -22,7 +22,7 @@ msgid "About"
 msgstr ""
 
 #: qml/AboutDialog.qml:100
-msgid "Webapp shortcut creator for Ubuntu touch"
+msgid "Webapp shortcut creator for Ubuntu Touch"
 msgstr ""
 
 #: qml/AboutDialog.qml:115

diff --git a/po/nl.po b/po/nl.po
@@ -23,7 +23,7 @@ msgid "About"
 msgstr "Over"
 
 #: qml/AboutDialog.qml:100
-msgid "Webapp shortcut creator for Ubuntu touch"
+msgid "Webapp shortcut creator for Ubuntu Touch"
 msgstr "Maak webapp-snelkoppelingen op Ubuntu Touch"
 
 #: qml/AboutDialog.qml:115

diff --git a/po/webber.pot b/po/webber.pot
@@ -22,7 +22,7 @@ msgid "About"
 msgstr ""
 
 #: qml/AboutDialog.qml:100
-msgid "Webapp shortcut creator for Ubuntu touch"
+msgid "Webapp shortcut creator for Ubuntu Touch"
 msgstr ""
 
 #: qml/AboutDialog.qml:115

diff --git a/qml/AboutDialog.qml b/qml/AboutDialog.qml
@@ -3,7 +3,7 @@ import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.8
 import QtQuick.Controls.Suru 2.2
 import QtGraphicalEffects 1.0
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
 import Webber 1.0
 import "."
 
@@ -97,7 +97,7 @@ AdaptiveDialog {
             }
 
             Label {
-                text: i18n.tr("Webapp shortcut creator for Ubuntu touch")
+                text: i18n.tr("Webapp shortcut creator for Ubuntu Touch")
                 horizontalAlignment: Text.AlignHCenter
                 width: parent.width
                 wrapMode: Text.WordWrap

diff --git a/qml/AdaptiveDialog.qml b/qml/AdaptiveDialog.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.8
 import QtQuick.Controls.Suru 2.2
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
 
 Dialog {
     id: dialog
@@ -40,7 +40,7 @@ Dialog {
 
             spacing: Suru.units.gu(1)
 
-            UUITK.Icon {
+            LUITK.Icon {
                 name: dialog.iconName
                 width: Suru.units.gu(4)
                 height: Suru.units.gu(4)

diff --git a/qml/AddPage.qml b/qml/AddPage.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.2
 import QtQuick.Controls.Suru 2.2
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
 import Webber 1.0
 import "."
 
@@ -25,7 +25,7 @@ Page {
                 onClicked: App.pop()
             }
 
-            UUITK.TextField {
+            LUITK.TextField {
                 id: urlField
 
                 property string previousText: ""
@@ -128,7 +128,7 @@ Page {
 
                             spacing: units.gu(1)
 
-                            UUITK.Icon {
+                            LUITK.Icon {
                                 name: optionalSettings.showing ? "up" : "down"
                                 width: units.gu(3)
                                 height: units.gu(3)

diff --git a/qml/ContentImport.qml b/qml/ContentImport.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import Ubuntu.Content 1.3
+import Lomiri.Content 1.3
 
 QtObject {
     id: contentImport

diff --git a/qml/CustomIconSelector.qml b/qml/CustomIconSelector.qml
@@ -2,8 +2,8 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.2
 import QtQuick.Controls.Suru 2.2
-import Ubuntu.Components 1.3 as UUITK
-import Ubuntu.Content 1.3
+import Lomiri.Components 1.3 as LUITK
+import Lomiri.Content 1.3
 
 Dialog {
     id: dialog

diff --git a/qml/EssentialSettings.qml b/qml/EssentialSettings.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.2
 import QtQuick.Controls.Suru 2.2
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
 
 Item {
     id: essentialSettings
@@ -96,7 +96,7 @@ Item {
                 text: i18n.tr("Name")
             }
 
-            UUITK.TextField {
+            LUITK.TextField {
                 id: nameField
                 Layout.fillWidth: true
                 placeholderText: i18n.tr("Web app name")

diff --git a/qml/HelpDialog.qml b/qml/HelpDialog.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.8
 import QtQuick.Controls.Suru 2.2
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
 
 AdaptiveDialog {
     id: dialog

diff --git a/qml/IconButton.qml b/qml/IconButton.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import QtQuick.Controls 2.0
 import QtQuick.Controls.Suru 2.2
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
 
 Button {
     property string iconName: ""
@@ -12,7 +12,7 @@ Button {
     implicitHeight: Suru.units.gu(4)
     flat: true
 
-    UUITK.Icon {
+    LUITK.Icon {
         anchors {
             fill: parent
             margins: Suru.units.gu(1)

diff --git a/qml/IconSelectItem.qml b/qml/IconSelectItem.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.2
 import QtQuick.Controls.Suru 2.2
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
 
 Column {
     id: iconSelectItem
@@ -23,11 +23,11 @@ Column {
         implicitWidth: Suru.units.gu(8)
         implicitHeight: Suru.units.gu(8)
 
-        UUITK.UbuntuShape {
+        LUITK.LomiriShape {
             anchors.fill: parent
 
             backgroundColor: iconImage.source == "" ? Suru.neutralColor : "white"
-            aspect: UUITK.UbuntuShape.Inset
+            aspect: LUITK.LomiriShape.Inset
 
             source: Image {
                 id: iconImage
@@ -37,7 +37,7 @@ Column {
                 source: iconSelectItem.source !== "" ? iconSelectItem.sourcePrefix + iconSelectItem.source : ""
             }
 
-            UUITK.Icon {
+            LUITK.Icon {
                 anchors.centerIn: parent
                 visible: placeholderIconName !== "" && iconImage.source == ""
                 name: placeholderIconName

diff --git a/qml/IconSelector.qml b/qml/IconSelector.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.2
 import QtQuick.Controls.Suru 2.2
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
 
 RowLayout {
     id: iconSelector

diff --git a/qml/IconWebView.qml b/qml/IconWebView.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 import QtQuick.Controls 2.0
 import QtQuick.Controls.Suru 2.2
 import QtWebEngine 1.3
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
 
 Item {
     id: item

diff --git a/qml/InstallDialog.qml b/qml/InstallDialog.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.2
 import QtQuick.Controls.Suru 2.2
-import Ubuntu.Content 1.3
+import Lomiri.Content 1.3
 import "."
 
 Dialog {

diff --git a/qml/KeyboardPlaceholder.qml b/qml/KeyboardPlaceholder.qml
@@ -1,7 +1,7 @@
 // Borrowed from Teleports, MessageListPage.qml
 
 import QtQuick 2.0
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 import QtQuick.Controls.Suru 2.2
 
 Item {

diff --git a/qml/MainPage.qml b/qml/MainPage.qml
@@ -3,7 +3,7 @@ import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.2
 import QtQuick.Controls.Suru 2.2
 import QtGraphicalEffects 1.0
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
 import Webber 1.0
 import "."
 
@@ -55,7 +55,7 @@ Page {
             margins: Suru.units.dp(32)
         }
 
-        contentItem: UUITK.Icon { name: "help" }
+        contentItem: LUITK.Icon { name: "help" }
         onClicked: tutorialDialog.open()
     }
 
@@ -66,7 +66,7 @@ Page {
             margins: Suru.units.dp(32)
         }
 
-        contentItem: UUITK.Icon { name: "info" }
+        contentItem: LUITK.Icon { name: "info" }
         onClicked: aboutDialog.open()
     }
 

diff --git a/qml/MiniBrowserBar.qml b/qml/MiniBrowserBar.qml
@@ -3,7 +3,7 @@ import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.0
 import QtQuick.Controls.Suru 2.2
 import QtWebEngine 1.3
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
 
 Item {
     id: item
@@ -49,7 +49,7 @@ Item {
             }
         }
 
-        UUITK.TextField {
+        LUITK.TextField {
             id: urlField
 
             property string previousText: ""

diff --git a/qml/MiniBrowserView.qml b/qml/MiniBrowserView.qml
@@ -3,7 +3,7 @@ import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.0
 import QtQuick.Controls.Suru 2.2
 import QtWebEngine 1.3
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
 
 WebEngineView {
     id: webview

diff --git a/qml/OptionalSettings.qml b/qml/OptionalSettings.qml
@@ -2,7 +2,7 @@ import QtQuick 2.6
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.2
 import QtQuick.Controls.Suru 2.2
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
 import "."
 
 Item {
@@ -67,7 +67,7 @@ Item {
                     color: colorField.text
                 }
 
-                UUITK.TextField {
+                LUITK.TextField {
                     id: colorField
                     Layout.fillWidth: true
                     text: "#ffffff"
@@ -208,7 +208,7 @@ and copy it into the text field below.")
                 width: parent.width
                 implicitHeight: customUAField.implicitHeight
 
-                UUITK.TextField {
+                LUITK.TextField {
                     id: customUAField
                     placeholderText: i18n.tr("Custom User-Agent header")
                     enabled: radioCustomUA.checked
@@ -274,7 +274,7 @@ and copy it into the text field below.")
                 RowLayout {
                     anchors.fill: parent
 
-                    UUITK.TextField {
+                    LUITK.TextField {
                         Layout.fillWidth: true
 
                         signal editingFinished()