gtk2clockapp 2.0.210804 → 2.1.210819

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 215e7757ee46c4f44b9d374b4630725a4cce8bed01b9c9c74ee676d6112c581a
-  data.tar.gz: 452fe2563c797cff70514a76dbba80f05773cd2b5626725741bafba0d4bb43b0
+  metadata.gz: d5f28a1d3e170ed1c15e28394cdee787a7fcd2cfcc8fab1971dd1ad588b9294d
+  data.tar.gz: 9ed1880d154a032a94eaba9a62f3dc809c75c39f6ec0dd45719f226d449076bd
 SHA512:
-  metadata.gz: cb68b1dc7bded22827e7ea74299fe8739064c5c4432de23a28fbdf3e2bd6612cdc753eff04e24ff46528b5a87714d885641e43ae5d74fd972cca6b168fdac637
-  data.tar.gz: e016f69bb136594794cd5ceed8f898f28aba2224430b9cf0aa8555316d8ad1fee58f8341fbcd2fa54e2e1aea73a7b892c30c6dad9663330415d0bf7ea31dbef5
+  metadata.gz: 8f3b5754f6c0544e3c7d27338ffcebde191927321328a8bc2cbf68819423cd37384f5963f362b9f28cbef44facc7f7cec7240af3b80486f1e76fe19c0354ebd3
+  data.tar.gz: 2f6f0634370ce5ad60a708f49f74d6de01639e85af9773fa80195a6ea3dd7959a42ac86444a0b359aaa7a201302b28f35333adcfca3b051d0a6f3b3ce2a138a8

data/README.md

@@ -1,6 +1,6 @@
 # Gtk2ClockApp
 
