Merge pull request #162 from milikhin/ut-focal

Add support for UT 20.04
milikhin · Jan 6, 2023 · ae8494b · ae8494b
2 parents 47207cc + f35b9ca
commit ae8494b
Show file tree

Hide file tree

Showing 20 changed files with 100 additions and 81 deletions.
diff --git a/clickable.json b/clickable.json
@@ -1,9 +1,11 @@
 {
-  "clickable_minimum_required": "6.12.2",
   "build_dir": "./build_ubports",
   "builder": "pure-qml-cmake",
+  "clickable_minimum_required": "7.9.0",
+  "framework": "ubuntu-sdk-20.04",
+  "ignore_review_warnings": true,
   "kill": "qmlscene",
   "prebuild": "git submodule update --init && npm ci && npm run build -- --config-name=ubports",
-  "src_dir": "./ubports-seabass",
-  "ignore_review_warnings": true
+  "skip_review": true,
+  "src_dir": "./ubports-seabass"
 }
diff --git a/harbour-seabass/harbour-seabass.desktop b/harbour-seabass/harbour-seabass.desktop
@@ -12,6 +12,7 @@ Name=Seabass
 Name[de]=Seabass
 
 [X-Sailjail]
+#Sandboxing=Disabled
 Permissions=UserDirs;RemovableMedia
 OrganizationName=name.milikhin
 ApplicationName=Seabass
diff --git a/ubports-seabass/html/index.html b/ubports-seabass/html/index.html
@@ -24,30 +24,23 @@
 <body>
   <div id="welcome">
     <h1>
-      Seabass2 v2.0.0-rc.1
+      Seabass2 v2.0.0
     </h1>
     <h2>
       Features:
     </h2>
     <ul>
       <li>Syntax highlighting for over 100 programming/markup languages</li>
       <li>Context menu to create/rename/delete files</li>
-      <li>Create and Build QML, C++, Python and HTML projects using Clickable (see Settings page for details)</li>
-      <li>Automatically install and launch built projects</li>
       <li>Read indentation preferences from <a href="https://editorconfig.org/">.editorconfig files</a></li>
       <li>Open files with the Seabass using the File Manager application</li>
     </ul>
     <h2>
-      New:
+      Release notes:
     </h2>
     <ul>
-      <li>add support for future Ubuntu Touch releases starting with OTA-24</li>
-      <li>new editor engine: Codemirror v6</li>
-      <li>
-        changes to the list of supported programming languages
-        (notably, QML is no longer supported), autocomplete options and code snippets
-      </li>
-      <li>find/replace feature temporary disabled</li>
+      <li>Add support for Ubuntu Touch 20.04</li>
+      <li>Creating and building projects are temporary disabled (20.04 doesn't support Libertine yet)</li>
     </ul>
   </div>
   <div id="root"></div>

diff --git a/ubports-seabass/manifest.json.in b/ubports-seabass/manifest.json.in
@@ -10,7 +10,7 @@
             "content-hub": "content-hub.json"
         }
     },
-    "version": "2.0.0-rc.1",
+    "version": "2.0.0",
     "maintainer": "Mikhael Milikhin <[email protected]>",
-    "framework" : "ubuntu-sdk-16.04.5"
+    "framework" : "ubuntu-sdk-20.04"
 }
diff --git a/ubports-seabass/po/seabass2.mikhael.pot b/ubports-seabass/po/seabass2.mikhael.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seabass2.mikhael\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-10 06:46+0000\n"
+"POT-Creation-Date: 2023-01-06 07:05+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../qml/About.qml:22 ../qml/components/Header.qml:93
+#: ../qml/About.qml:22 ../qml/components/Header.qml:94
 msgid "About"
 msgstr ""
 
@@ -35,23 +35,23 @@ msgstr ""
 msgid "Seabass2"
 msgstr ""
 
-#: ../qml/Main.qml:236
+#: ../qml/Main.qml:241
 msgid "Creating a project failed. See build output for details"
 msgstr ""
 
-#: ../qml/Main.qml:281
+#: ../qml/Main.qml:288
 msgid "Creating a Libertine container failed. See build output for details"
 msgstr ""
 
-#: ../qml/Main.qml:291
+#: ../qml/Main.qml:298
 msgid "Update failed. See build output for details"
 msgstr ""
 
-#: ../qml/Main.qml:305
+#: ../qml/Main.qml:312
 msgid "Build (%1) failed. See build output for details"
 msgstr ""
 
