cryptopunks-gui 0.0.10 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 500d88447b105a1383d4de25cecaf39b5d805420edab28638b157a11e243422a
-  data.tar.gz: 4af0fa654391c4208f330d221b39d7b5b8741d42464c1a57db0d4246a04c640e
+  metadata.gz: 11b7dbad37423ad303ed7584a4859b820cf609157b07aebfc69845e155a8e85d
+  data.tar.gz: a09d1fe0fe847726c50c25d226d075d258e7cd26039d15e88decfedfc5e8fcb3
 SHA512:
-  metadata.gz: 8f14974ea5229ad9bafea8dbbb15f9e874ccddd4107ba600ca5731fa2eb34b4a06742a7a3d5b25fc42cc1d1d9dcde264d1f592a2cbf150d88dfaae1d22bf74e9
-  data.tar.gz: 8386c9af297624919012fc389925b968cb0d76c501b55407dc8be9c9c79cf6f11274b9792ffc8b965cd1ee205ef05fcb8a0a7160a9ecf0ef8a03bf13aa470fad
+  metadata.gz: 129fc97f012dd2c6a0593ee8a5769bcc23786d87ee35553565ada057c3faac1c61f2e5b910af3ed07413093c6a32019d68564391476e7300f7b54be826f03311
+  data.tar.gz: 558d47cfe642d0cc010ece09cb7b93bfa0299e47865fb293e48ff8c166ce2876daa8ea6f6ae45a28575e666c3f3916ff3331cf1f2ce91d6f782b63c480a4b2c4

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Change Log
 
+## 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/cryptopunksnotdead/cryptopunks-gui/master/cryptopunks-collections.yml
+- New Green Punks, Clown Punks, and Bubble Gum Punks collections
+
 ## 0.0.10
 
 - Fix issue with cryptopunks GUI erroring when cancelling selection of a new output location (or getting blocked by OS for security reasons)

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.10
+# <img src="https://raw.githubusercontent.com/cryptopunksnotdead/cryptopunks-gui/master/icons/cryptopunks-gui.png" height=85 /> CryptoPunks GUI 0.0.14
 ## 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).
 
