kita 0.5.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65792a880b15d5034614c329d66ffd741f76af6cec3d8b70079675296b911170
-  data.tar.gz: facfc0980b75a217513991ae019cba86a21185389f832b52e7f78ea37a1f1b98
+  metadata.gz: 374e9343d1932d06ba3aaf1c3fad9aa24a198ac091df0d18578b9c2abc2c67ee
+  data.tar.gz: e8be7430c81d1a69ded809b65f0d9ceda82700a101ba27b789d8f2fe914900cf
 SHA512:
-  metadata.gz: 711858ba735bf5c14e7ef006598d3957205cf04752138edd487af4a8432f2f843532b1de83d78c358769ce3e0aa6623b03a7d1405359890d44084f01ff8514ef
-  data.tar.gz: 95a46563053e6e80955b92b61f095e11bd5d7e1197000c2455ba62264170370a673d61381279f3d900a9b5c161b0ac31fe72049951027d9a6d7c69fa70005d86
+  metadata.gz: dc77d4e0d1141c774462a6dce08a47150b8ae6615db8ed538bbc539bb645a665f77aff07070a9b8f740c225cdce197c23d30bcafe9bde91040153bc8ee48c082
+  data.tar.gz: 3d4c9c5907482bf6347cd6e972a56b463af6dc40bd59b67a33fc5dc8d3dd55e7aa076137bd7f7764b3246bf52d53bf9491b8d507825a72ba4e967b288a0d12e3

data/CHANGELOG.md

@@ -9,6 +9,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## 2020-06-02
+### Added
+- Kita randomly selects between two different recordings for each kana
+
+## 2020-05-27
+### Changed
+- Selecting an incorrect answer for a Katakana question, shows the correct Katakana, rather than
+just repeating the Hiragana
+
 ## 2020-05-25
 ### Changed
 - Improved sounds, neither へ nor は are pronounced in their particle form (e and wa).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kita (0.5.5)
+    kita (0.6.1)
       config (~> 2.2)
       gir_ffi (~> 0.15.2)
       gstreamer (~> 3.4)

data/README.md

@@ -1 +1,5 @@
-# Kita
+# <img width="60" height="60" alt="Kita Logo" src="https://raw.githubusercontent.com/danbishop/kita/master/ui/kita-bordered.svg?sanitize=true"> Kita
+
+A small GTK app to help learn the Japanese kana systems.
+
+[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/kita)

data/kita.gemspec

@@ -7,12 +7,16 @@ Gem::Specification.new do |spec|
   spec.version       = Kita::VERSION
   spec.authors       = ['Dan Bishop']
   spec.email         = ['d@nbishop.uk']
-  spec.license       = 'GPLv3+'
+  spec.license       = 'GPL-3.0+'
 
   spec.summary       = 'A Japanese kana learning tool.'
-  spec.description   = 'A simple tool to help Japanese language learners with hiragana and katakana.'
+  spec.description   = <<-DESC
+    A simple GTK3 app to help Japanese language learners with Hiragana and Katakana. It introduces
+    users to the sounds of the kana and teaches basic recognition of both writing systems.
+  DESC
+
   spec.homepage      = 'https://www.danbishop.org'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/danbishop/kita'

data/lib/kita.rb

@@ -1,109 +1,74 @@
 # frozen_string_literal: true
+
 require 'gtk3'
 require_relative 'kita/audio'
 require_relative 'kita/config'
-require_relative 'kita/hiragana'
-require_relative 'kita/katakana'
+require_relative 'kita/menu'
+require_relative 'kita/question'
 require_relative 'kita/version'
 
 module Kita
   # Main application class
   class Application < Gtk::Application
+    include Menu
+
     def initialize
       super 'uk.danbishop.kita', :handles_open
-      builder_file = "#{File.expand_path(File.dirname(__dir__))}/ui/builder.ui"
-      # Construct a Gtk::Builder instance and load our UI description
-      @builder = Gtk::Builder.new(file: builder_file)
-      # Initiate Hiragana class
-      @hiragana = Hiragana.new
-      # Initiate Katakana class
-      @katakana = Katakana.new
-      @types = [@hiragana]
+      # Construct a Gtk::Builder instance
+      @builder = Gtk::Builder.new(file: "#{File.expand_path(File.dirname(__dir__))}/ui/builder.ui")
+      # Set menu toggles to match settings
+      menu_load
+      # Now connect signals
+      @builder.connect_signals { |handler| method(handler) }
+      # Initiate Question class
+      @question = Question.new
       @button_signals = {}
       @sound = Audio.new
       new_question