-* [VERSION 2.0.210804](https://github.com/carlosjhr64/gtk2clockapp/releases)
+* [VERSION 2.1.210819](https://github.com/carlosjhr64/gtk2clockapp/releases)
 * [github](https://github.com/carlosjhr64/gtk2clockapp)
 * [rubygems](https://rubygems.org/gems/gtk2clockapp)
 
@@ -43,6 +43,7 @@ Options:
   --font=NAME        	 Courier
   --background=COLOR 	 000000
   --day=COLOR        	 00FF00
+  --dusk=COLOR       	 FF0000
   --night=COLOR      	 3F0000
 Types:
   INT   /^[1-9]\d{1,2}$/

data/bin/gtk2clockapp

@@ -9,10 +9,11 @@ Options:
   -v --version
   --fullscreen
   --notdecorated
-  --size=INT         \t 250
+  --size=INT         \t 186
   --font=NAME        \t Courier
   --background=COLOR \t 000000
   --day=COLOR        \t 00FF00
+  --dusk=COLOR       \t FF0000
   --night=COLOR      \t 3F0000
 Types:
   INT   /^[1-9]\\d{1,2}$/
@@ -21,6 +22,20 @@ Types:
 HELP
 HelpParser.int?(:size)
 gui = Gtk2ClockApp.gui
+Thread.new do
+  now = lambda {|key| Time.now.strftime(Gtk2ClockApp::CONFIG[key])}
+  gui.set_date now[:DateA]
+  gui.set_time now[:Time]
+  loop do
+    sleep(60 - Time.now.sec)
+    gui.set_date now[:DateB]
+    gui.set_time now[:Time]
+    11.times do |i|
+      sleep 5
+      gui.set_date now[[:DateA, :DateB][i%2]]
+    end
+  end
+end
 gui.set_weather '' # '⛅ 75F 92F/66F'
 gui.set_spot    '' # '🗠 WUT: $500'
 gui.set_alert   '' # '📢 Attention!'
@@ -28,17 +43,19 @@ Thread.new do
   while line = $stdin.gets
     line.chomp!
     case line
-    when /^Weather: (.*)$/
-      gui.set_weather $1
-    when /^Spot: (.*)$/
-      gui.set_spot $1
-    when /^Mode: (.*)$/
-      mode = $1
+    when /^Weather:(.*)$/
+      gui.set_weather $1.strip
+    when /^Spot:(.*)$/
+      gui.set_spot $1.strip
+    when /^Mode:(.*)$/
+      mode = $1.strip
       case mode.downcase
-      when 'night'
-        gui.night_mode
       when 'day'
         gui.day_mode
+      when 'dusk'
+        gui.dusk_mode
+      when 'night'
+        gui.night_mode
       else
         $stderr.puts 'Unrecognized mode: '+mode
       end
@@ -46,5 +63,6 @@ Thread.new do
       gui.set_alert line
     end
   end
+  exit
 end
 Gtk.main

data/lib/gtk2clockapp.rb

@@ -1,5 +1,5 @@
 module Gtk2ClockApp
-  VERSION = '2.0.210804'
+  VERSION = '2.1.210819'
 
   def self.gui
     require 'gtk3'

data/lib/gtk2clockapp/config.rb

@@ -2,7 +2,7 @@ module Gtk2ClockApp
   OPTIONS ||= nil
 
   g      = 2 - (1 + Math.sqrt(5))/2
-  big    = OPTIONS&.size? || 250
+  big    = OPTIONS&.size? || 186
   medium = (big*g).round
   small  = (big*g*g).round
   pad    = (big*g*g*g).round
@@ -17,6 +17,7 @@ module Gtk2ClockApp
   color = {
     Background: '#'+(OPTIONS&.background || '000000'),
     Day:        '#'+(OPTIONS&.day        || '00FF00'),
+    Dusk:       '#'+(OPTIONS&.dusk       || 'FF0000'),
     Night:      '#'+(OPTIONS&.night      || '3F0000'),
   }
 
@@ -27,6 +28,7 @@ module Gtk2ClockApp
 
     Background: color[:Background],
     Day:        color[:Day],
+    Dusk:       color[:Dusk],
     Night:      color[:Night],
 
     # Window

data/lib/gtk2clockapp/gui.rb

@@ -1,24 +1,9 @@
 module Gtk2ClockApp
   class Gui
-    def now(key)
-      Time.now.strftime(CONFIG[key])
-    end
-
     def new_label(key)
       hbox = Such::Box.new @vbox, :hbox!
       Such::Label.new hbox, key
     end
-
-    def time_label(key, seconds, *formats)
-      label = new_label(key)
-      i = 0
-      label.set_text now(formats[i])
-      GLib::Timeout.add(seconds*1000) do
-        i = (i+1)%formats.length
-        label.set_text now(formats[i])
-      end
-      label
-    end
    
     def initialize
       @window = Such::Window.new :window! do Gtk.main_quit end
@@ -26,9 +11,8 @@ module Gtk2ClockApp
       @window.fullscreen if OPTIONS.fullscreen?
       @vbox = Such::Box.new @window, :vbox!
 
-      @date = time_label(:medium_label!, 5, :DateA, :DateB)
-      @time = time_label(:big_label!, 60, :Time)
-
+      @date    = new_label(:medium_label!)
+      @time    = new_label(:big_label!)
       @weather = new_label(:medium_label!)
       @spot    = new_label(:medium_label!)
       @alert   = new_label(:small_label!)
@@ -36,6 +20,14 @@ module Gtk2ClockApp
       @window.show_all
     end
 
+    def set_date(text)
+      @date.set_text text
+    end
+
+    def set_time(text)
+      @time.set_text text
+    end
+
     def set_weather(text)
       @weather.set_text text
     end
@@ -58,6 +50,12 @@ module Gtk2ClockApp
       end
     end
 
+    def dusk_mode
+      labels.each do |label|
+        label.override_color(:normal, CONFIG[:Dusk])
+      end
+    end
+
     def night_mode
       labels.each do |label|
         label.override_color(:normal, CONFIG[:Night])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtk2clockapp
 version: !ruby/object:Gem::Version
-  version: 2.0.210804
+  version: 2.1.210819
 platform: ruby
 authors:
 - carlosjhr64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser