kita 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b9ab67c3c2be81e1c63d0e5bba5ce903f27c5228b0dd6fe6b4051a032fa5371
-  data.tar.gz: 32021b813755a63059f0d4cb1464b636b374a6a758094bd86d448ba81c5f88dc
+  metadata.gz: e2587cd0c8afbec961b0a3323a1c6b136390ffba4de0950f97e749b613d090c2
+  data.tar.gz: 36590ce876e19db05a03d88bc508e8bcfbc6245a941d0a4c52acb956d67c4afc
 SHA512:
-  metadata.gz: d22c59c1e32b34cab29475370dd7bac3d12a486be5d6c404008647d5c27a2374ce07a1caa7ac027c0512969034427e5019f9df4229e809c42b9841e32ff3f3ba
-  data.tar.gz: b39f7cce3e1d969f72603c1e3aeb2edc1b0d440f4effa7fc16706d6d6b0d61c76dc5aa9ddfb585a4b3122b1bf3416e2ea09cd86b5d48128e610bb152a93165e8
+  metadata.gz: 397e143007adfe07eb99dc4ec01f6f7be68b37179dda85fd2a24f7b398be680d868c6540996d0c5c5fb5907873a2abba7167c0ef499ce3b57bd9a74de8da7c2e
+  data.tar.gz: bf44b7edcfd2e6f55bf6c189f110150f7176ebf0ffa61d15f43e83cfc5d8b78f36ad0d0ba0ecd28854c0ddd358f7188f231b08e5a9e0cf850f7e07c9d9a04000

data/CHANGELOG.md

@@ -9,6 +9,10 @@ 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

data/Gemfile.lock

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

data/lib/kita.rb

@@ -11,17 +11,15 @@ module Kita
   class Application < Gtk::Application
     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)
+      @builder = Gtk::Builder.new(file: "#{File.expand_path(File.dirname(__dir__))}/ui/builder.ui")
+      @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
 
@@ -33,58 +31,44 @@ module Kita
     end
 
     def setup_about_box
-      about_box = @builder.get_object('about_box')
+      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
+    def repeat_button_click
+      @sound.repeat
     end
 
     def setup_hiragana_switch
-      @hiragana_switch = @builder.get_object('hiragana_switch')
-      @hiragana_switch.signal_connect('notify::active') do
+      @builder['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
+      @builder['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
+      @builder['sound_switch'].signal_connect('notify::active') do
         toggle_sound
       end
     end
 
     def toggle_katakana
       Settings.katakana = !Settings.katakana
-      (@hiragana_switch.set_active(true) && Settings.hiragana = true) if !Settings.katakana && !Settings.hiragana
+      (@builder['hiragana_switch'].set_active(true) && Settings.hiragana = true) if !Settings.katakana && !Settings.hiragana
     end
 
     def toggle_hiragana
       Settings.hiragana = !Settings.hiragana
-      (@katakana_switch.set_active(true) && Settings.katakana = true) if !Settings.katakana && !Settings.hiragana
+      (@builder['katakana_switch'].set_active(true) && Settings.katakana = true) if !Settings.katakana && !Settings.hiragana
     end
 
     def toggle_sound
@@ -94,7 +78,7 @@ module Kita
     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
@@ -103,19 +87,17 @@ module Kita
     def new_question
       reset_buttons
       question = @question.new_question
-      question_label = @builder.get_object('question')
-      question_label.set_markup("<span font='72'>#{question[:question]}</span>")
+      @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.speak
     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
@@ -145,7 +127,7 @@ module Kita
       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/version.rb

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

data/snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: kita
-version: '0.5.6'
+version: '0.5.7'
 summary: Japanese learning tool
 description: |
   A simple tool to help Japanese language learners.

data/ui/builder.ui

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2
+<!-- Generated with glade 3.22.2 
 
 Copyright (C)
 
@@ -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>
@@ -245,6 +244,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 +252,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>
@@ -312,60 +313,60 @@ Author: Dan Bishop
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkButton" id="answer_a">
-                <property name="label">a</property>
+              <object class="GtkButton" id="answer_d">
+                <property name="label">d</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="hexpand">True</property>
-                <accelerator key="a" signal="clicked"/>
-                <accelerator key="KP_1" signal="clicked"/>
-                <accelerator key="1" signal="clicked"/>
+                <accelerator key="4" signal="clicked"/>
+                <accelerator key="KP_4" signal="clicked"/>
+                <accelerator key="f" signal="clicked"/>
               </object>
               <packing>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="answer_b">
-                <property name="label">b</property>
+              <object class="GtkButton" id="answer_c">
+                <property name="label">c</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="hexpand">True</property>
-                <accelerator key="s" signal="clicked"/>
-                <accelerator key="KP_2" signal="clicked"/>
-                <accelerator key="2" signal="clicked"/>
+                <accelerator key="3" signal="clicked"/>
+                <accelerator key="KP_3" signal="clicked"/>
+                <accelerator key="d" signal="clicked"/>
               </object>
               <packing>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="answer_c">
-                <property name="label">c</property>
+              <object class="GtkButton" id="answer_b">
+                <property name="label">b</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="hexpand">True</property>
-                <accelerator key="d" signal="clicked"/>
-                <accelerator key="KP_3" signal="clicked"/>
-                <accelerator key="3" signal="clicked"/>
+                <accelerator key="2" signal="clicked"/>
+                <accelerator key="KP_2" signal="clicked"/>
+                <accelerator key="s" signal="clicked"/>
               </object>
               <packing>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="answer_d">
-                <property name="label">d</property>
+              <object class="GtkButton" id="answer_a">
+                <property name="label">a</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="hexpand">True</property>
-                <accelerator key="f" signal="clicked"/>
-                <accelerator key="KP_4" signal="clicked"/>
-                <accelerator key="4" signal="clicked"/>
+                <accelerator key="1" signal="clicked"/>
+                <accelerator key="KP_1" signal="clicked"/>
+                <accelerator key="a" signal="clicked"/>
               </object>
               <packing>
                 <property name="position">0</property>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kita
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Dan Bishop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: config
@@ -125,148 +125,148 @@ files:
 - 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