Release 2.0.0 (#44)

zelikos · Nov 13, 2020 · 36b62b1 · 36b62b1
1 parent d33ede1
commit 36b62b1
Show file tree

Hide file tree

Showing 14 changed files with 112 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
   <a href="https://appcenter.elementary.io/com.github.zelikos.rannum"><img src="https://appcenter.elementary.io/badge.svg" alt="Get it on AppCenter" /></a>
 </p>
 
-| ![Screenshot](data/screenshot_light.png) | ![Screenshot](data/screenshot_dark.png) |
+| ![Screenshot](data/screenshot2.png) | ![Screenshot](data/screenshot3.png) |
 |------------------------------------------|-----------------------------------------|
 
 ## Roll the dice
@@ -27,7 +27,6 @@ You'll need the following dependencies to build Roll-It yourself:
 
 * libgranite-dev
 * libgtk-3-dev
-* libhandy-1-dev
 * meson
 * valac
 
@@ -37,16 +36,16 @@ If running [elementary OS], the simplest way is to install the elementary SDK:
 sudo apt install elementary-sdk
 ```
 
-To only install the required dependencies, or to install them on Ubuntu (20.10 or later):
+To only install the required dependencies, or to install them on Ubuntu:
 
 ```shell
-sudo apt install libgranite-dev libgtk-3-dev libhandy-1-dev meson valac
+sudo apt install libgranite-dev libgtk-3-dev meson valac
 ```
 
 To install them on Fedora:
 
 ```shell
-sudo dnf install granite-devel gtk3-devel libhandy1-devel meson vala
+sudo dnf install granite-devel gtk3-devel meson vala
 ```
 
 To build and install Roll-It:

diff --git a/data/com.github.zelikos.rannum.appdata.xml.in b/data/com.github.zelikos.rannum.appdata.xml.in
@@ -8,21 +8,42 @@
   <summary>Roll the dice</summary>
   <description>
     <p>Simulate the results of rolling a die.</p>
-
-    <p>Roll a six-sided die by default, or get the results of rolling a custom die with up to one-hundred sides.</p>
+
+    <p>Quickly switch between a six-sided, ten-sided, or twenty-sided die, or roll a custom die with up to one-hundred sides.</p>
+
+    <p>Keyboard shortcuts:</p>
+    <ul>
+      <li>Roll the dice with Ctrl+R</li>
+      <li>Bring up the dice menu with Ctrl+D</li>
+      <li>Use Ctrl+1, 2, or 3 to select the first, second, or third dice option</li>
+      <li>Hit Ctrl+4 to select the custom die option and focus the number entry when the menu is visible</li>
+      <li>Toggle the roll history pane with Ctrl+H</li>
+      <li>Clear roll history with Alt+C</li>
+    </ul>
   </description>
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/zelikos/rannum/main/data/screenshot_light.png</image>
+      <image>https://raw.githubusercontent.com/zelikos/rannum/main/data/screenshot1.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/zelikos/rannum/main/data/screenshot_dark.png</image>
+      <image>https://raw.githubusercontent.com/zelikos/rannum/main/data/screenshot2.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/zelikos/rannum/main/data/screenshot_menu.png</image>
+      <image>https://raw.githubusercontent.com/zelikos/rannum/main/data/screenshot3.png</image>
     </screenshot>
   </screenshots>
   <releases>
+    <release version="2.0.0" date="2020-11-13">
+      <description>
+        <p>History and Keyboard Shortcuts</p>
+        <ul>
+          <li>Previous rolls are now stored in a new roll history pane</li>
+          <li>Many keyboard shortcuts have been added</li>
+          <li>Custom die value is now saved regardless of the last-selected die option</li>
+          <li>More code cleanups and refactoring on the backend</li>
+        </ul>
+      </description>
+    </release>
     <release version="1.2.2" date="2020-10-10">
       <description>
         <p>Visual Tweaks and Backend Stuff</p>

diff --git a/data/screenshot1.png b/data/screenshot1.png
diff --git a/data/screenshot2.png b/data/screenshot2.png
diff --git a/data/screenshot3.png b/data/screenshot3.png
diff --git a/data/screenshot_dark.png b/data/screenshot_dark.png
diff --git a/data/screenshot_light.png b/data/screenshot_light.png
diff --git a/data/screenshot_menu.png b/data/screenshot_menu.png
diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 project('com.github.zelikos.rannum',
     'vala', 'c',
-    version: '1.2.2')
+    version: '2.0.0')
 
 gnome = import('gnome')
 i18n = import('i18n')
@@ -21,8 +21,8 @@ asresources = gnome.compile_resources(
 
 dependencies = [
     dependency('gtk+-3.0'),
-    dependency('granite'),
-    dependency('libhandy-1')
+    dependency('granite')
+    #dependency('libhandy-1')
 ]
 
 executable(

diff --git a/po/POTFILES b/po/POTFILES
@@ -1,3 +1,5 @@
 src/Widgets/Menu.vala
 src/Widgets/NumDisplay.vala
-src/Widgets/Window.vala
+src/Widgets/RollHistory.vala
+src/Widgets/Buttons/PreviousRoll.vala
+src/MainWindow.vala
diff --git a/po/com.github.zelikos.rannum.pot b/po/com.github.zelikos.rannum.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.zelikos.rannum\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-13 20:38+0100\n"
+"POT-Creation-Date: 2020-11-13 15:51-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,26 +17,42 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/Widgets/Menu.vala:28
-msgid "Light"
+#: src/Widgets/Menu.vala:35
+msgid "d6"
 msgstr ""
 
-#: src/Widgets/Menu.vala:29
-msgid "Dark"
+#: src/Widgets/Menu.vala:36
+msgid "d10"
 msgstr ""
 
 #: src/Widgets/Menu.vala:37
-msgid "Max Roll:"
+msgid "d20"
+msgstr ""
+
+#: src/Widgets/Menu.vala:101
+msgid "Dice Settings"
 msgstr ""
 
 #: src/Widgets/NumDisplay.vala:33
 msgid "Ready to Roll"
 msgstr ""
 
-#: src/Widgets/Window.vala:50
-msgid "Settings"
+#: src/Widgets/RollHistory.vala:37
+msgid "Clear"
+msgstr ""
+
+#: src/Widgets/RollHistory.vala:46
+msgid "Clear History"
+msgstr ""
+
+#: src/Widgets/Buttons/PreviousRoll.vala:54
+msgid "Copied"
+msgstr ""
+
+#: src/MainWindow.vala:54
+msgid "Roll History"
 msgstr ""
 
-#: src/Widgets/Window.vala:64
+#: src/MainWindow.vala:61
 msgid "Roll"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.zelikos.rannum\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-13 20:38+0100\n"
+"POT-Creation-Date: 2020-11-13 15:51-0500\n"
 "PO-Revision-Date: 2020-02-13 20:30+0100\n"
 "Last-Translator: Nathan Bonnemains (@NathanBnm)\n"
 "Language-Team: none\n"
@@ -17,26 +17,52 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/Widgets/Menu.vala:28
-msgid "Light"
-msgstr "Thème clair"
+#: src/Widgets/Menu.vala:35
+msgid "d6"
+msgstr ""
 
-#: src/Widgets/Menu.vala:29
-msgid "Dark"
-msgstr "Thème sombre"
+#: src/Widgets/Menu.vala:36
+msgid "d10"
+msgstr ""
 
 #: src/Widgets/Menu.vala:37
-msgid "Max Roll:"
-msgstr "Nombre max :"
+msgid "d20"
+msgstr ""
+
+#: src/Widgets/Menu.vala:101
+#, fuzzy
+msgid "Dice Settings"
+msgstr "Paramètres"
 
 #: src/Widgets/NumDisplay.vala:33
 msgid "Ready to Roll"
 msgstr "Prêt à lancer le dé"
 
-#: src/Widgets/Window.vala:50
-msgid "Settings"
-msgstr "Paramètres"
+#: src/Widgets/RollHistory.vala:37
+msgid "Clear"
+msgstr ""
+
+#: src/Widgets/RollHistory.vala:46
+msgid "Clear History"
+msgstr ""
+
+#: src/Widgets/Buttons/PreviousRoll.vala:54
+msgid "Copied"
+msgstr ""
+
+#: src/MainWindow.vala:54
+msgid "Roll History"
+msgstr ""
 
-#: src/Widgets/Window.vala:64
+#: src/MainWindow.vala:61
 msgid "Roll"
 msgstr "Lancer le dé"
+
+#~ msgid "Light"
+#~ msgstr "Thème clair"
+
+#~ msgid "Dark"
+#~ msgstr "Thème sombre"
+
+#~ msgid "Max Roll:"
+#~ msgstr "Nombre max :"
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -16,12 +16,14 @@
  * Authored by Patrick Csikos <[email protected]>
  */
 
-public class Rollit.MainWindow : Hdy.Window {
+// public class Rollit.MainWindow : Hdy.Window {
+public class Rollit.MainWindow : Gtk.ApplicationWindow {
 
     private Rollit.Menu menu_button;
     private Rollit.NumDisplay number_display;
     private Rollit.RollHistory roll_history;
-    private Hdy.HeaderBar header;
+    // private Hdy.HeaderBar header;
+    private Gtk.HeaderBar header;
     private Gtk.Button roll_button;
     private Gtk.Button history_button;
     private Gtk.Box action_buttons;
@@ -38,11 +40,12 @@ public class Rollit.MainWindow : Hdy.Window {
     }
 
     construct {
-        Hdy.init ();
+        // Hdy.init ();
 
         restore_state ();
 
-        header = new Hdy.HeaderBar () {
+        // header = new Hdy.HeaderBar () {
+        header = new Gtk.HeaderBar () {
             title = "Roll-It",
             show_close_button = true
         };
@@ -83,10 +86,11 @@ public class Rollit.MainWindow : Hdy.Window {
         hp.pack2 (roll_history, false, false);
 
         var grid = new Gtk.Grid ();
-        grid.attach (header, 0, 0);
-        grid.attach (hp, 0, 1);
+        // grid.attach (header, 0, 0);
+        grid.attach (hp, 0, 0);
 
         add (grid);
+        set_titlebar (header); // TODO: Remove after switching back to HdyHeaderBar
 
         show_all ();
 
@@ -175,7 +179,7 @@ public class Rollit.MainWindow : Hdy.Window {
         );
 
         accel_group.connect (
-            Gdk.Key.D,
+            Gdk.Key.C,
             Gdk.ModifierType.MOD1_MASK, // TODO: Replace with ALT_MASK for GTK4
             Gtk.AccelFlags.VISIBLE | Gtk.AccelFlags.LOCKED,
             () => {

diff --git a/src/Widgets/RollHistory.vala b/src/Widgets/RollHistory.vala
@@ -43,7 +43,7 @@ public class Rollit.RollHistory : Gtk.Grid {
         bottom_row.margin = 6;
 
         clear_button = new Gtk.Button () {
-            tooltip_markup = Granite.markup_accel_tooltip ({"<Alt>D"}, _("Clear History"))
+            tooltip_markup = Granite.markup_accel_tooltip ({"<Alt>C"}, _("Clear History"))
         };
         clear_button.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
         clear_button.add (bottom_row);