-      menu_setup
-      setup_new_question_button
-      setup_repeat_button
-      build_main_window
-    end
-
-    def menu_setup
-      setup_hiragana_switch
-      setup_katakana_switch
-      setup_sound_switch
       setup_about_box
+      build_main_window
     end
 
     def setup_about_box
-      about_box = @builder.get_object('about_box')
+      @ee = 0
+      about_box = @builder['about_box']
       about_box.version = VERSION
-      about_button = @builder.get_object('menu_about')
-      about_button.signal_connect('clicked') do
+      @builder['menu_about'].signal_connect('clicked') do
         about_box.run
         about_box.hide
       end
     end
 
-    def setup_new_question_button
-      new_question_button = @builder.get_object('new_question')
-      new_question_button.signal_connect('clicked') do
-        new_question
-      end
-    end
-
-    def setup_repeat_button
-      new_question_button = @builder.get_object('speak')
-      new_question_button.signal_connect('clicked') do
-        @sound.repeat
-      end
-    end
-
-    def setup_hiragana_switch
-      @hiragana_switch = @builder.get_object('hiragana_switch')
-      @hiragana_switch.signal_connect('notify::active') do
-        toggle_hiragana
-      end
-    end
-
-    def setup_katakana_switch
-      @katakana_switch = @builder.get_object('katakana_switch')
-      @katakana_switch.signal_connect('notify::active') do
-        toggle_katakana
-      end
-    end
-
-    def setup_sound_switch
-      @sound_switch = @builder.get_object('sound_switch')
-      @sound_switch.signal_connect('notify::active') do
-        toggle_sound
-      end
+    def repeat_button_click
+      @sound.repeat
     end
 
     def toggle_katakana
-      # TODO: Switch this to using Settings
-      @types = []
-      @types << @hiragana if @hiragana_switch.active?
-      @types << @katakana if @katakana_switch.active?
-      (@hiragana_switch.set_active(true) && @types = [@hiragana]) if @types.empty?
+      Settings.katakana = !Settings.katakana
+      (@builder['hiragana_switch'].set_active(true) && Settings.hiragana = true) if !Settings.katakana && !Settings.hiragana
+      save_settings
     end
 
     def toggle_hiragana
-      # TODO: Switch this to using Settings
-      @types = []
-      @types << @hiragana if @hiragana_switch.active?
-      @types << @katakana if @katakana_switch.active?
-      (@katakana_switch.set_active(true) && @types = [@katakana]) if @types.empty?
+      Settings.hiragana = !Settings.hiragana
+      (@builder['katakana_switch'].set_active(true) && Settings.katakana = true) if !Settings.katakana && !Settings.hiragana
+      save_settings
     end
 
     def toggle_sound
-      Settings.speak = !Settings.speak
+      Settings.sound = !Settings.sound
+      save_settings
+    end
+
+    def ee
+      @ee += 1
+      @sound.play('これは北です') if @ee == 3
     end
 
     def build_main_window
       signal_connect :activate do
         # Connect signal handlers to the constructed widgets
-        window = @builder.get_object('window')
+        window = @builder['window']
         window.signal_connect('destroy') { Gtk.main_quit }
         window.present
       end
@@ -111,20 +76,18 @@ module Kita
 
     def new_question
       reset_buttons
-      question = @types.sample.question
-      question_label = @builder.get_object('question')
-      question_label.set_markup("<span font='72'>#{question[:question]}</span>")
+      question = @question.new_question
+      @builder['question'].set_markup("<span font='72'>#{question[:question]}</span>")
       buttons = %w[a b c d]
       correct_button(buttons, question)
       wrong_buttons(buttons, question)
-      puts "Playing: #{question[:question].hiragana}"
-      @sound.play(question[:question].hiragana) if Settings.speak
+      @sound.play("#{question[:question].hiragana}#{[1, 2].sample}") if Settings.sound
     end
 
     def correct_button(buttons, question)
       # Choose random letter and remove it from array
       correct = buttons.delete(buttons.sample)
