cryptopunks-gui 0.0.11 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f736dec6d87a407c215776056a10f0c85fc26c847e67f42952f494c3d6729a
-  data.tar.gz: 16f48f9207cbfdb66ec804efb566d85438901ac836f9d6029d10b7aea2039ced
+  metadata.gz: aba61bde681e3e74f5eaeb12aa80e4ceb1dea6b3465e88909adbfef8815e0be1
+  data.tar.gz: 970ef62ad8b5620c9da4aadc3b33e700d82a54d80597947d2f481cf85e7476cb
 SHA512:
-  metadata.gz: 2d30b9e4506bfd1c41badfd467526013a2474b9a708215acb2a947423eaedbab312423b765622b3630257cc17f6eb8bda166c6fb12394230f8ba44d53fc14ca2
-  data.tar.gz: 9de36325f799f16dc00544aa7f67f407d993e10f9457cc5d9ac27de47605bceeb9ed7e35314a4acaee0afe3e9371ab73565dee03ffab1a1fc2b7fb63992ad53d
+  metadata.gz: 7d87cbd6ac7f572aafca0b687f6dd0c95ad74c2a96b09d225da75d14d700572243fbe9611590db7a2fe833798a47595fe6aca003a4675b50f80a4009de394779
+  data.tar.gz: 5decb6852dc84e4ec00078d9779681dc8800fd9697d5fd9e2c01d562292ae86652dd274d9bfb3d7f7acdc44c47e99d96f6369d5384abfa462a32accdd548504d

data/CHANGELOG.md

@@ -1,8 +1,31 @@
 # Change Log
 
+## 0.0.15
+
+- Upgrade to glimmer-dsl-tk 0.0.49
+
+## 0.0.14
+
+- Fix PNG signature not found issue on Windows by writing images as binary files (`chunky_png-1.4.0/lib/chunky_png/datastream.rb:107:in verify_signature!': PNG signature not found, found "\\x89PNG\\r\\r\\n\\x1A" instead of "\\x89PNG\\r\\n\\x1A\\n"! (ChunkyPNG::SignatureMismatch)`)
+- Fix regression issue with image index allowed out of bounds when changing to a collection with less images than current collection
+
+## 0.0.13
+
+- Support older Ruby versions down to 2.7.2 by fixing an issue with not having `#name` method on `Symbol`
+
+## 0.0.12
+
+- Upgrade to glimmer-dsl-tk 0.0.46
+- File & Help Menus
+- Update COLLECTIONS_YAML_URL to point to cryptopunksnotdead repository (recently moved there)
+- Add 'Mirror', 'Flip', 'Led' and 'Sketch' details (e.g. spacing or line) to output file name (e.g. '...-mirror.png')
+- Fix issue with allowing out of bounds image index when entering index that is equal to count of images in a collection (off by 1 error)
+- Fix written file name for downloaded sprites (was excluding .png before)
+- Fix issue with @punk_directory mistakenly referenced after being removed through refactoring
+
 ## 0.0.11
 
