tidy includes

This commit is contained in:
Daniel Barlow 2022-03-20 14:23:26 +00:00
parent 05b8cc77e8
commit b03afc5c07

View File

@ -1,7 +1,23 @@
(local lgi (require :lgi)) (local {: Gio
(local Gio lgi.Gio) : GLib
: GObject
: Gtk
: GdkPixbuf
: Gdk
: Pango}
(require :lgi))
(local {: List
: stringx
: tablex
}
((require :pl.import_into)))
(local dbus (require :dbus_proxy)) (local dbus (require :dbus_proxy))
(local inspect (require :inspect)) (local inspect (require :inspect))
(local lfs (require :lfs))
(local inifile (require :inifile))
(local posix (require :posix))
(local ICON_SIZE 64) (local ICON_SIZE 64)
(local CSS " (local CSS "
@ -87,14 +103,6 @@
(os.exit 0)))) (os.exit 0))))
(local lfs (require :lfs))
(local inifile (require :inifile))
(local List (require "pl.List"))
(local stringx (require "pl.stringx"))
(local tablex (require "pl.tablex"))
(local inspect (require :inspect))
(local posix (require :posix))
(local path { (local path {
:absolute? (fn [str] (= (str:sub 1 1) "/")) :absolute? (fn [str] (= (str:sub 1 1) "/"))
:concat (fn [...] (table.concat [...] "/")) :concat (fn [...] (table.concat [...] "/"))
@ -103,14 +111,6 @@
:concat (fn [...] (table.concat [...] ":")) :concat (fn [...] (table.concat [...] ":"))
}) })
(local Gtk lgi.Gtk)
(local GdkPixbuf lgi.GdkPixbuf)
(local Gdk lgi.Gdk)
(local Pango lgi.Pango)
(local icon-theme (Gtk.IconTheme.get_default)) (local icon-theme (Gtk.IconTheme.get_default))
;; Use the declared CSS for this app ;; Use the declared CSS for this app
@ -122,7 +122,6 @@
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
)) ))
(local window (Gtk.Window { (local window (Gtk.Window {
:title "Saturn V" :title "Saturn V"
:name "toplevel" :name "toplevel"
@ -257,15 +256,15 @@
(when (and (= path dbus-service-attrs.path) (when (and (= path dbus-service-attrs.path)
(= interface dbus-service-attrs.interface) (= interface dbus-service-attrs.interface)
(= name "Visible")) (= name "Visible"))
(lgi.GLib.Variant "b" window.visible))) (GLib.Variant "b" window.visible)))
(Gio.DBusConnection.register_object (Gio.DBusConnection.register_object
bus.connection bus.connection
dbus-service-attrs.path dbus-service-attrs.path
interface-info interface-info
(lgi.GObject.Closure handle-dbus-method-call) (GObject.Closure handle-dbus-method-call)
(lgi.GObject.Closure handle-dbus-get) (GObject.Closure handle-dbus-get)
(lgi.GObject.Closure (fn [a] (print "set")))) (GObject.Closure (fn [a] (print "set"))))
(let [grid (Gtk.FlowBox { (let [grid (Gtk.FlowBox {
:orientation Gtk.Orientation.HORIZONTAL :orientation Gtk.Orientation.HORIZONTAL