eww code refactor

This commit is contained in:
coolnsx
2023-09-03 21:41:48 +05:30
parent e6916fe766
commit b0f598bec3
5 changed files with 65 additions and 87 deletions

View File

@@ -10,7 +10,8 @@
:reserve (struts :distance "40px" :side "top")
:windowtype "dock"
:wm-ignore false
(clock))
(clock)
)
(defwindow time_0
:monitor 0
@@ -23,21 +24,25 @@
:reserve (struts :distance "40px" :side "top")
:windowtype "dock"
:wm-ignore false
(clock))
(clock)
)
(defpoll HOUR :interval "2s" `date +\"%I\"`)
(defpoll MIN :interval "2s" `date +\"%M\"`)
(defpoll MER :interval "2s" `date +\"%p\"`)
(defpoll DAY :interval "5s" `date +\"%A\"`)
(defpoll HOUR :interval "2s" $(date +'%I'))
(defpoll MIN :interval "2s" $(date +'%M'))
(defpoll MER :interval "2s" $(date +'%p'))
(defpoll DAY :interval "5s" $(date +'%A'))
(defwidget clock []
(box :class "genwin" :orientation "h" :spacing 50 :space-evenly false :vexpand "false" :hexpand "false"
(box :orientation "h" :spacing 0
(label :class "time_hour" :valign "start" :wrap "true" :limit-width 25 :text HOUR)
(label :class "time_min" :valign "end" :wrap "true" :limit-width 25 :text MIN))
(box :orientation "v" :spacing 0 :space-evenly true
(label :class "time_mer" :valign "start" :halign "end" :wrap "true" :limit-width 25 :text MER)
(label :class "time_day" :valign "end" :halign "end" :wrap "true" :limit-width 25 :text DAY))))
(box :class "genwin" :orientation "h" :spacing 50 :space-evenly false :vexpand "false" :hexpand "false"
(box :orientation "h" :spacing 0
(label :class "time_hour" :valign "start" :wrap "true" :limit-width 25 :text HOUR)
(label :class "time_min" :valign "end" :wrap "true" :limit-width 25 :text MIN))
(box :orientation "v" :spacing 0 :space-evenly true
(label :class "time_mer" :valign "start" :halign "end" :wrap "true" :limit-width 25 :text MER)
(label :class "time_day" :valign "end" :halign "end" :wrap "true" :limit-width 25 :text DAY)
)
)
)
;; music
(defwindow music_0
@@ -51,7 +56,8 @@
:reserve (struts :distance "10px" :side "bottom")
:windowtype "dock"
:wm-ignore true
(music))
(music)
)
(defwindow music_1
:monitor 1
@@ -64,30 +70,32 @@
:reserve (struts :distance "10px" :side "bottom")
:windowtype "dock"
:wm-ignore true
(music))
(music)
)
(defpoll SONG :interval "2s" `./script song`)
(defpoll ARTIST :interval "2s" `./script artist`)
(defpoll STATUS :interval "0.5s" `./script status`)
(defpoll COVER :interval "2s" `./script cover`)
(defpoll CURRENT :interval "1s" `./script time`)
(defpoll LYRICS :interval "0.4s" `./script lyrics`)
(defpoll SONG :interval "2s" $(./script song))
(defpoll ARTIST :interval "2s" $(./script artist))
(defpoll STATUS :interval "0.4s" $(./script status))
(defpoll COVER :interval "2s" $(./script cover))
(defpoll CURRENT :interval "0.4s" $(./script time))
(defpoll LYRICS :interval "0.4s" $(./script lyrics))
(defwidget music []
(box :class "genwin" :orientation "h" :spacing 50 :space-evenly "false" :vexpand "false" :hexpand "false"
(box :class "box_art" :vexpand "false" :hexpand "false"
(circular-progress :class "music_bar" :value CURRENT :thickness 10 :clockwise true :start-at 75
(image :path COVER :image-height 300 :image-width 300)))
(box :orientation "v" :spacing 15 :space-evenly "false" :vexpand "false" :hexpand "false"
(label :halign "center" :class "song" :wrap "false" :limit-width 30 :text SONG)
(label :halign "center" :class "artist" :wrap "false" :text ARTIST)
(box :orientation "h" :spacing 20 :halign "center" :space-evenly "true" :vexpand "false" :hexpand "false"
(button :class "btn_controls" :onclick "./script prev" "玲")
(button :class "btn_controls" :onclick "./script seek '-1'" "")
(button :class "btn_play" :onclick "./script play_toggle" STATUS)
(button :class "btn_controls" :onclick "./script seek '1'" "")
(button :class "btn_controls" :onclick "./script next" "怜"))
(label :halign "center" :wrap "true" :class "artist" :text LYRICS)
)
)
)
(defwidget music []
(box :class "genwin" :orientation "v" :spacing 20 :space-evenly "false" :vexpand "true" :hexpand "true"
(box :orientation "h" :space-evenly "false" :vexpand "true" :hexpand "false"
(box :class "album_art" :vexpand "false" :hexpand "false" :style "background-image: url('${COVER}');")
(box :orientation "v" :spacing 20 :space-evenly "false" :vexpand "false" :hexpand "false"
(label :halign "center" :class "song" :wrap "false" :limit-width 25 :text SONG)
(label :halign "center" :class "artist" :wrap "false" :text ARTIST)
(box :orientation "h" :spacing 20 :halign "center" :space-evenly "true" :vexpand "false" :hexpand "false"
(button :class "btn_prev" :onclick "./script prev" "玲")
(button :class "btn_prev" :onclick "./script seek '-1'" "")
(button :class "btn_play" :onclick "./script play_toggle" STATUS)
(button :class "btn_next" :onclick "./script seek '1'" "")
(button :class "btn_next" :onclick "./script next" "怜"))
(box :class "music_bar" :halign "center" :vexpand "false" :hexpand "false" :space-evenly "false"
(scale :min 0 :active "true" :max 100 :value CURRENT))))
(label :halign "center" :class "artist" :text LYRICS)))