Merge pull request #169 from knuton/revert-qt6

Revert Qt 6 migration of kiosk browser
dividat · Jul 1, 2024 · a524d7a · a524d7a
2 parents 762787d + 449fe9e
commit a524d7a
Show file tree

Hide file tree

Showing 34 changed files with 169 additions and 530 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,7 @@
+Copyright 2019 Dividat AG
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Readme.md b/Readme.md
@@ -157,13 +157,57 @@ The following [dev tools](dev-tools/Readme.md) are available:
 
 ## Attribution and Licensing
 
-Most code in this repository is authored by the Dividat AG and the project
-contributors. This code is licensed under [the MIT license](./LICENSE).
+Most code in this repository is authored by the Dividat AG and the project contributors. This code is licensed under an MIT license.
 
-Some source files in this project are portions of other open-source project and
-may be released under different licenses. The applicable licenses are stated
-here as well as in the relevant subdirectories.
+Some source files in this project are portions of other open-source project and may be released under different licenses. The applicable licenses are stated here as well as in the relevant subdirectories.
 
-- [nixpkgs](https://github.com/NixOS/nixpkgs) ([MIT License](./controller/licenses/NIXPKGS))
-- [Feather](https://feathericons.com/) ([MIT License](./controller/licenses/FEATHER)) – used in the [controller](./controller/Readme.md)
-- [Qt6](https://www.qt.io/product/qt6) ([LGPLv3 License](./controller/licenses/QT6)) – used in the [kiosk](./kiosk/Readme.md)
+### [nixpkgs](https://github.com/NixOS/nixpkgs)
+
+```
+Copyright (c) 2003-2018 Eelco Dolstra and the Nixpkgs/NixOS contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+```
+
+### [Feather](https://feathericons.com/)
+
+```
+The MIT License (MIT)
+
+Copyright (c) 2013-2017 Cole Bemis
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+```
diff --git a/application.nix b/application.nix
@@ -86,7 +86,7 @@ rec {
                   ;;
               esac
 
-              # Enable Qt WebEngine Developer Tools (https://doc.qt.io/qt-6/qtwebengine-debugging.html)
+              # Enable Qt WebEngine Developer Tools (https://doc.qt.io/qt-5/qtwebengine-debugging.html)
               export QTWEBENGINE_REMOTE_DEBUGGING="127.0.0.1:3355"
 
               ${pkgs.playos-kiosk-browser}/bin/kiosk-browser \

diff --git a/controller/Changelog.md b/controller/Changelog.md
@@ -4,7 +4,6 @@
 
 - kiosk: Add a key combination to perform hard refresh (Ctrl-Shift-R)
 - os: Added localization options for Polish and Czech
-- controller: Add licensing page in System Settings
 - status screen: Display MAC addresses in text and QR code
 
 ## Changed
@@ -15,7 +14,6 @@
 - os: Limit permitted SSH modes and forwarding options
 - os: Ignore suspend and hibernation key presses, but interpret as poweroff when long-pressed
 - driver: Upgrade to add support for Senso firmware updates via app
-- kiosk: Migrate to Qt6
 
 ## Removed
 

diff --git a/controller/bindings/util/dune b/controller/bindings/util/dune
@@ -1,6 +1,6 @@
 (library
  (name util)
  (modules util)
- (libraries logs logs.lwt cohttp-lwt-unix sexplib fpath)
+ (libraries logs logs.lwt cohttp-lwt-unix sexplib)
  (preprocess (pps lwt_ppx  ppx_sexp_conv)))
 
diff --git a/controller/bindings/util/util.ml b/controller/bindings/util/util.ml
@@ -1,12 +1,5 @@
 open Lwt
 
-(* Require the resource directory to be at a directory fixed to the binary
- * location. This is not optimal, but works for the moment. *)
-let resource_path end_path =
-  let open Fpath in
-  (Sys.argv.(0) |> v |> parent) / ".." / "share" // end_path
-  |> to_string
-
 let read_from_file log_src path =
   let%lwt exists = Lwt_unix.file_exists path in
   if exists then

diff --git a/controller/dune b/controller/dune
@@ -2,10 +2,6 @@
  (section share_root)
  (files
   (Changelog.html as Changelog.html)
-  (licenses/PLAYOS as licenses/PLAYOS)
-  (licenses/NIXPKGS as licenses/NIXPKGS)
-  (licenses/FEATHER as licenses/FEATHER)
-  (licenses/QT6 as licenses/QT6)
   (gui/reset.css as static/reset.css)
   (gui/style.css as static/style.css)
   (gui/client.js as static/client.js)))
diff --git a/controller/gui/style.css b/controller/gui/style.css
@@ -318,16 +318,6 @@ html {
     margin-top: 2rem;
 }
 
-/* Licensing */
-
-.d-Licensing__Link {
-    text-decoration: underline;
-}
-
-.d-Licensing__Details {
-    margin-bottom: var(--spacing-dog);
-}
-
 /* Form */
 
 :root {

diff --git a/controller/licenses/FEATHER b/controller/licenses/FEATHER
diff --git a/controller/licenses/NIXPKGS b/controller/licenses/NIXPKGS
diff --git a/controller/licenses/PLAYOS b/controller/licenses/PLAYOS
diff --git a/controller/licenses/QT6 b/controller/licenses/QT6
diff --git a/controller/server/dune b/controller/server/dune
@@ -6,7 +6,7 @@
  (modules server update info gui health
    info_page localization_page status_page error_page label_page
    network_list_page network_details_page changelog_page
-   licensing_page page definition icon)
+   page definition icon)
  (libraries lwt logs logs.fmt logs.lwt fpath cohttp-lwt-unix logging
   opium tyxml rauc zerotier connman locale network timedate systemd
   label_printer semver2 fieldslib screen_settings)