-- Support configuring default collections through a web hosted yaml file at: https://raw.githubusercontent.com/AndyObtiva/cryptopunks-gui/master/cryptopunks-collections.yml
+- Support configuring default collections through a web hosted yaml file at: https://raw.githubusercontent.com/cryptopunksnotdead/cryptopunks-gui/master/cryptopunks-collections.yml
 - New Green Punks, Clown Punks, and Bubble Gum Punks collections
 
 ## 0.0.10

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2021 Andy Maleh
+Copyright (c) 2021 Crypto Punk's Not Dead
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,8 +1,8 @@
-# <img src="https://raw.githubusercontent.com/AndyObtiva/cryptopunks-gui/master/icons/cryptopunks-gui.png" height=85 /> CryptoPunks GUI 0.0.11
+# <img src="https://raw.githubusercontent.com/cryptopunksnotdead/cryptopunks-gui/master/icons/cryptopunks-gui.png" height=85 /> CryptoPunks GUI 0.0.15
 ## Simplified Minting
 [![Gem Version](https://badge.fury.io/rb/cryptopunks-gui.svg)](http://badge.fury.io/rb/cryptopunks-gui)
 
-This is a Graphical User Interface for the famous [cryptopunks Ruby gem](https://github.com/cryptopunksnotdead/cryptopunks/tree/master/cryptopunks).
+This is a Graphical User Interface for the [cryptopunks Ruby gem](https://github.com/cryptopunksnotdead/cryptopunks/tree/master/cryptopunks).
 
 It automatically downloads image collection sprites on first use (e.g. `punks.png` from https://github.com/larvalabs/cryptopunks).
 
@@ -18,14 +18,14 @@ Minted cryptopunks are stored at `~/cryptopunks/` by default ([output location c
 
 ## Setup
 
-You can use CryptoPunks GUI via gem or via cloning repository.
+You can use CryptoPunks GUI via gem or via cloning repository (if you encounter any issues, please try older versions of the gem and report the issues encountered).
 
 ### Gem
 
 Run:
 
 ```
-gem install cryptopunks-gui -v0.0.11
+gem install cryptopunks-gui -v0.0.15
 ```
 
 Afterwards, run app via:
@@ -39,7 +39,7 @@ cryptopunks-gui
 Clone repository:
 
 ```
-git clone https://github.com/AndyObtiva/cryptopunks-gui.git
+git clone https://github.com/cryptopunksnotdead/cryptopunks-gui.git
 ```
 
 Enter directory:
@@ -236,7 +236,7 @@ You may select a new output location by clicking on the `...` button.
 
 [MIT](LICENSE.txt)
 
-Copyright (c) 2021 - Cryptopunks GUI by [Andy Maleh](https://github.com/AndyObtiva)
+Copyright (c) 2021 - Cryptopunks GUI by [Crypto Punk's Not Dead](https://github.com/cryptopunksnotdead)
 
 --
 

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.15

data/app/cryptopunks_gui.rb

@@ -1,323 +1,42 @@
 require 'glimmer-dsl-tk'
+require 'glimmer/data_binding/observer'
 require 'cryptopunks'
 require 'facets'
 require 'fileutils'
 require 'net/http'
 require 'uri'
-require 'glimmer/data_binding/observer'
 require 'yaml'
 require 'puts_debuggerer'
 
+require_relative 'model/image'
+require_relative 'view/menu_bar'
+require_relative 'view/image_frame'
+require_relative 'view/style_options_frame'
+
 class CryptopunksGui
   include Glimmer
-  
-  PALETTES = ['Standard'] + (Palette8bit.constants).map(&:name).map {|palette| palette.split('_').map(&:capitalize).join(' ')}.reject { |palette| palette.include?(' ') }.sort
-  STYLES = ['Normal', 'Led', 'Sketch']
-  COLLECTIONS_YAML_URL = 'https://raw.githubusercontent.com/AndyObtiva/cryptopunks-gui/master/cryptopunks-collections.yml'
-  COLLECTIONS_YAML_PATH = File.expand_path('../cryptopunks-collections.yml', __dir__)
-  
-  attr_accessor :collection, :image_index, :zoom, :palette, :style, :led_spacing, :led_round_corner, :sketch_line, :flip, :mirror
+  include View::MenuBar
+  include View::ImageFrame
+  include View::StyleOptionsFrame
   
   def initialize
-    initialize_punk_directory
-    initialize_collections_map
-    initialize_collection
-    load_config
-    initialize_defaults
-    observe_image_attribute_changes
+    @image = Model::Image.new
     create_gui
-    self.image_index = 0
-    @root.open
-  end
-  
-  def collection_options
-    @collections_map.keys
-  end
-  
-  def palette_options
-    PALETTES
-  end
-  
-  def style_options
-    STYLES
-  end
-  
-  def initialize_punk_directory
-    @punk_directory = @punk_config_directory = File.join(Dir.home, 'cryptopunks')
-    FileUtils.mkdir_p(@punk_directory)
-  end
-  
-  def initialize_collections_map
-    begin
-      http_response = Net::HTTP.get_response(URI(COLLECTIONS_YAML_URL))
-      if http_response.is_a?(Net::HTTPSuccess)
-        @collections_map = YAML.load(http_response.body)
-      else
-        raise "code: #{http_response.code} message: #{http_response.message}"
-      end
-    rescue StandardError, SocketError => e
-      puts "Failed to utilize collection YAML from: #{COLLECTIONS_YAML_URL}"
-      puts e.full_message
-      puts "Utilizing local collection YAML instead: #{COLLECTIONS_YAML_PATH}"
-      @collections_map = YAML.load(File.read(COLLECTIONS_YAML_PATH))
-    end
+    @image.image_index = 0
   end
   
-  def initialize_collection
-    return if @collection && @collection == @last_collection
-    @collection ||= @collections_map.keys.first
-    url = @collections_map[@collection][:url]
-    width = @collections_map[@collection][:width]
-    height = @collections_map[@collection][:height]
-    @punk_file = File.join(@punk_config_directory, File.basename(url, '.png'))
-    File.write(@punk_file, Net::HTTP.get(URI(url))) unless File.exist?(@punk_file)
-    @images ||= {}
-    @images[@collection] ||= Punks::Image::Composite.read(@punk_file, width: width, height: height)
-    @last_collection = @collection
-    self.image_index = 0
-    @image_index_spinbox.to = @images[@collection].size - 1 if @image_index_spinbox
-  end
-  
-  def load_config
-    @punk_config_file = File.join(@punk_config_directory, 'cryptopunks.yml')
-    FileUtils.touch(@punk_config_file)
-    @punk_config = YAML.load(File.read(@punk_config_file)) || {punk_directory: @punk_directory}
-    @punk_directory = @punk_config[:punk_directory]
-  end
-  
-  def save_config
-    File.write(@punk_config_file, YAML.dump(@punk_config))
-  end
-  
-  def initialize_defaults
-    @collection = @collections_map.keys.first
-    @zoom = 12
-    @palette = PALETTES.first
-    @style = STYLES.first
-    @led_spacing = 2
-    @led_round_corner = false
-    @sketch_line = 1
-    @mirror = false
-    @flip = false
-  end
-  
-  def observe_image_attribute_changes
-    observer = Glimmer::DataBinding::Observer.proc { generate_image }
-    observer.observe(self, :collection)
-    observer.observe(self, :image_index)
-    observer.observe(self, :zoom)
-    observer.observe(self, :palette)
-    observer.observe(self, :style)
-    observer.observe(self, :led_spacing)
-    observer.observe(self, :led_round_corner)
-    observer.observe(self, :sketch_line)
-    observer.observe(self, :mirror)
-    observer.observe(self, :flip)
-  end
-  
-  def generate_image
-    initialize_collection
-    return if @image_index.to_i > @images[@collection].size
-    image_location = File.join(@punk_directory, "#{@collection.gsub(' ', '').downcase}-#{@image_index}#{"x#{@zoom}" if @zoom.to_i > 1}#{"-#{@palette.underscore}" if @palette != PALETTES.first}#{"-#{@style.underscore}" if @style != STYLES.first}.png")
-    puts "Writing punk image to #{image_location}"
-    selected_punk = @images[@collection][@image_index.to_i]
-    selected_punk = selected_punk.change_palette8bit(Palette8bit.const_get(@palette.gsub(' ', '_').upcase.to_sym)) if @palette != PALETTES.first
-    @original_zoom = @zoom
-    if @previous_collection && @collection != @previous_collection && @collections_map[@collection][:width] != @collections_map[@previous_collection][:width]
-      @zoom = @collections_map[@collection][:default_zoom]
-    end
-    if @style != STYLES.first
-      style_options = {}
-      if @style == 'Led'
-        style_options[:spacing] = @led_spacing.to_i
-        style_options[:round_corner] = @led_round_corner
-      end
-      if @style == 'Sketch'
-        style_options[:line] = @sketch_line.to_i
-      end
-      selected_punk = selected_punk.send(@style.underscore, @zoom.to_i, **style_options)
-    end
-    selected_punk = selected_punk.mirror if @mirror
-    selected_punk = selected_punk.flip if @flip
-    selected_punk = selected_punk.zoom(@zoom.to_i) if @style == STYLES.first
-    selected_punk.save(image_location)
-    @image_label.image = image_location
-    @output_location_entry.text = image_location
-    @previous_style = @style
-    @previous_collection = @collection
-    notify_observers(:zoom) if @zoom != @original_zoom
+  def launch
+    @root.open
   end
   
   def create_gui
-    @root = root {
+    @root = root { |root_proxy|
       title 'CryptoPunks GUI'
       iconphoto File.expand_path('../icons/cryptopunks-gui.png', __dir__)
       
-      frame {
-        label {
-          text 'Collection:'
-        }
-        combobox {
-          readonly true
-          text <=> [self, :collection]
-        }
-        
-        label {
-          text 'Image Index:'
-        }
-        @image_index_spinbox = spinbox {
-          from 0
-          to @images[@collection].size - 1
-          text <=> [self, :image_index]
-        }
-        
-        label {
-          text 'Zoom:'
-        }
-        spinbox {
-          from 1
-          to 72
-          text <=> [self, :zoom]
-        }
-        
-        label {
-          text 'Palette:'
-        }
-        combobox {
-          readonly true
-          text <=> [self, :palette]
-        }
-        
-        label {
-          text 'Style:'
-        }
-        combobox {
-          readonly true
-          text <=> [self, :style, after_write: ->(val) {add_style_options}]
-        }
-        
-        @style_options_frame = frame {
-          padding 0
-        }
-        
-        frame {
-          padding 0
-          
-          checkbutton {
-            grid row: 0, column: 0, column_weight: 0
-            variable <=> [self, :mirror]
-          }
-          label {
-            grid row: 0, column: 1
-            text 'Mirror'
-            
-            on('Button-1') do
-              self.mirror = !mirror
-            end
-          }
-          
-          checkbutton {
-            grid row: 0, column: 2
-            variable <=> [self, :flip]
-          }
-          label {
-            grid row: 0, column: 3
-            text 'Flip'
-            
-            on('Button-1') do
-              self.flip = !flip
-            end
-          }
-        }
-        
-        label {
-          text 'Output Location:'
-        }
-        frame {
-          padding 0
-          
-          @output_location_entry = entry {
-            grid row: 0, column: 0
-            readonly true
-            width 47
-          }
-          button {
-            grid row: 0, column: 1
-            text '...'
-            width 1.1
-            
-            on('command') do
-              new_punk_directory = choose_directory(parent: @root)
-              unless new_punk_directory.to_s.empty?
-                @punk_directory = new_punk_directory
-                @punk_config[:punk_directory] = @punk_directory
-                save_config
-                generate_image
-              end
-            end
-          }
-        }
-        
-        @image_label = label {
-          grid row_weight: 1
-        }
-      }
-    }
-  end
-  
-  def add_style_options
-    @style_options_frame.content {
-      @style_options_frame.children.each(&:destroy)
-      if @style == 'Led'
-        frame {
-          padding 0
-          
-          label {
-            grid row: 0, column: 0, column_weight: 0
-            text 'Spacing:'
-          }
-          spinbox {
-            grid row: 0, column: 1
-            from 1
-            to 72
-            text <=> [self, :led_spacing]
-          }
-          
-          checkbutton {
-            grid row: 0, column: 2
-            variable <=> [self, :led_round_corner]
-          }
-          label {
-            grid row: 0, column: 3
-            text 'Round Corner'
-            
-            on('Button-1') do
-              self.led_round_corner = !led_round_corner
-            end
-          }
-        }
-      elsif @style == 'Sketch'
-        frame {
-          padding 0
-          
-          label {
-            grid row: 0, column: 0, column_weight: 0
-            text 'Line:'
-          }
-          spinbox {
-            grid row: 0, column: 1
-            from 1
-            to 72
-            text <=> [self, :sketch_line]
-          }
-        }
-      else
-        frame { # filler
-          padding 0
-          height 0
-          width 0
-        }
-      end
+      cryptopunks_gui_menu_bar(root: root_proxy, image: @image)
+      
+      image_frame(root: root_proxy, image: @image)
     }
   end
 end

data/app/model/image.rb

@@ -0,0 +1,187 @@
+class CryptopunksGui
+  module Model
+    class Image
+      PALETTES = ['Standard'] + (Palette8bit.constants).map(&:to_s).map {|palette| palette.split('_').map(&:capitalize).join(' ')}.reject { |palette| palette.include?(' ') }.sort
+      STYLES = ['Normal', 'Led', 'Sketch']
+      OUTPUT_LOCATION_DEFAULT = File.join(Dir.home, 'cryptopunks')
+      CONFIG_FILE = File.join(OUTPUT_LOCATION_DEFAULT, 'cryptopunks.yml')
+      COLLECTIONS_YAML_PATH = File.join(OUTPUT_LOCATION_DEFAULT, 'cryptopunks-collections.yml')
+      COLLECTIONS_YAML_URL = 'https://raw.githubusercontent.com/cryptopunksnotdead/cryptopunks-gui/master/cryptopunks-collections.yml'
+      COLLECTIONS_YAML_REPO_PATH = File.expand_path('../../cryptopunks-collections.yml', __dir__)
+      
+      attr_accessor :collection, :image_index, :zoom, :palette, :style, :led_spacing, :led_round_corner, :sketch_line, :flip, :mirror,
+                    :collection_size, :collections_map, :images, :image_location, :output_location, :config
+      
+      def initialize
+        initialize_output_location
+        initialize_collections_map
+        initialize_collection
+        load_config
+        initialize_defaults
+        observe_image_attribute_changes
+      end
+          
+      def collection_options
+        @collections_map.keys.select {|collection_name| @collections_map[collection_name][:enabled]}
+      end
+      
+      def palette_options
+        PALETTES
+      end
+      
+      def style_options
+        STYLES
+      end
+      
+      def initialize_output_location
+        @output_location = OUTPUT_LOCATION_DEFAULT
+        FileUtils.mkdir_p(@output_location)
+      end
+      
+      def initialize_collections_map(reset: false)
+        FileUtils.touch(COLLECTIONS_YAML_PATH)
+        @collections_map = reset ? {} : (YAML.load(File.read(COLLECTIONS_YAML_PATH)) || {})
+        new_collections_map = {}
+        begin
+          http_response = Net::HTTP.get_response(URI(COLLECTIONS_YAML_URL))
+          if http_response.is_a?(Net::HTTPSuccess)
+            new_collections_map = YAML.load(http_response.body)
+          else
+            raise "code: #{http_response.code} message: #{http_response.message}"
+          end
+        rescue StandardError, SocketError => e
+          puts "Failed to utilize collection YAML from: #{COLLECTIONS_YAML_URL}"
+          puts e.full_message
+          puts "Utilizing local collection YAML instead: #{COLLECTIONS_YAML_REPO_PATH}"
+          new_collections_map = YAML.load(File.read(COLLECTIONS_YAML_REPO_PATH)) rescue {}
+        end
+        @collections_map_observers ||= {}
+        new_collections_map.each do |collection_name, collection_options|
+          @collections_map[collection_name] ||= {}
+          original_collections_map_for_collection = @collections_map[collection_name]
+          @collections_map[collection_name] = @collections_map[collection_name]
+          @collections_map[collection_name].reverse_merge!(collection_options)
+          @collections_map[collection_name][:enabled] = true unless @collections_map[collection_name].has_key?(:enabled)
+          @collections_map_observers[collection_name] ||= Glimmer::DataBinding::Observer.proc { |value, key|
+            if key == :enabled
+              self.collection = @collections_map.find { |name, options| options[:enabled] }.first if key == :enabled && value == false && @collection == collection_name
+              notify_observers(:collection_options)
+            end
+            save_collections_map
+          }.tap {|o| o.observe(original_collections_map_for_collection)}
+        end
+        @collections_map_observer ||= Glimmer::DataBinding::Observer.proc { |collection_options, collection_name|
+          if collection_options.nil?
+            self.collection = @collections_map.find { |name, options| options[:enabled] }.first if @collection == collection_name
+            self.collection = collection_name if @collections_map.select { |name, options| options[:enabled] }.count == 0
+          end
+          notify_observers(:collection_options)
+          save_collections_map
+        }.tap {|o| o.observe(@collections_map)}
+        save_collections_map
+      end
+      
+      def save_collections_map
+        normalized_collections_map = Hash[@collections_map.map {|k,v| [k, v.to_h]}]
+        File.write(COLLECTIONS_YAML_PATH, YAML.dump(normalized_collections_map))
+      end
+      
+      def initialize_collection
+        return if @collection && @collection == @last_collection
+        @collection ||= @collections_map.keys.first
+        url = @collections_map[@collection][:url]
+        width = @collections_map[@collection][:width]
+        height = @collections_map[@collection][:height]
+        @image_file = File.join(OUTPUT_LOCATION_DEFAULT, File.basename(url))
+        File.binwrite(@image_file, Net::HTTP.get(URI(url))) unless File.exist?(@image_file)
+        @images ||= {}
+        @images[@collection] ||= Punks::Image::Composite.read(@image_file, width: width, height: height)
+        @last_collection = @collection
+        self.image_index = 0
+      end
+      
+      def load_config
+        FileUtils.touch(CONFIG_FILE)
+        @config = YAML.load(File.read(CONFIG_FILE)) || {}
+        @output_location = @config[:output_location]
+        @config[:output_location] = @output_location = OUTPUT_LOCATION_DEFAULT if @output_location.nil?
+      end
+      
+      def save_config
+        File.write(CONFIG_FILE, YAML.dump(@config))
+      end
+      
+      def initialize_defaults
+        @collection = @collections_map.keys.first
+        @zoom = 12
+        @palette = PALETTES.first
+        @style = STYLES.first
+        @led_spacing = 2
+        @led_round_corner = false
+        @sketch_line = 1
+        @mirror = false
+        @flip = false
+      end
+      
+      def observe_image_attribute_changes
+        observer = Glimmer::DataBinding::Observer.proc { generate_image }
+        observer.observe(self, :collection)
+        observer.observe(self, :image_index)
+        observer.observe(self, :zoom)
+        observer.observe(self, :palette)
+        observer.observe(self, :style)
+        observer.observe(self, :led_spacing)
+        observer.observe(self, :led_round_corner)
+        observer.observe(self, :sketch_line)
+        observer.observe(self, :mirror)
+        observer.observe(self, :flip)
+      end
+      
+      def generate_image
+        initialize_collection
+        return if @image_index.to_i >= @images[@collection].size
+        new_image_location = File.join(@output_location, "#{@collection.gsub(' ', '').downcase}-#{@image_index}#{"x#{@zoom}" if @zoom.to_i > 1}#{"-#{@palette.underscore}" if @palette != PALETTES.first}#{"-#{@style.underscore}" if @style != STYLES.first}#{"-spacing#{@led_spacing.to_i}" if @style == 'Led'}#{'-round-corner' if @style == 'Led' && @led_round_corner}#{"-line#{@sketch_line.to_i}" if @style == 'Sketch'}#{'-mirror' if @mirror}#{'-flip' if @flip}.png")
+        puts "Writing punk image to #{new_image_location}"
+        selected_punk = @images[@collection][@image_index.to_i]
+        selected_punk = selected_punk.change_palette8bit(Palette8bit.const_get(@palette.gsub(' ', '_').upcase.to_sym)) if @palette != PALETTES.first
+        @original_zoom = @zoom
+        if @previous_collection && @collection != @previous_collection && @collections_map[@collection][:width] != @collections_map[@previous_collection][:width]
+          @zoom = @collections_map[@collection][:default_zoom]
+        end
+        if @style != STYLES.first
+          style_options = {}
+          if @style == 'Led'
+            style_options[:spacing] = @led_spacing.to_i
+            style_options[:round_corner] = @led_round_corner
+          end
+          if @style == 'Sketch'
+            style_options[:line] = @sketch_line.to_i
+          end
+          selected_punk = selected_punk.send(@style.underscore, @zoom.to_i, **style_options)
+        end
+        selected_punk = selected_punk.mirror if @mirror
+        selected_punk = selected_punk.flip if @flip
+        selected_punk = selected_punk.zoom(@zoom.to_i) if @style == STYLES.first
+        selected_punk.save(new_image_location)
+        self.image_location = new_image_location
+        notify_observers(:zoom) if @zoom != @original_zoom
+        @previous_style = @style
+        @previous_collection = @collection
+      end
+      
+      def change_output_location(new_output_location)
+        @output_location = new_output_location
+        @config[:output_location] = @output_location
+        save_config
+        generate_image
+      end
+      
+      def reset_output_location
+        @output_location = OUTPUT_LOCATION_DEFAULT
+        @config[:output_location] = @output_location
+        save_config
+        generate_image
+      end
+    end
+  end
+end

data/app/view/help_dialog.rb

@@ -0,0 +1,31 @@
+class CryptopunksGui
+  module View
+    module HelpDialog
+      def help_dialog(root: )
+        toplevel(root) {
+          title 'CryptoPunks GUI - README.md'
+          width 800
+          height 600
+          escapable true
+          
+          help_dialog = text {
+            grid row: 0, column: 0, row_weight: 1, column_weight: 1
+            value help
+          }
+          
+          help_dialog_yscrollbar = scrollbar {
+            grid row: 0, column: 1
+            orient 'vertical'
+          }
+          help_dialog.yscrollbar help_dialog_yscrollbar.tk
+          
+          help_dialog_xscrollbar = scrollbar {
+            grid row: 1, column: 0, column_span: 2
+            orient 'horizontal'
+          }
+          help_dialog.xscrollbar help_dialog_xscrollbar.tk
+        }
+      end
+    end
+  end
+end

data/app/view/image_frame.rb

@@ -0,0 +1,145 @@
+class CryptopunksGui
+  module View
+    module ImageFrame
+      def image_frame(root: , image: )
+        image_label = output_location_entry = image_index_spinbox = style_options_container_frame = nil
+        
+        frame {
+          label {
+            text 'Collection:'
+          }
+          combobox {
+            readonly true
+            values <= [image, :collection_options]
+            text <=> [image, :collection]
+          }
+          
+          label {
+            text 'Image Index:'
+          }
+          image_index_spinbox = spinbox {
+            from 0
+            to image.images[image.collection].size - 1
+            text <=> [image, :image_index]
+          }
+          
+          label {
+            text 'Zoom:'
+          }
+          spinbox {
+            from 1
+            to 72
+            text <=> [image, :zoom]
+          }
+          
+          label {
+            text 'Palette:'
+          }
+          combobox {
+            readonly true
+            text <=> [image, :palette]
+          }
+          
+          label {
+            text 'Style:'
+          }
+          combobox {
+            readonly true
+            text <=> [image, :style, after_write: ->(val) {add_style_options(style_options_container_frame: style_options_container_frame, image: image)}]
+          }
+          
+          style_options_container_frame = frame {
+            padding 0
+          }
+          
+          frame {
+            padding 0
+            
+            checkbutton {
+              grid row: 0, column: 0, column_weight: 0
+              variable <=> [image, :mirror]
+            }
+            label {
+              grid row: 0, column: 1
+              text 'Mirror'
+              
+              on('Button-1') do
+                image.mirror = !image.mirror
+              end
+            }
+            
+            checkbutton {
+              grid row: 0, column: 2
+              variable <=> [image, :flip]
+            }
+            label {
+              grid row: 0, column: 3
+              text 'Flip'
+              
+              on('Button-1') do
+                image.flip = !image.flip
+              end
+            }
+          }
+          
+          label {
+            text 'Output Location:'
+          }
+          frame {
+            padding 0
+            
+            output_location_entry = entry {
+              grid row: 0, column: 0
+              readonly true
+              width 47
+            }
+            button {
+              grid row: 0, column: 1
+              text '...'
+              width 1.1
+              
+              on('command') do
+                change_output_location(root: root, image: image)
+              end
+            }
+          }
+          
+          image_label = label {
+            grid row_weight: 1
+          }
+        }
+        
+        register_image_frame_observers(image_label: image_label, output_location_entry: output_location_entry, image_index_spinbox: image_index_spinbox, image: image)
+      end
+      
+      def register_image_frame_observers(image_label: , output_location_entry: , image_index_spinbox: , image: )
+        Glimmer::DataBinding::Observer.proc do
+          image_label.image = output_location_entry.text = image.image_location
+        end.observe(image, :image_location)
+        
+        Glimmer::DataBinding::Observer.proc do
+          image_index_spinbox.to = image.images[image.collection].size - 1
+        end.observe(image, :collection)
+      end
+      
+      def add_style_options(style_options_container_frame: , image: )
+        style_options_container_frame.children.each(&:destroy)
+        style_options_container_frame.content {
+          case image.style
+          when 'Led'
+            led_style_options_frame(image: image)
+          when 'Sketch'
+            sketch_style_options_frame(image: image)
+          else
+            no_style_options_frame
+          end
+        }
+      end
+      
+      def change_output_location(root: , image: )
+        new_output_location = choose_directory(parent: root)
+        image.change_output_location(new_output_location) unless new_output_location.to_s.empty?
+      end
+    end
+  end
+end

data/app/view/menu_bar.rb

@@ -0,0 +1,88 @@
+# require_relative 'preferences_dialog'
+require_relative 'help_dialog'
+
+class CryptopunksGui
+  module View
+    module MenuBar
+#       include View::PreferencesDialog
+      include View::HelpDialog
+      
+      LICENSE = File.expand_path('../../LICENSE.txt', __dir__)
+      HELP = File.expand_path('../../README.md', __dir__)
+    
+      def cryptopunks_gui_menu_bar(root: , image: )
+        menu_bar {
+          if OS.mac?
+            menu(:application) {
+              menu_item(:about, label: 'About') {
+                accelerator OS.mac? ? 'Command+Shift+A' : 'Control+Alt+A'
+                
+                on('command') do
+                  show_about_dialog(root: root)
+                end
+              }
+              
+#               menu_item(:preferences) {
+#                 on('command') do
+#                   preferences_dialog(root: root, image: image)
+#                 end
+#               }
+            }
+          end
+          
+          menu(label: 'File', underline: 0) {
+            menu_item(label: 'Change Output Location...', underline: 7) {
+              accelerator OS.mac? ? 'Command+O' : 'Control+O'
+              
+              on('command') do
+                change_output_location(root: root, image: image) # assumes View::ImageFrame is mixed in
+              end
+            }
+            
+            menu_item(label: 'Reset Output Location', underline: 0) {
+              on('command') do
+                image.reset_output_location
+              end
+            }
+            
+            menu_item(:separator)
+            
+#             menu_item(label: 'Preferences...', underline: 0) {
+#               on('command') do
+#                 preferences_dialog(root: root, image: image)
+#               end
+#             }
+          
+            menu_item(:separator)
+            
+            menu_item(label: 'Exit', underline: 1) {
+              on('command') do
+                exit(0)
+              end
+            }
+          }
+          
+          menu(label: 'Help') {
+            menu_item(:help) {
+              on('command') do
+                help_dialog(root: root)
+              end
+            }
+          }
+        }
+      end
+          
+      def show_about_dialog(root: )
+        message_box(parent: root, title: 'CryptoPunks GUI', message: "CryptoPunks GUI\n\n#{license}")
+      end
+      
+      def license
+        @license ||= File.read(LICENSE)
+      end
+      
+      def help
+        @help ||= File.read(HELP)
+      end
+    end
+  end
+end

data/app/view/preferences_dialog.rb

@@ -0,0 +1,174 @@
+class CryptopunksGui
+  module View
+    module PreferencesDialog
+      def preferences_dialog(root: , image: )
+        toplevel(root) {
+          title 'Preferences'
+          width 1280
+          height 700
+          escapable true
+          
+          scrollbar_frame {
+            label {
+              grid row: 0, column: 0
+              text ''
+            }
+            
+            label {
+              grid row: 0, column: 1
+              text 'Collection Name'
+            }
+            
+            label {
+              grid row: 0, column: 2
+              text 'URL'
+              width 82
+            }
+            
+            label {
+              grid row: 0, column: 3
+              text 'Width'
+              width 3
+            }
+            
+            label {
+              grid row: 0, column: 4
+              text 'Height'
+              width 3
+            }
+            
+            label {
+              grid row: 0, column: 5
+              text "Default\nZoom"
+              width 3
+            }
+            
+            label {
+              grid row: 0, column: 6, column_span: 3
+              text 'Actions'
+            }
+            
+            image.collections_map.each_with_index do |pair, index|
+              collection_name, collection_options = pair
+              row = index + 1
+              
+              checkbutton { |cb|
+                grid row: row, column: 0
+                # TODO consider using hash_proxy object to bind more effectively
+                variable <= [image.collections_map[collection_name], :enabled]
+                
+                on('command') do
+                  collection_options[:enabled] = cb.variable
+                end
+              }
+              
+              entry {
+                grid row: row, column: 1
+                text collection_name
+              }
+              
+              entry {
+                grid row: row, column: 2
+                text collection_options[:url]
+                width 82
+              }
+              
+              spinbox {
+                grid row: row, column: 3
+                from 1
+                to 512
+                text collection_options[:width]
+                width 3
+              }
+              
+              spinbox {
+                grid row: row, column: 4
+                from 1
+                to 512
+                text collection_options[:height]
+                width 3
+              }
+              
+              spinbox {
+                grid row: row, column: 5
+                from 1
+                to 72
+                text collection_options[:default_zoom]
+                width 3
+              }
+              
+              button {
+                grid row: row, column: 6
+                text 'X'
+                width 1
+              }
+              button {
+                grid row: row, column: 7
+                text '^'
+                width 1
+              }
+              button {
+                grid row: row, column: 8
+                text 'v'
+                width 1
+              }
+            end
+          
+            row = image.collections_map.keys.size + 1
+            
+            checkbutton {
+              grid row: row, column: 0
+              
+            }
+            
+            entry {
+              grid row: row, column: 1
+              text ''
+            }
+            
+            entry {
+              grid row: row, column: 2
+              text ''
+              width 82
+            }
+            
+            spinbox {
+              grid row: row, column: 3
+              from 1
+              to 512
+              text '24'
+              width 3
+            }
+            
+            spinbox {
+              grid row: row, column: 4
+              from 1
+              to 512
+              text '24'
+              width 3
+            }
+            
+            spinbox {
+              grid row: row, column: 5
+              from 1
+              to 72
+              text '12'
+              width 3
+            }
+          }
+          
+          frame {
+            button {
+              text 'Reset'
+              
+              on('command') do
+                image.initialize_collections_map(reset: true)
+                # TODO cause an update to all collections
+              end
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/app/view/style_options_frame.rb

@@ -0,0 +1,60 @@
+class CryptopunksGui
+  module View
+    module StyleOptionsFrame
+      def led_style_options_frame(image: )
+        frame {
+          padding 0
+          
+          label {
+            grid row: 0, column: 0, column_weight: 0
+            text 'Spacing:'
+          }
+          spinbox {
+            grid row: 0, column: 1
+            from 1
+            to 72
+            text <=> [image, :led_spacing]
+          }
+          
+          checkbutton {
+            grid row: 0, column: 2
+            variable <=> [image, :led_round_corner]
+          }
+          label {
+            grid row: 0, column: 3
+            text 'Round Corner'
+            
+            on('Button-1') do
+              image.led_round_corner = !image.led_round_corner
+            end
+          }
+        }
+      end
+      
+      def sketch_style_options_frame(image: )
+        frame {
+          padding 0
+          
+          label {
+            grid row: 0, column: 0, column_weight: 0
+            text 'Line:'
+          }
+          spinbox {
+            grid row: 0, column: 1
+            from 1
+            to 72
+            text <=> [image, :sketch_line]
+          }
+        }
+      end
+      
+      def no_style_options_frame
+        frame { # filler
+          padding 0
+          height 0
+          width 0
+        }
+      end
+    end
+  end
+end

data/cryptopunks-gui.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: cryptopunks-gui 0.0.11 ruby app
+# stub: cryptopunks-gui 0.0.15 ruby app
 
 Gem::Specification.new do |s|
   s.name = "cryptopunks-gui".freeze
-  s.version = "0.0.11"
+  s.version = "0.0.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["app".freeze]
-  s.authors = ["Andy Maleh".freeze]
-  s.date = "2021-11-06"
+  s.authors = ["Andy Maleh".freeze, "Gerald Bauer".freeze]
+  s.date = "2021-12-05"
   s.description = "CryptoPunks GUI for Simplified Minting - Built with Glimmer DSL for Tk (requires ActiveTcl to run cryptopunks-gui command)".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["cryptopunks-gui".freeze]
@@ -26,15 +26,21 @@ Gem::Specification.new do |s|
     "README.md",
     "VERSION",
     "app/cryptopunks_gui.rb",
+    "app/model/image.rb",
+    "app/view/help_dialog.rb",
+    "app/view/image_frame.rb",
+    "app/view/menu_bar.rb",
+    "app/view/preferences_dialog.rb",
+    "app/view/style_options_frame.rb",
     "bin/cryptopunks-gui",
     "cryptopunks-gui.gemspec",
     "icons/cryptopunks-gui.icns",
     "icons/cryptopunks-gui.png"
   ]
-  s.homepage = "http://github.com/AndyObtiva/cryptopunks-gui".freeze
+  s.homepage = "http://github.com/cryptopunksnotdead/cryptopunks-gui".freeze
   s.licenses = ["MIT".freeze]
   s.post_install_message = "To launch CryptoPunks GUI, run command: cryptopunks-gui".freeze
-  s.rubygems_version = "3.2.22".freeze
+  s.rubygems_version = "3.1.4".freeze
   s.summary = "CryptoPunks GUI for Simplified Minting".freeze
 
   if s.respond_to? :specification_version then
@@ -42,7 +48,7 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<glimmer-dsl-tk>.freeze, ["~> 0.0.33"])
+    s.add_runtime_dependency(%q<glimmer-dsl-tk>.freeze, ["= 0.0.49"])
     s.add_runtime_dependency(%q<cryptopunks>.freeze, ["~> 2.0.1"])
     s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
     s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
@@ -50,7 +56,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_development_dependency(%q<rake-tui>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<glimmer-dsl-tk>.freeze, ["~> 0.0.33"])
+    s.add_dependency(%q<glimmer-dsl-tk>.freeze, ["= 0.0.49"])
     s.add_dependency(%q<cryptopunks>.freeze, ["~> 2.0.1"])
     s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])

metadata

@@ -1,29 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: cryptopunks-gui
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.15
 platform: ruby
 authors:
 - Andy Maleh
+- Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-06 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-tk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.33
+        version: 0.0.49
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.33
+        version: 0.0.49
 - !ruby/object:Gem::Dependency
   name: cryptopunks
   requirement: !ruby/object:Gem::Requirement
@@ -124,11 +125,17 @@ files:
 - README.md
 - VERSION
 - app/cryptopunks_gui.rb
+- app/model/image.rb
+- app/view/help_dialog.rb
+- app/view/image_frame.rb
+- app/view/menu_bar.rb
+- app/view/preferences_dialog.rb
+- app/view/style_options_frame.rb
 - bin/cryptopunks-gui
 - cryptopunks-gui.gemspec
 - icons/cryptopunks-gui.icns
 - icons/cryptopunks-gui.png
-homepage: http://github.com/AndyObtiva/cryptopunks-gui
+homepage: http://github.com/cryptopunksnotdead/cryptopunks-gui
 licenses:
 - MIT
 metadata: {}
@@ -147,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: CryptoPunks GUI for Simplified Minting