-      correct_button = @builder.get_object("answer_#{correct}")
+      correct_button = @builder["answer_#{correct}"]
       correct_button.set_label(question[:answer])
       correct_signal = correct_button.signal_connect('clicked') do
         new_question
@@ -144,14 +107,17 @@ module Kita
     def wrong_button_click(button)
       button.set_sensitive(false)
       label = button.child
-      label.set_markup("<span color='#d40000'>#{button.label} #{button.label.hiragana}</span>")
+      correction = @question.type == 'hiragana' ? button.label.hiragana : button.label.katakana
+      label.set_markup(
+        "<span color='#d40000'>#{button.label} #{correction}</span>"
+      )
     end
 
     def reset_buttons
       return nil if @button_signals.empty?
 
       @button_signals.each do |letter, signal|
-        button = @builder.get_object("answer_#{letter}")
+        button = @builder["answer_#{letter}"]
         button.signal_handler_disconnect(signal)
         button.set_sensitive(true)
       end

data/lib/kita/config.rb

@@ -1,8 +1,26 @@
 # frozen_string_literal: true
 
 require 'config'
+require 'fileutils'
 
-Config.load_and_set_settings(Config.setting_files('~/kita.yaml', 'kita'))
-Settings.speak = true
-Settings.hiragana = true
-Settings.katakana = false
+# Set config directory and create it if it doesn't exist
+CONF_DIR = "#{ENV['HOME']}/.config/kita"
+CONF_FILE = "#{CONF_DIR}/config.yaml"
+FileUtils.mkdir_p(CONF_DIR) unless File.exist?(CONF_DIR)
+
+def save_settings
+  puts 'Saved settings'
+  File.open(CONF_FILE, 'w') { |file| file.write(Settings.to_hash.to_yaml) }
+end
+
+if File.exist?(CONF_FILE)
+  puts 'Loaded settings'
+  Config.load_and_set_settings(CONF_FILE)
+else
+  puts 'No settings detected, first run? Using defaults.'
+  Config.load_and_set_settings(CONF_FILE)
+  Settings.speak = true
+  Settings.hiragana = true
+  Settings.katakana = false
+  save_settings
+end

data/lib/kita/hiragana.rb

