kita 0.5.5 → 0.6.1

data/snap/snapcraft.yaml

@@ -1,10 +1,10 @@
 name: kita
-version: '0.5.5'
+version: '0.6.1'
 summary: Japanese learning tool
 description: |
   A simple tool to help Japanese language learners.
 
-confinement: devmode
+confinement: strict
 base: core18
 grade: stable
 license: GPL-3.0+
@@ -15,30 +15,25 @@ 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
 
 apps:
   kita:
     command: bin/kita
     extensions: [gnome-3-28]
     plugs:
-      - desktop
-      - wayland
       - audio-playback
-      # - pulseaudio
+    slots:
+      - dbus-daemon
     common-id: uk.danbishop.kita
+
+slots:
+  dbus-daemon:
+    interface: dbus
+    bus: session
+    name: 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>