diff --git a/README.md b/README.md
index 402b11f..5518b3f 100644
--- 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.
## 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
index 8538d08..4f70b4c 100644
--- 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
index e6f92b2..a625b0b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,5 +12,5 @@
},
"version": "0.6.0",
"maintainer": "Tim Süberkrüb ",
- "framework" : "ubuntu-sdk-16.04"
+ "framework" : "ubuntu-sdk-20.04"
}
diff --git a/po/ar.po b/po/ar.po
index 684e05e..d9bc8a8 100644
--- 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
index e2b05c0..f2fbcb9 100644
--- 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
index ef0f750..5564ba8 100644
--- 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
index f564b18..985225b 100644
--- 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
index c2dcc91..125ed98 100644
--- 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
index 2d130f7..567ad72 100644
--- 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
index d513dcd..0f2ae59 100644
--- 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
index dea9729..f8b148f 100644
--- 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
index 26bb4f1..d9faafd 100644
--- 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
index 91b6aa8..10722c4 100644
--- 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
index 752653a..305df63 100644
--- 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
index e5fce01..18a3d5c 100644
--- 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
index df8e384..a844cf1 100644
--- 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
index cf35087..c4b2a96 100644
--- 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
index c814793..3187706 100644
--- 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
index dcb68e8..0e4c585 100644
--- 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
index ca63bf3..eb79efd 100644
--- 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
index 8b64d86..fa613d2 100644
--- 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
index 195264e..dc2de13 100644
--- 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
index 7e07b59..40f15c5 100644
--- 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
index 2bab2ce..98e8b20 100644
--- 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
index 1021647..df0fe19 100644
--- 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
index f9ab94e..61f2bbc 100644
--- 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
index 2289d68..d46e364 100644
--- 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()
diff --git a/qml/SelectIconDialog.qml b/qml/SelectIconDialog.qml
index a3a8d0e..5db98a4 100644
--- a/qml/SelectIconDialog.qml
+++ b/qml/SelectIconDialog.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
import Webber 1.0
AdaptiveDialog {
@@ -73,8 +73,8 @@ AdaptiveDialog {
readonly property bool isSelected: iconsView.currentIndex === index
readonly property bool isSVG: model.url.toLowerCase().endsWith(".svg")
- UUITK.UbuntuShape {
- id: ubuntuShape
+ LUITK.LomiriShape {
+ id: lomiriShape
anchors {
left: parent.left
@@ -86,7 +86,7 @@ AdaptiveDialog {
backgroundColor: "white"
width: Suru.units.gu(8)
height: Suru.units.gu(8)
- aspect: isSelected ? UUITK.UbuntuShape.Flat : UUITK.UbuntuShape.Inset
+ aspect: isSelected ? LUITK.LomiriShape.Flat : LUITK.LomiriShape.Inset
source: Image {
id: iconImage
@@ -105,7 +105,7 @@ AdaptiveDialog {
Rectangle {
anchors {
- top: ubuntuShape.bottom
+ top: lomiriShape.bottom
horizontalCenter: parent.horizontalCenter
topMargin: Suru.units.gu(1)
}
diff --git a/qml/StaticMainPageContent.qml b/qml/StaticMainPageContent.qml
index 56551da..ba9dbb8 100644
--- a/qml/StaticMainPageContent.qml
+++ b/qml/StaticMainPageContent.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
import "."
Item {
@@ -23,13 +23,13 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter
spacing: Suru.units.gu(2)
- UUITK.Icon {
+ LUITK.Icon {
width: Suru.units.gu(10)
height: Suru.units.gu(10)
name: "webbrowser-app-symbolic"
}
- UUITK.Icon {
+ LUITK.Icon {
width: Suru.units.gu(10)
height: Suru.units.gu(10)
name: "share"
diff --git a/qml/TutorialDialog.qml b/qml/TutorialDialog.qml
index d1eecd6..db8b67c 100644
--- a/qml/TutorialDialog.qml
+++ b/qml/TutorialDialog.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
import Webber 1.0
AdaptiveDialog {
@@ -42,7 +42,7 @@ AdaptiveDialog {
wrapMode: Text.WordWrap
}
- UUITK.UbuntuShape {
+ LUITK.LomiriShape {
width: Suru.units.dp(256)
height: Suru.units.dp(128)
backgroundColor: "white"
diff --git a/qml/WebberAnimation.qml b/qml/WebberAnimation.qml
index ecd977f..0138839 100644
--- a/qml/WebberAnimation.qml
+++ b/qml/WebberAnimation.qml
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtQuick.Controls.Suru 2.2
-import Ubuntu.Components 1.3 as UUITK
+import Lomiri.Components 1.3 as LUITK
Item {
id: item
diff --git a/src/click.rs b/src/click.rs
index 5060101..41de352 100644
--- a/src/click.rs
+++ b/src/click.rs
@@ -137,7 +137,7 @@ impl Package {
}
pub fn sanitize(&mut self) {
- // Remove leading (and trailing) whitespace (if any) because Ubuntu touch's
+ // Remove leading (and trailing) whitespace (if any) because Ubuntu Touch's
// app grid has problems displaying apps whose names include leading whitespace
self.name = self.name.trim().to_string();
}
@@ -281,7 +281,7 @@ impl ControlManifest {
Self {
architecture: "all".to_owned(),
description: "Shortcut".to_owned(),
- framework: "ubuntu-sdk-16.04".to_owned(),
+ framework: "ubuntu-sdk-20.04".to_owned(),
hooks,
maintainer: "Webber ".to_owned(),
name: format!("{}.webber", appname),
@@ -315,7 +315,7 @@ impl AppArmor {
Self {
template: "ubuntu-webapp".to_owned(),
policy_groups,
- policy_version: "16.04".to_owned(),
+ policy_version: "20.04".to_owned(),
}
}
@@ -409,8 +409,8 @@ Exec={}
Icon={}
Terminal=false
Type=Application
-X-Ubuntu-Touch=true
-X-Ubuntu-Splash-Color={}
+X-Lomiri-Touch=true
+X-Lomiri-Splash-Color={}
"#,
package.name, exec, icon_fname, package.theme_color
)
diff --git a/src/main.rs b/src/main.rs
index 8f05b96..269b9e0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -102,9 +102,7 @@ fn init_gettext() {
let domain = "webber.timsueberkrueb";
textdomain(domain).expect("Failed to setup gettext domain");
- let app_dir = env::var("APP_DIR").expect("Failed to read the APP_DIR environment variable");
-
- let mut app_dir_path = PathBuf::from(app_dir);
+ let mut app_dir_path = env::current_dir().expect("Failed to get the app working directory");
if !app_dir_path.is_absolute() {
app_dir_path = PathBuf::from("/usr");
}
diff --git a/webber.apparmor b/webber.apparmor
index 5f8fda1..b3d7601 100644
--- a/webber.apparmor
+++ b/webber.apparmor
@@ -6,5 +6,5 @@
"content_exchange_source",
"connectivity"
],
- "policy_version": 16.04
+ "policy_version": 20.04
}
diff --git a/webber.desktop b/webber.desktop
index 668ce9f..d1f5615 100644
--- a/webber.desktop
+++ b/webber.desktop
@@ -4,4 +4,4 @@ Exec=webber --disable-gpu --disable-viz-display-compositor %U
Icon=assets/icon.svg
Terminal=false
Type=Application
-X-Ubuntu-Touch=true
+X-Lomiri-Touch=true