-#: ../qml/Main.qml:315
+#: ../qml/Main.qml:322
 msgid "Build and run (%1) failed. See build output for details"
 msgstr ""
 
@@ -122,107 +122,107 @@ msgstr ""
 msgid "Create project"
 msgstr ""
 
-#: ../qml/Settings.qml:19
+#: ../qml/Settings.qml:20
 msgid "ready"
 msgstr ""
 
-#: ../qml/Settings.qml:20
+#: ../qml/Settings.qml:21
 msgid "busy..."
 msgstr ""
 
-#: ../qml/Settings.qml:21
+#: ../qml/Settings.qml:22
 msgid "not exists"
 msgstr ""
 
-#: ../qml/Settings.qml:32 ../qml/components/Header.qml:88
+#: ../qml/Settings.qml:33 ../qml/components/Header.qml:89
 msgid "Settings"
 msgstr ""
 
-#: ../qml/Settings.qml:54
+#: ../qml/Settings.qml:55
 msgid "User interface"
 msgstr ""
 
-#: ../qml/Settings.qml:67
+#: ../qml/Settings.qml:68
 msgid "Theme:"
 msgstr ""
 
-#: ../qml/Settings.qml:75
+#: ../qml/Settings.qml:76
 msgid "System"
 msgstr ""
 
-#: ../qml/Settings.qml:102
+#: ../qml/Settings.qml:103
 msgid "Font size, CSS px:"
 msgstr ""
 
-#: ../qml/Settings.qml:131
+#: ../qml/Settings.qml:132
 msgid "Soft wrap:"
 msgstr ""
 
-#: ../qml/Settings.qml:151
+#: ../qml/Settings.qml:152
 msgid "Restore previous session at startup:"
 msgstr ""
 
-#: ../qml/Settings.qml:177
+#: ../qml/Settings.qml:179
 msgid "Build container"
 msgstr ""
 
-#: ../qml/Settings.qml:194
+#: ../qml/Settings.qml:197
 msgid "You can use the Seabass to build projects with Clickable."
 msgstr ""
 
-#: ../qml/Settings.qml:202
+#: ../qml/Settings.qml:205
 msgid ""
 "In order to execute Clickable, Seabass requires a special Libertine "
 "container to be created first. Once the container is created you can update "
 "it here and manage it as usual using `libertine-container-manager` "
 "(container ID is `seabass2-build`) or via the System Settings."
 msgstr ""
 
-#: ../qml/Settings.qml:212
+#: ../qml/Settings.qml:215
 msgid ""
 "Should anything goes wrong with the container you can delete and recreate it "
 "once again."
 msgstr ""
 
-#: ../qml/Settings.qml:233
+#: ../qml/Settings.qml:237
 msgid "Notes:"
 msgstr ""
 
-#: ../qml/Settings.qml:243
+#: ../qml/Settings.qml:247
 msgid ""
 "• To build a project you need to open a corresponding clickable "
 "configuration file and click the 'Build' button:"
 msgstr ""
 
-#: ../qml/Settings.qml:260
+#: ../qml/Settings.qml:264
 msgid ""
 "• Project files should be located inside ~/Downloads or ~/Documents "
 "directories. These directories are automatically mounted into Libertine "
 "containers. Alternatively you can create additional bind mounts manually."
 msgstr ""
 
-#: ../qml/Settings.qml:270
+#: ../qml/Settings.qml:274
 msgid ""
 "• clickable config file should be named 'clickable.json' or 'clickable.yaml'."
 msgstr ""
 
-#: ../qml/Settings.qml:286
+#: ../qml/Settings.qml:291
 msgid "Container status:"
 msgstr ""
 
-#: ../qml/Settings.qml:308
+#: ../qml/Settings.qml:314
 msgid "Create build container"
 msgstr ""
 
-#: ../qml/Settings.qml:317
+#: ../qml/Settings.qml:323
 msgid "Update build container"
 msgstr ""
 
-#: ../qml/components/Builder.qml:28
+#: ../qml/components/Builder.qml:29
 msgid "Creating build container"
 msgstr ""
 
-#: ../qml/components/Builder.qml:94
+#: ../qml/components/Builder.qml:99
 msgid ""
 "A Libertine container is going to be created in order to execute build "
 "commands. The process might take a while, but you can continue using the "
@@ -249,29 +249,29 @@ msgid "Error occured"
 msgstr ""
 
 #: ../qml/components/ErrorDialog.qml:22 ../qml/components/SaveDialog.qml:34