@@ -10,10 +10,6 @@ Minted cryptopunks are stored at `~/cryptopunks/` by default ([output location c
 
 ![Screenshot](/screenshots/cryptopunks-gui-screenshot.png)
 
-[<img src="https://raw.githubusercontent.com/AndyObtiva/cryptopunks-gui/master/icons/cryptopunks-gui.png" height=40 /> Download DMG installer for Mac (Catalina x64 and older)](https://www.dropbox.com/s/gfh7e9osw30sjiq/CryptoPunks%20GUI.dmg?dl=1)
-
-If your machine is incompatible with the downloadable DMG package, you may follow [Packaging](#packaging) instructions to produce your own machine compatible installer.
-
 ## Prerequities
 
 - [Tcl/Tk (ActiveTcl)](https://tkdocs.com/tutorial/install.html)
@@ -22,14 +18,14 @@ If your machine is incompatible with the downloadable DMG package, you may follo
 
 ## 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.10
+gem install cryptopunks-gui -v0.0.14
 ```
 
 Afterwards, run app via:
@@ -43,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:
@@ -77,7 +73,13 @@ ruby app/cryptopunks_gui.rb
 
 Change collection to pick a different collection of images.
 
-There are currently 38 available collections (from https://github.com/cryptopunksnotdead/awesome-24px):
+![Screenshot](/screenshots/cryptopunks-gui-screenshot-collection-zombies.png)
+
+Image collections are configured in [cryptopunks-collections.yml](/cryptopunks-collections.yml).
+
+If you cloned the project locally, you may edit [cryptopunks-collections.yml](/cryptopunks-collections.yml) to add/remove collections.
+
+There are 41 available collections (mostly from https://github.com/cryptopunksnotdead/awesome-24px):
 - [Punks](https://raw.githubusercontent.com/larvalabs/cryptopunks/master/punks.png) ![image examples](https://github.com/cryptopunksnotdead/awesome-24px/raw/master/i/punks-strip.png)
 - [Mohawks](https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/mohawks.png) ![image examples](https://github.com/cryptopunksnotdead/awesome-24px/raw/master/i/mohawks-strip.png)
 - [Blondies](https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/blondies.png) ![image examples](https://github.com/cryptopunksnotdead/awesome-24px/raw/master/i/blondies-strip.png)
@@ -85,6 +87,9 @@ There are currently 38 available collections (from https://github.com/cryptopunk
 - [Apes](https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/apes.png) ![image examples](https://github.com/cryptopunksnotdead/awesome-24px/raw/master/i/apes-strip.png)
 - [Aliens](https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/aliens.png) ![image examples](https://github.com/cryptopunksnotdead/awesome-24px/raw/master/i/aliens-strip.png)
 - [Golden Punks](https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/goldenpunks.png) ![image examples](https://github.com/cryptopunksnotdead/awesome-24px/raw/master/i/goldenpunks-strip.png)
+- [Green Punks](https://i.redd.it/uwrsn2lrr3o71.png)
+- [Clown Punks](https://i.redd.it/ut0kk25heex71.png)
+- [Bubble Gum Punks](https://i.redd.it/hjddd1s8ydx71.png)
 - [Halloween Punks](https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/halloweenpunks.png) ![image examples](https://github.com/cryptopunksnotdead/awesome-24px/raw/master/i/halloweenpunks-strip.png)
 - [Scream Punks](https://raw.githubusercontent.com/cryptopunksnotdead/cryptopunks/master/halloween/i/screampunks%402x.png)
 - [Jack 'O' Lantern Punks](https://raw.githubusercontent.com/cryptopunksnotdead/cryptopunks/master/halloween/i/jackpunks%402x.png)
@@ -117,8 +122,6 @@ There are currently 38 available collections (from https://github.com/cryptopunk
 - [Punk Rocks](https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/punkrocks.png) ![image examples](https://github.com/cryptopunksnotdead/awesome-24px/raw/master/i/punkrocks-strip.png)
 - [Tulips](https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/tulips.png) ![image examples](https://github.com/cryptopunksnotdead/awesome-24px/raw/master/i/tulips-strip.png)
 
-![Screenshot](/screenshots/cryptopunks-gui-screenshot-collection-zombies.png)
-
 ![Screenshot](/screenshots/cryptopunks-gui-screenshot-collection-apes.png)
 
 ![Screenshot](/screenshots/cryptopunks-gui-screenshot-collection-scream-punks.png)
@@ -211,45 +214,6 @@ You may select a new output location by clicking on the `...` button.
 
 ![Screenshot](/screenshots/cryptopunks-gui-screenshot-output-location.png)
 
-## Packaging
-
-Assuming you have setup all prerequisites and cloned the project locally, you can package the project files, Ruby, gem dependencies, and ActiveTcl (Tcl/Tk) into fully self-contained native executable bundles for the Mac.
-
-### Packaging Prerequisites
-
-Packaging is currently supported on Mac only.
-
-- [Platypus](https://github.com/sveinbjornt/Platypus): Install Platypus 5.3
-- [Platypus Command Line Tool](https://github.com/sveinbjornt/Platypus/blob/master/Documentation/Documentation.md#show-shell-command): Run Platypus GUI -> Go to Preferences -> Install Command Line Tool.
-
-Finally, ensure the `platypus` command is available in the terminal by simply running:
-
-```
-platypus --version
-```
-
-Output:
-
-```
-platypus version 5.3
-```
-
-### Packaging Commands
-
-To package this app as both a Mac native executable (APP file) and a Mac native installer (DMG file), run this command (produces packages under `~/Applications`):
-
-```
-bin/package-mac
-```
-
-To package a Mac native executable only (quicker for local APP use without distribution), run:
-
-```
-bin/package-mac-app
-```
-
-![Screenshot](/screenshots/cryptopunks-gui-package-screenshot-mac-dmg.png)
-
 ## TODO
 
 [TODO.md](TODO.md)
@@ -272,7 +236,7 @@ bin/package-mac-app
 
 [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.10
+0.0.14

data/app/cryptopunks_gui.rb

@@ -1,344 +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']
-  COLLECTION_URL_MAP = {
-    'Punks' => {url: 'https://raw.githubusercontent.com/larvalabs/cryptopunks/master/punks.png', width: 24, height: 24, default_zoom: 12},
-    'Mohawks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/mohawks.png', width: 24, height: 24, default_zoom: 12},
-    'Blondies' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/blondies.png', width: 24, height: 24, default_zoom: 12},
-    'Zombies' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/zombies.png', width: 24, height: 24, default_zoom: 12},
-    'Apes' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/apes.png', width: 24, height: 24, default_zoom: 12},
-    'Aliens' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/aliens.png', width: 24, height: 24, default_zoom: 12},
-    'Golden Punks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/goldenpunks.png', width: 24, height: 24, default_zoom: 12},
-    'Halloween Punks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/halloweenpunks.png', width: 24, height: 24, default_zoom: 12},
-    'Scream Punks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/cryptopunks/master/halloween/i/screampunks%402x.png', width: 48, height: 48, default_zoom: 6},
-    "Jack 'O' Lantern Punks" => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/cryptopunks/master/halloween/i/jackpunks%402x.png', width: 48, height: 48, default_zoom: 6},
-    'Joker Punks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/cryptopunks/master/halloween/i/jokerpunks%402x.png', width: 48, height: 48, default_zoom: 6},
-    'Frankenstein Punks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/cryptopunks/master/halloween/i/frankensteinpunks%402x.png', width: 48, height: 48, default_zoom: 6},
-    'Front Punks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/frontpunks.png', width: 24, height: 24, default_zoom: 12},
-    'More Punks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/morepunks.png', width: 24, height: 24, default_zoom: 12},
-    'Expansion Punks' => {url: 'https://expansionpunks.com/provenance/expansionpunks.png', width: 24, height: 24, default_zoom: 12},
-    'Avalanche Punks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/avalanchepunks.png', width: 24, height: 24, default_zoom: 12},
-    'International Punks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/intlpunks.png', width: 24, height: 24, default_zoom: 12},
-    'Ape Punks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/apepunks.png', width: 24, height: 24, default_zoom: 12},
-    'Alien Clan' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/alienclan.png', width: 24, height: 24, default_zoom: 12},
-    'Bored Apes' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/boredapes.png', width: 28, height: 28, default_zoom: 10},
-    'Bored Apes Blue' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/boredapes_blue.png', width: 28, height: 28, default_zoom: 10},
-    'Bored Apes Red' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/boredapes_red.png', width: 28, height: 28, default_zoom: 10},
-    'Bored Apes Neon Glow' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/boredapes_neon_glow.png', width: 28, height: 28, default_zoom: 10},
-    'Bored Apes Stars and Stripes' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/boredapes_stars_and_stripes.png', width: 28, height: 28, default_zoom: 10},
-    'Bored Apes Acid' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/boredapes_acid.png', width: 28, height: 28, default_zoom: 10},
-    'Cool Cats' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/coolcats.png', width: 24, height: 24, default_zoom: 12},
-    'Cool Cats Mohawks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/coolcats_mohawks.png', width: 24, height: 24, default_zoom: 12},
-    'Cool Cats Ninjas' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/coolcats_ninjas.png', width: 24, height: 24, default_zoom: 12},
-    'Cool Cats TV Heads' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/coolcats_tvheads.png', width: 24, height: 24, default_zoom: 12},
-    'Cool Cats Pirates' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/coolcats_pirates.png', width: 24, height: 24, default_zoom: 12},
-    'Cool Cats Unicorns' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/coolcats_unicorns.png', width: 24, height: 24, default_zoom: 12},
-    'Cool Cats Dragons' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/coolcats_dragons.png', width: 24, height: 24, default_zoom: 12},
-    'Cool Cats Frogs' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/coolcats_frogs.png', width: 24, height: 24, default_zoom: 12},
-    'Pudgy Penguins' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/pudgypenguins.png', width: 24, height: 24, default_zoom: 12},
-    'Dodge' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/dodge.png', width: 24, height: 24, default_zoom: 12},
-    'Rocks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/rocks.png', width: 24, height: 24, default_zoom: 12},
-    'Punk Rocks' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/programming-cryptopunks/master/i/punkrocks.png', width: 24, height: 24, default_zoom: 12},
-    'Tulips' => {url: 'https://raw.githubusercontent.com/cryptopunksnotdead/awesome-24px/master/collection/tulips.png', width: 24, height: 24, default_zoom: 12},
-  }
-  
-  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_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
-    COLLECTION_URL_MAP.keys
+    @image.image_index = 0
   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_collection
-    return if @collection && @collection == @last_collection
-    @collection ||= COLLECTION_URL_MAP.keys.first
-    url = COLLECTION_URL_MAP[@collection][:url]
-    width = COLLECTION_URL_MAP[@collection][:width]
-    height = COLLECTION_URL_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 = COLLECTION_URL_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 && COLLECTION_URL_MAP[@collection][:width] != COLLECTION_URL_MAP[@previous_collection][:width]
-      @zoom = COLLECTION_URL_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