mittens_ui 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fd554ceb6ba103cc474483896a9871db34a417a01e761b9c0befe7c43205cb1
-  data.tar.gz: 25ced2c5db0c26e27a9b29e85d635a2a8ef558da35cfe5ee690debd2a47eaa96
+  metadata.gz: 2de74ee20b66d0c56c6ba2eb8cb7316ebbf57deebe990615decce1eb0008fd9e
+  data.tar.gz: 93ad5cde1ef87a5bce92fb8db71d02b812f980777ea84d47dbb4a9c29bb75bc0
 SHA512:
-  metadata.gz: 368761abc4d2b0a1170c52b6a2941a700913b263ef6c0be43ceca4c20e2b3d5714620e8eb805fb12eed09a78a0c742debe00ee288dfdbbee33d2b1baa1ada3a3
-  data.tar.gz: 0db136bdea5ca1a8126d828c93d2e5cc16e5c1daadd4e45edcd69f6208650eb776c91867cbeb5feac3c42eedef395f952a03743b484283a31fc8a8a6bb0612cf
+  metadata.gz: 51353cb720d6be4c84e8198642368292a3313510e1f683d129c83f30d55ac46e0a07d933dcec679b14eea20229796124e80324f34e2959ac02ecf6bbd0e96c5b
+  data.tar.gz: fbe1746d213f60ae5bde487b81ed6b13f455ac1b5d82c3762d150d2a47874380f06001c57fbdb20f0fa4705a42d08d4efb1c953acdc83ec22e33cf79251785b2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mittens_ui (0.0.6)
+    mittens_ui (0.0.7)
       gtk3
 
 GEM

data/README.md

@@ -23,13 +23,13 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-require '../lib/mittens_ui'
+require "mittens_ui"
 
 app_options = {
   name: "say_hello",
-  title: "Say Hello!",
-  height: 450,
-  width: 350,
+  title: "The Say Hello App!",
+  height: 650,
+  width: 550,
   can_resize: true
 }.freeze
 
@@ -51,9 +51,32 @@ MittensUi::Application.Window(app_options) do
   s = MittensUi::Slider({ start_value: 1, stop_value: 100, initial_value: 30 })
   s.slide { |s| puts s.value }
 
+  img_opts = {
+    tooltip_text: "The Gnome LOGO!", 
+    width: 200, 
+    height: 200, 
+    left: 50
+  }.freeze
+
+  img = MittensUi::Image("./assets/gnome_logo.png", img_opts)
+
   switch = MittensUi::Switch(left: 120 )