-#: ../qml/components/files/Header.qml:46
+#: ../qml/components/files/Header.qml:48
 msgid "Close"
 msgstr ""
 
-#: ../qml/components/FileList.qml:75
+#: ../qml/components/FileList.qml:76
 msgid "Delete file?"
 msgstr ""
 
-#: ../qml/components/FileList.qml:77
+#: ../qml/components/FileList.qml:78
 #: ../qml/components/files/DirectoryMenu.qml:27
 #: ../qml/components/files/FileMenu.qml:21
 msgid "Delete"
 msgstr ""
 
-#: ../qml/components/FileList.qml:113
+#: ../qml/components/FileList.qml:115
 msgid "Files"
 msgstr ""
 
-#: ../qml/components/FileList.qml:256
+#: ../qml/components/FileList.qml:258
 msgid "%1 will be deleted"
 msgstr ""
 
-#: ../qml/components/Header.qml:82
+#: ../qml/components/Header.qml:83
 msgid "Keyboard extension"
 msgstr ""
 
@@ -306,7 +306,7 @@ msgstr ""
 
 #: ../qml/components/files/DirectoryMenu.qml:17
 #: ../qml/components/files/DotDotMenu.qml:15
-#: ../qml/components/files/Header.qml:26
+#: ../qml/components/files/Header.qml:27
 msgid "New file..."
 msgstr ""
 
@@ -315,15 +315,15 @@ msgstr ""
 msgid "Rename..."
 msgstr ""
 
-#: ../qml/components/files/Header.qml:31
+#: ../qml/components/files/Header.qml:32
 msgid "New project..."
 msgstr ""
 
-#: ../qml/components/files/Header.qml:36
+#: ../qml/components/files/Header.qml:38
 msgid "Tree mode"
 msgstr ""
 
-#: ../qml/components/files/Header.qml:41
+#: ../qml/components/files/Header.qml:43
 msgid "Reload"
 msgstr ""
 

diff --git a/ubports-seabass/qml/Main.qml b/ubports-seabass/qml/Main.qml
@@ -7,7 +7,7 @@ import Qt.labs.platform 1.0
 import Qt.labs.settings 1.0
 import QtWebSockets 1.0
 
-import Ubuntu.Components.Themes 1.3
+import Lomiri.Components.Themes 1.3
 
 import "./components" as CustomComponents
 import "./generic" as GenericComponents
@@ -27,7 +27,9 @@ ApplicationWindow {
   readonly property bool isWide: width >= Suru.units.gu(100)
   readonly property string defaultTitle: i18n.tr("Welcome")
   readonly property string defaultSubTitle: i18n.tr("Seabass2")
-  readonly property string version: "2.0.0-rc.1"
+  readonly property string version: "2.0.0"
+  readonly property bool isLibertineEnabled: false
+
   property bool hasBuildContainer: false
   property int activeTheme: parseInt(settings.theme)
   property var currentTab: tabBar.currentIndex === -1
@@ -130,6 +132,7 @@ ApplicationWindow {
 
   CustomComponents.Builder {
     id: builder
+    disabled: !isLibertineEnabled
 
     onStarted: {
       const existingTabIndex = tabsModel.openTerminal(builder.tabId, builder.title, builder.subTitle)
@@ -200,6 +203,8 @@ ApplicationWindow {
           homeDir: api.homeDir
           onClosed: navBar.visible = false
           isPage: !isWide
+          isLibertineEnabled: root.isLibertineEnabled
+
           Layout.fillWidth: true
           Layout.fillHeight: true
 
@@ -258,6 +263,7 @@ ApplicationWindow {
           id: header
           title: currentTab ? currentTab.uniqueTitle : defaultTitle
           subtitle: currentTab ? currentTab.subTitle : defaultSubTitle
+          isLibertineEnabled: root.isLibertineEnabled
           Layout.fillWidth: true
 
           onNavBarToggled: {
@@ -271,7 +277,8 @@ ApplicationWindow {
             pageStack.push(Qt.resolvedUrl("Settings.qml"), {
               version: root.version,
               buildContainerReady: builder.ready,
-              hasBuildContainer: root.hasBuildContainer
+              hasBuildContainer: root.hasBuildContainer,
+              isLibertineEnabled: root.isLibertineEnabled
             })
 
             pageStack.currentItem.containerCreationStarted.connect(function() {