@@ -48,6 +48,7 @@ class Hiragana
   def build_question(chars)
     {
       question: chars[0],
+      type: 'hiragana',
       answer: chars[0].romaji,
       choices: [
         chars[1].romaji,

data/lib/kita/katakana.rb

@@ -48,6 +48,7 @@ class Katakana
   def build_question(chars)
     {
       question: chars[0],
+      type: 'katakana',
       answer: chars[0].hiragana,
       choices: [
         chars[1].hiragana,

data/lib/kita/menu.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# Menu Related Functions
+module Menu
+  def menu_load
+    puts 'Setting up menu'
+    @builder['hiragana_switch'].set_active(Settings.hiragana)
+    @builder['katakana_switch'].set_active(Settings.katakana)
+    @builder['sound_switch'].set_active(Settings.sound)
+  end
+end

data/lib/kita/question.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative 'hiragana'
+require_relative 'katakana'
+
+# Question Class
+class Question
+  attr_accessor :type
+
+  def initialize
+    @hiragana = Hiragana.new
+    @katakana = Katakana.new
+  end
+
+  def new_question
+    question_types = []
+    question_types.push @hiragana if Settings.hiragana
+    question_types.push @katakana if Settings.katakana
+    question = question_types.sample.question
+    @type = question[:type]
+    question
+  end
+end

data/lib/kita/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kita
-  VERSION = '0.5.6'
+  VERSION = '0.9.0'
 end

data/snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: kita
-version: '0.5.5'
+version: '0.9.0'
 summary: Japanese learning tool
 description: |
   A simple tool to help Japanese language learners.
@@ -15,43 +15,19 @@ parts:
     plugin: ruby
     gems:
       - kita
-    ruby-version: 2.7.0
+    ruby-version: 2.7.1
     stage-packages:
-      - gobject-introspection
-      - gir1.2-atk-1.0
-      - gir1.2-atspi-2.0
-      - gir1.2-freedesktop
-      - gir1.2-gdkpixbuf-2.0
-      - gir1.2-glib-2.0
-      - gir1.2-gtk-3.0
-      - gir1.2-pango-1.0
-      - libcanberra-gtk3-0
       - libgstreamer1.0-0
-      - libglib2.0-0
+      - gstreamer1.0-plugins-base
       - libgirepository-1.0-1
       - gir1.2-gstreamer-1.0
-      - gstreamer1.0-plugins-base
-      # Just trying these to see if it makes sound work
-      - libpulse0
-      - libpulse-mainloop-glib0
-      - libslang2
-      - libgpm2
-      - libasound2
 
 apps:
   kita:
     command: bin/kita
     extensions: [gnome-3-28]
-    environment:
-      LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
     plugs:
-      - desktop
-      - desktop-legacy
-      - gsettings
-      - wayland
-      - x11
       - audio-playback
-      - home
     slots:
       - dbus-daemon
     common-id: uk.danbishop.kita

data/ui/builder.ui

@@ -30,7 +30,6 @@ Author: Dan Bishop
     <property name="can_focus">False</property>
     <property name="type_hint">dialog</property>
     <property name="program_name">Kita</property>
-    <property name="version"></property>
     <property name="copyright" translatable="yes">© 2020 Dan Bishop</property>
     <property name="comments" translatable="yes">A simple tool to help Japanese language learners.</property>
     <property name="website">danbishop.uk</property>
@@ -39,6 +38,7 @@ Author: Dan Bishop
     <property name="artists">Dan Bishop &lt;d@nbishop.uk&gt;</property>
     <property name="logo">kita.svg</property>
     <property name="license_type">gpl-3-0</property>
+    <signal name="show" handler="ee" swapped="no"/>
     <child type="titlebar">
       <placeholder/>
     </child>
@@ -99,6 +99,7 @@ Author: Dan Bishop
                 <property name="margin_top">5</property>
                 <property name="margin_bottom">5</property>
                 <property name="active">True</property>
+                <signal name="notify::active" handler="toggle_hiragana" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -142,6 +143,7 @@ Author: Dan Bishop
                 <property name="margin_left">10</property>
                 <property name="margin_top">5</property>
                 <property name="margin_bottom">5</property>
+                <signal name="notify::active" handler="toggle_katakana" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -186,6 +188,7 @@ Author: Dan Bishop
                 <property name="margin_top">5</property>
                 <property name="margin_bottom">5</property>
                 <property name="active">True</property>
+                <signal name="notify::active" handler="toggle_sound" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -245,6 +248,7 @@ Author: Dan Bishop
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="always_show_image">True</property>
+            <signal name="clicked" handler="new_question" swapped="no"/>
           </object>
         </child>
         <child>
@@ -252,6 +256,7 @@ Author: Dan Bishop
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
+            <signal name="clicked" handler="repeat_button_click" swapped="no"/>
             <child>
               <object class="GtkImage">
                 <property name="visible">True</property>

data/ui/kita-bordered.svg

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="50mm"
+   height="50mm"
+   viewBox="0 0 50 50"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="kita-bordered.svg">
+  <defs
+     id="defs2">
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter987"
+       inkscape:label="filter0" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Noise Fill"
+       id="filter1667">
+      <feTurbulence
+         type="fractalNoise"
+         baseFrequency="0.02 0.04"
+         numOctaves="5"
+         seed="1"
+         result="turbulence"
+         id="feTurbulence1651" />
+      <feComposite
+         in="SourceGraphic"
+         in2="turbulence"
+         operator="in"
+         result="composite1"
+         id="feComposite1653" />
+      <feColorMatrix
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 3 -1 "
+         result="color"
+         id="feColorMatrix1655" />
+      <feFlood
+         flood-opacity="1"
+         flood-color="rgb(21,40,57)"
+         result="flood"
+         id="feFlood1657" />
+      <feMerge
+         result="merge"
+         id="feMerge1663">
+        <feMergeNode
+           in="flood"
+           id="feMergeNode1659" />
+        <feMergeNode
+           in="color"
+           id="feMergeNode1661" />
+      </feMerge>
+      <feComposite
+         in2="SourceGraphic"
+         operator="in"
+         result="composite2"
+         id="feComposite1665" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="167.12072"
+     inkscape:cy="67.639258"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="3368"
+     inkscape:window-height="1376"
+     inkscape:window-x="72"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:pagecheckerboard="true" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-25.905403,-105.02035)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:1.25;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="46.869045"
+       y="115.57143"
+       id="text817"><tspan
+         sodipodi:role="line"
+         id="tspan815"
+         x="46.869045"
+         y="125.4403"
+         style="stroke-width:0.26458332" /></text>
+    <circle
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill"
+       id="path3017"
+       cx="50.905403"
+       cy="130.02036"
+       r="25" />
+    <circle
+       cy="130.02036"
+       cx="50.905403"
+       id="circle827"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.49000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill"
+       r="24.5" />
+    <g
+       aria-label="北"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38.4786377px;line-height:1.25;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:0.96196598"
+       id="text2913">
+      <path
+         d="m 42.82489,120.95864 h -9.080958 v 4.57896 h 9.080958 v 9.31183 c -3.886342,1.38523 -7.811163,2.73198 -10.427711,3.50155 l 2.039368,4.6944 c 2.501112,-1.03893 5.463967,-2.27024 8.388343,-3.54004 v 7.88812 h 4.80983 v -34.90012 h -4.80983 z m 16.007114,21.58651 c -1.385231,0 -1.616103,-0.26935 -1.616103,-2.42415 v -11.23576 c 3.770906,-1.96241 7.811163,-4.23265 11.197283,-6.54137 l -3.309163,-4.11722 c -2.116325,1.8085 -4.963744,3.9633 -7.88812,5.84876 v -11.54359 h -4.732873 v 27.51222 c 0,5.42549 1.269795,7.04159 5.65636,7.04159 h 5.156138 c 4.309607,0 5.425487,-2.84742 5.887231,-10.19684 -1.269795,-0.26935 -3.270684,-1.19283 -4.386565,-2.07784 -0.26935,6.19506 -0.500222,7.7342 -1.96241,7.7342 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:'Ubuntu Bold';fill:#d40000;stroke-width:0.96196598"
+         id="path827" />
+    </g>
+  </g>
+</svg>

data/ui/kita.svg

@@ -73,10 +73,10 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.7"
-     inkscape:cx="337.63766"
-     inkscape:cy="-256.1795"
+     inkscape:cx="72.63766"
+     inkscape:cy="-261.89379"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="text2913"
      showgrid="false"
      inkscape:window-width="3368"
      inkscape:window-height="1376"
@@ -96,7 +96,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -122,16 +122,14 @@
        cx="50.905403"
        cy="130.02036"
        r="25" />
-    <text
-       xml:space="preserve"
+    <g
+       aria-label="北"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38.4786377px;line-height:1.25;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:0.96196598"
-       x="31.512171"
-       y="144.46909"
-       id="text2913"><tspan
-         sodipodi:role="line"
-         id="tspan2911"
-         x="31.512171"
-         y="144.46909"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:'Ubuntu Bold';fill:#d40000;stroke-width:0.96196598">北</tspan></text>
+       id="text2913">
+      <path
+         d="m 42.82489,120.95864 h -9.080958 v 4.57896 h 9.080958 v 9.31183 c -3.886342,1.38523 -7.811163,2.73198 -10.427711,3.50155 l 2.039368,4.6944 c 2.501112,-1.03893 5.463967,-2.27024 8.388343,-3.54004 v 7.88812 h 4.80983 v -34.90012 h -4.80983 z m 16.007114,21.58651 c -1.385231,0 -1.616103,-0.26935 -1.616103,-2.42415 v -11.23576 c 3.770906,-1.96241 7.811163,-4.23265 11.197283,-6.54137 l -3.309163,-4.11722 c -2.116325,1.8085 -4.963744,3.9633 -7.88812,5.84876 v -11.54359 h -4.732873 v 27.51222 c 0,5.42549 1.269795,7.04159 5.65636,7.04159 h 5.156138 c 4.309607,0 5.425487,-2.84742 5.887231,-10.19684 -1.269795,-0.26935 -3.270684,-1.19283 -4.386565,-2.07784 -0.26935,6.19506 -0.500222,7.7342 -1.96241,7.7342 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:'Ubuntu Bold';fill:#d40000;stroke-width:0.96196598"
+         id="path827" />
+    </g>
   </g>
 </svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kita
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Dan Bishop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: config
@@ -94,7 +94,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description: A simple tool to help Japanese language learners with hiragana and katakana.
+description: |2
+      A simple GTK3 app to help Japanese language learners with Hiragana and Katakana. It introduces
+      users to the sounds of the kana and teaches basic recognition of both writing systems.
 email:
 - d@nbishop.uk
 executables:
@@ -118,159 +120,162 @@ files:
 - lib/kita/config.rb
 - lib/kita/hiragana.rb
 - lib/kita/katakana.rb
+- lib/kita/menu.rb
+- lib/kita/question.rb
 - lib/kita/version.rb
 - snap/gui/kita.desktop
 - snap/gui/kita.svg
 - snap/snapcraft.yaml
-- sounds/あ.ogg
+- sounds/あ1.ogg
 - sounds/あ2.ogg
-- sounds/い.ogg
+- sounds/い1.ogg
 - sounds/い2.ogg
-- sounds/う.ogg
+- sounds/う1.ogg
 - sounds/う2.ogg
-- sounds/え.ogg
+- sounds/え1.ogg
 - sounds/え2.ogg
-- sounds/お.ogg
+- sounds/お1.ogg
 - sounds/お2.ogg
-- sounds/か.ogg
+- sounds/か1.ogg
 - sounds/か2.ogg
-- sounds/が.ogg
+- sounds/が1.ogg
 - sounds/が2.ogg
-- sounds/き.ogg
+- sounds/き1.ogg
 - sounds/き2.ogg
-- sounds/ぎ.ogg
+- sounds/ぎ1.ogg
 - sounds/ぎ2.ogg
-- sounds/く.ogg
+- sounds/く1.ogg
 - sounds/く2.ogg
-- sounds/ぐ.ogg
+- sounds/ぐ1.ogg
 - sounds/ぐ2.ogg
-- sounds/け.ogg
+- sounds/け1.ogg
 - sounds/け2.ogg
-- sounds/げ.ogg
+- sounds/げ1.ogg
 - sounds/げ2.ogg
-- sounds/こ.ogg
+- sounds/こ1.ogg
 - sounds/こ2.ogg
 - sounds/これは北です.ogg
-- sounds/ご.ogg
+- sounds/ご1.ogg
 - sounds/ご2.ogg
-- sounds/さ.ogg
+- sounds/さ1.ogg
 - sounds/さ2.ogg
-- sounds/ざ.ogg
+- sounds/ざ1.ogg
 - sounds/ざ2.ogg
-- sounds/し.ogg
+- sounds/し1.ogg
 - sounds/し2.ogg
-- sounds/じ.ogg
+- sounds/じ1.ogg
 - sounds/じ2.ogg
-- sounds/す.ogg
+- sounds/す1.ogg
 - sounds/す2.ogg
-- sounds/ず.ogg
+- sounds/ず1.ogg
 - sounds/ず2.ogg
-- sounds/せ.ogg
+- sounds/せ1.ogg
 - sounds/せ2.ogg
-- sounds/ぜ.ogg
+- sounds/ぜ1.ogg
 - sounds/ぜ2.ogg
-- sounds/そ.ogg
+- sounds/そ1.ogg
 - sounds/そ2.ogg
-- sounds/ぞ.ogg
+- sounds/ぞ1.ogg
 - sounds/ぞ2.ogg
-- sounds/た.ogg
+- sounds/た1.ogg
 - sounds/た2.ogg
-- sounds/だ.ogg
+- sounds/だ1.ogg
 - sounds/だ2.ogg
-- sounds/ち.ogg
+- sounds/ち1.ogg
 - sounds/ち2.ogg
-- sounds/ぢ.ogg
+- sounds/ぢ1.ogg
 - sounds/ぢ2.ogg
-- sounds/つ.ogg
+- sounds/つ1.ogg
 - sounds/つ2.ogg
-- sounds/づ.ogg
+- sounds/づ1.ogg
 - sounds/づ2.ogg
-- sounds/て.ogg
+- sounds/て1.ogg
 - sounds/て2.ogg
-- sounds/で.ogg
+- sounds/で1.ogg
 - sounds/で2.ogg
-- sounds/と.ogg
+- sounds/と1.ogg
 - sounds/と2.ogg
-- sounds/ど.ogg
+- sounds/ど1.ogg
 - sounds/ど2.ogg
-- sounds/な.ogg
+- sounds/な1.ogg
 - sounds/な2.ogg
-- sounds/に.ogg
+- sounds/に1.ogg
 - sounds/に2.ogg
-- sounds/ぬ.ogg
+- sounds/ぬ1.ogg
 - sounds/ぬ2.ogg
-- sounds/ね.ogg
+- sounds/ね1.ogg
 - sounds/ね2.ogg
-- sounds/の.ogg
+- sounds/の1.ogg
 - sounds/の2.ogg
-- sounds/は.ogg
+- sounds/は1.ogg
 - sounds/は2.ogg
-- sounds/ば.ogg
+- sounds/ば1.ogg
 - sounds/ば2.ogg
-- sounds/ぱ.ogg
+- sounds/ぱ1.ogg
 - sounds/ぱ2.ogg
-- sounds/ひ.ogg
+- sounds/ひ1.ogg
 - sounds/ひ2.ogg
-- sounds/び.ogg
+- sounds/び1.ogg
 - sounds/び2.ogg
-- sounds/ぴ.ogg
+- sounds/ぴ1.ogg
 - sounds/ぴ2.ogg
-- sounds/ふ.ogg
+- sounds/ふ1.ogg
 - sounds/ふ2.ogg
-- sounds/ぶ.ogg
+- sounds/ぶ1.ogg
 - sounds/ぶ2.ogg
-- sounds/ぷ.ogg
+- sounds/ぷ1.ogg
 - sounds/ぷ2.ogg
-- sounds/へ.ogg
+- sounds/へ1.ogg
 - sounds/へ2.ogg
-- sounds/べ.ogg
+- sounds/べ1.ogg
 - sounds/べ2.ogg
-- sounds/ぺ.ogg
+- sounds/ぺ1.ogg
 - sounds/ぺ2.ogg
-- sounds/ほ.ogg
+- sounds/ほ1.ogg
 - sounds/ほ2.ogg
-- sounds/ぼ.ogg
+- sounds/ぼ1.ogg
 - sounds/ぼ2.ogg
-- sounds/ぽ.ogg
+- sounds/ぽ1.ogg
 - sounds/ぽ2.ogg
-- sounds/ま.ogg
+- sounds/ま1.ogg
 - sounds/ま2.ogg
-- sounds/み.ogg
+- sounds/み1.ogg
 - sounds/み2.ogg
-- sounds/む.ogg
+- sounds/む1.ogg
 - sounds/む2.ogg
-- sounds/め.ogg
+- sounds/め1.ogg
 - sounds/め2.ogg
-- sounds/も.ogg
+- sounds/も1.ogg
 - sounds/も2.ogg
-- sounds/や.ogg
+- sounds/や1.ogg
 - sounds/や2.ogg
-- sounds/ゆ.ogg
+- sounds/ゆ1.ogg
 - sounds/ゆ2.ogg
-- sounds/よ.ogg
+- sounds/よ1.ogg
 - sounds/よ2.ogg
-- sounds/ら.ogg
+- sounds/ら1.ogg
 - sounds/ら2.ogg
-- sounds/り.ogg
+- sounds/り1.ogg
 - sounds/り2.ogg
-- sounds/る.ogg
+- sounds/る1.ogg
 - sounds/る2.ogg
-- sounds/れ.ogg
+- sounds/れ1.ogg
 - sounds/れ2.ogg
-- sounds/ろ.ogg
+- sounds/ろ1.ogg
 - sounds/ろ2.ogg
-- sounds/わ.ogg
+- sounds/わ1.ogg
 - sounds/わ2.ogg
-- sounds/を.ogg
+- sounds/を1.ogg
 - sounds/を2.ogg
-- sounds/ん.ogg
+- sounds/ん1.ogg
 - sounds/ん2.ogg
 - test-notify.rb
 - ui/builder.ui
+- ui/kita-bordered.svg
 - ui/kita.svg
 homepage: https://www.danbishop.org
 licenses:
-- GPLv3+
+- GPL-3.0+
 metadata:
   homepage_uri: https://www.danbishop.org
   source_code_uri: https://github.com/danbishop/kita
@@ -283,7 +288,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="