-  switch.on { puts switch.status }
-end
+
+  img.click do
+    unless switch.hidden?
+      switch.show
+    else
+      switch.hide
+    end
+  end
+
+  switch.on do
+    unless img.hidden?
+      img.show
+    else
+      img.hide
+    end
+  end
 end
 ```
 

data/examples/app.rb

@@ -2,9 +2,9 @@ require '../lib/mittens_ui'
 
 app_options = {
   name: "say_hello",
-  title: "Say Hello!",
-  height: 450,
-  width: 350,
+  title: "The Say Hello App!",
+  height: 650,
+  width: 550,
   can_resize: true
 }.freeze
 
@@ -26,6 +26,30 @@ MittensUi::Application.Window(app_options) do
   s = MittensUi::Slider({ start_value: 1, stop_value: 100, initial_value: 30 })
   s.slide { |s| puts s.value }
 
+  img_opts = {
+    tooltip_text: "The Gnome LOGO!", 
+    width: 200, 
+    height: 200, 
+    left: 50
+  }.freeze
+
+  img = MittensUi::Image("./assets/gnome_logo.png", img_opts)
+
   switch = MittensUi::Switch(left: 120 )
-  switch.on { puts switch.status }
+
+  img.click do
+    unless switch.hidden?
+      switch.show
+    else
+      switch.hide
+    end
+  end
+
+  switch.on do
+    unless img.hidden?
+      img.show
+    else
+      img.hide
+    end
+  end
 end

data/lib/mittens_ui.rb

@@ -6,13 +6,17 @@ require "mittens_ui/widgets/textbox"
 require "mittens_ui/widgets/listbox"
 require "mittens_ui/widgets/slider"
 require "mittens_ui/widgets/switch"
+require "mittens_ui/widgets/image"
 
 require "gtk3"
 
 module MittensUi
-
   class Error < StandardError; end
 
+  def self.Image(path, options={})
+    MittensUi::Widgets::Image.new(path, options)
+  end
+
   def self.Switch(options = {})
     MittensUi::Widgets::Switch.new(options)
   end
@@ -41,10 +45,6 @@ module MittensUi
     MittensUi::Widgets::Button.new(options)
   end
 
-  def self.RemoveWidget(widget)
-    widget.remove
-  end
-
   class Application
     class << self
       def Window(options = {}, &block)  

data/lib/mittens_ui/helpers.rb

@@ -0,0 +1,27 @@
+module MittensUi
+  module Helpers
+    def set_margin_from_opts_for(widget, options={})
+      margin_top    = options[:top].nil?    ? nil : options[:top]
+      margin_bottom = options[:bottom].nil? ? nil : options[:bottom]
+      margin_right  = options[:right].nil?  ? nil : options[:right]
+      margin_left   = options[:left].nil?   ? nil : options[:left]
+
+      unless margin_top.nil?
+        widget.set_margin_top(margin_top)
+      end
+
+      unless margin_bottom.nil?
+        widget.set_margin_bottom(margin_top)
+      end
+
+      unless margin_left.nil?
+        widget.set_margin_left(margin_left)
+      end
+
+      unless margin_right.nil?
+        widget.set_margin_right(margin_right)
+      end
+    end
+  end
+end
+

data/lib/mittens_ui/version.rb

@@ -1,3 +1,3 @@
 module MittensUi
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/mittens_ui/widgets/button.rb

@@ -1,22 +1,18 @@
+require_relative "./core"
+
 module MittensUi
   module Widgets
-    class Button
+    class Button < Core
       def initialize(options={})
         button_title  = options[:title] || "Button"
 
-        margin_top    = options[:top].nil?    ? nil : options[:top]
-        margin_bottom = options[:bottom].nil? ? nil : options[:bottom]
-        margin_right  = options[:right].nil?  ? nil : options[:right]
-        margin_left   = options[:left].nil?   ? nil : options[:left]
-
         @button = Gtk::Button.new(label: button_title)
- 
-        @button.set_margin_top(margin_top)        unless margin_top.nil?
-        @button.set_margin_left(margin_left)      unless margin_left.nil?
-        @button.set_margin_right(margin_right)    unless margin_right.nil?
-        @button.set_margin_bottom(margin_bottom)  unless margin_bottom.nil?
+
+        set_margin_from_opts_for(@button, options)
 
         $vertical_box.pack_start(@button)
+
+        super(@button)
       end
 
       def click
@@ -24,11 +20,6 @@ module MittensUi
           yield(button_widget)
         end
       end
-      
-      def remove
-        return if @button.nil?
-        @button.destroy
-      end
     end
   end
 end

data/lib/mittens_ui/widgets/core.rb

@@ -0,0 +1,28 @@
+require "mittens_ui/helpers"
+
+module MittensUi
+  module Widgets
+    class Core    
+      include Helpers
+
+      # All MittenUi::Widget classes should inherit from this base class.
+
+      def initialize(widget)
+        @core_widget = widget
+      end
+
+      def show
+        @core_widget.show_all
+      end
+
+      def hidden?
+        @core_widget.visible?
+      end
+
+      def hide
+        return if @core_widget.nil?
+        @core_widget.hide
+      end
+    end
+  end
+end

data/lib/mittens_ui/widgets/image.rb

@@ -0,0 +1,36 @@
+require_relative "./core"
+
+module MittensUi
+  module Widgets
+    class Image < Core
+      attr_reader :path
+
+      def initialize(path, options = {})
+        @path = File.join(path.strip)
+
+        tooltip_text = options[:tooltip_text].nil? ? "" : options[:tooltip_text]
+        width        = options[:width].nil?        ? 80 : options[:width]
+        height       = options[:height].nil?       ? 80 : options[:height]
+
+        pixbuf = GdkPixbuf::Pixbuf.new(file: @path, width: width, height: height)
+        
+        @image = Gtk::Image.new(pixbuf: pixbuf)
+        @image.tooltip_text = tooltip_text
+
+        set_margin_from_opts_for(@image, options)
+
+        @event_box = Gtk::EventBox.new.add_child(@image)
+
+        $vertical_box.pack_start(@event_box)
+
+        super(@image)
+      end
+
+      def click 
+        @event_box.signal_connect("button_press_event") do
+          yield
+        end    
+      end
+    end
+  end
+end

data/lib/mittens_ui/widgets/label.rb

@@ -1,40 +1,20 @@
+require_relative "./core"
+
 module MittensUi
   module Widgets
-    class Label
+    class Label < Core
       def initialize(text, options)
         if text.nil? || text == "" || text == " "
           text = "Label"
         end
 
-        margin_top    = options[:top].nil?     ? nil : options[:top]
-        margin_bottom = options[:bottom].nil?  ? nil : options[:bottom]
-        margin_right  = options[:right].nil?   ? nil : options[:right]
-        margin_left   = options[:left].nil?    ? nil : options[:left]
-
         @label = Gtk::Label.new(text)
 
-        unless margin_top.nil?
-          @label.set_margin_top(margin_top)
-        end
-
-        unless margin_bottom.nil?
-          @label.set_margin_bottom(margin_top)
-        end
-
-        unless margin_left.nil?
-          @label.set_margin_left(margin_left)
-        end
-
-        unless margin_right.nil?
-          @label.set_margin_right(margin_right)
-        end
+        set_margin_from_opts_for(@label, options)
 
         $vertical_box.pack_start(@label)
-      end
 
-      def remove
-        return if @label.nil?
-        @label.destroy
+        super(@label)
       end
     end
   end

data/lib/mittens_ui/widgets/listbox.rb

@@ -1,6 +1,8 @@
+require_relative "./core"
+
 module MittensUi
   module Widgets
-    class ListBox      
+    class ListBox < Core   
       attr_reader :items
 
       def initialize(options={})
@@ -25,21 +27,19 @@ module MittensUi
         @gtk_combobox.set_active(0)
 
         $vertical_box.pack_start(@gtk_combobox)
+
+        super(@gtk_combobox)
       end
 
       def set_selected_value(value)
         @selected_value = value
       end
+      alias :set_value :set_selected_value
 
       def get_selected_value
         @selected_value
       end
       alias :selected_value :get_selected_value
-
-      def remove
-        return if @gtk_combobox.nil?
-        @gtk_combobox.destroy
-      end
     end
   end
 end

data/lib/mittens_ui/widgets/slider.rb

@@ -1,6 +1,8 @@
+require_relative "./core"
+
 module MittensUi
   module Widgets
-    class Slider
+    class Slider < Core
       def initialize(options={})
         start_value = options[:start_value].nil?    ? 1.0  : options[:start_value]
         stop_value  = options[:stop_value].nil?     ? 10.0 : options[:stop_value]
@@ -13,6 +15,8 @@ module MittensUi
         @scale.value = init_value
 
         $vertical_box.pack_start(@scale)
+
+        super(@scale)
       end
 
       def move
@@ -22,11 +26,6 @@ module MittensUi
       end
 
       alias :slide :move
-
-      def remove
-        return if @scale.nil?
-        @scale.destroy
-      end
     end
   end
 end

data/lib/mittens_ui/widgets/switch.rb

@@ -1,39 +1,24 @@
+require_relative "./core"
+
 module MittensUi
   module Widgets
-    class Switch
+    class Switch < Core
       def initialize(options = {})
         @switch = Gtk::Switch.new
         @switch.set_active(false)
 
-        margin_top    = options[:top].nil?     ? nil : options[:top]
-        margin_bottom = options[:bottom].nil?  ? nil : options[:bottom]
-        margin_right  = options[:right].nil?   ? nil : options[:right]
-        margin_left   = options[:left].nil?    ? nil : options[:left]
-
-        unless margin_top.nil?
-          @switch.set_margin_top(margin_top)
-        end
-
-        unless margin_bottom.nil?
-          @switch.set_margin_bottom(margin_top)
-        end
-
-        unless margin_left.nil?
-          @switch.set_margin_left(margin_left)
-        end
-
-        unless margin_right.nil?
-          @switch.set_margin_right(margin_right)
-        end
+        set_margin_from_opts_for(@switch, options)
 
         # We need a Grid within our global $vertical_box layout
-        # in order to make the Widget look good (mean not overly streched).
+        # in order to make the Widget look good (meaning not overly streched).
         grid = Gtk::Grid.new
         grid.set_column_spacing(1)
         grid.set_row_spacing(1)
         grid.attach(@switch, 0, 0, 1, 1) 
         
         $vertical_box.pack_start(grid)
+
+        super(@switch)
       end
 
       def activate
@@ -47,11 +32,6 @@ module MittensUi
       def status
         @switch.active? ? 'on' : 'off'
       end
-
-      def remove
-        return if @switch.nil?
-        @switch.destroy
-      end
     end
   end
 end

data/lib/mittens_ui/widgets/textbox.rb

@@ -1,6 +1,8 @@
+require_relative "./core"
+
 module MittensUi
   module Widgets
-    class Textbox
+    class Textbox < Core
       def initialize(options={}) 
         @textbox    = Gtk::Entry.new
         can_edit    = options[:can_edit].nil? ?  true : options[:can_edit]
@@ -10,16 +12,13 @@ module MittensUi
         @textbox.set_max_length(max_length) unless max_length.nil?
 
         $vertical_box.pack_start(@textbox)
+
+        super(@textbox)
       end
 
       def text
         @textbox.text
       end
-
-      def remove
-        return if @textbox.nil?
-        @textbox.destroy
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mittens_ui
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Zach Tuttle
@@ -41,13 +41,17 @@ files:
 - bin/console
 - bin/setup
 - examples/app.rb
+- examples/assets/gnome_logo.png
 - examples/brightness_controller.rb
 - lib/mittens_ui.rb
+- lib/mittens_ui/helpers.rb
 - lib/mittens_ui/layouts/box.rb
 - lib/mittens_ui/layouts/grid.rb
 - lib/mittens_ui/version.rb
 - lib/mittens_ui/widgets/alert.rb
 - lib/mittens_ui/widgets/button.rb
+- lib/mittens_ui/widgets/core.rb
+- lib/mittens_ui/widgets/image.rb
 - lib/mittens_ui/widgets/label.rb
 - lib/mittens_ui/widgets/listbox.rb
 - lib/mittens_ui/widgets/slider.rb