Update version and localization

6 files changed, 162 insertions, 54 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 9c8a54e..a1b6112 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -211,7 +211,7 @@ dependencies = [
 
 [[package]]
 name = "furtherance"
-version = "1.3.0"
+version = "1.4.0"
 dependencies = [
  "chrono",
  "dbus",
diff --git a/Cargo.toml b/Cargo.toml
index 2956773..6adf376 100755
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "furtherance"
-version = "1.3.0"
+version = "1.4.0"
 authors = ["Ricky Kresslein <rk@lakoliu.com>"]
 edition = "2018"
 
diff --git a/data/com.lakoliu.Furtherance.appdata.xml.in b/data/com.lakoliu.Furtherance.appdata.xml.in
index 479e6ac..b66b439 100755
--- a/data/com.lakoliu.Furtherance.appdata.xml.in
+++ b/data/com.lakoliu.Furtherance.appdata.xml.in
@@ -39,6 +39,14 @@
   <content_rating type="oars-1.1" />
 
   <releases>
+    <release version="1.4.0" date="2022-06-05">
+      <description>
+        <ul>
+          <li>Generate reports of task history over a specified timeframe</li>
+          <li>Bug fixes and improvements</li>
+        </ul>
+      </description>
+    </release>
     <release version="1.3.0" date="2022-05-26">
       <description>
         <ul>
diff --git a/meson.build b/meson.build
index 04b8bed..50b19d9 100755
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('furtherance', 'rust',
-          version: '1.3.0',
+          version: '1.4.0',
     meson_version: '>= 0.50.0',
   default_options: [ 'warning_level=2',
                    ],
diff --git a/po/Furtherance.pot b/po/Furtherance.pot
index 22f75ac..3289f61 100644
--- a/po/Furtherance.pot
+++ b/po/Furtherance.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: furtherance\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-29 18:16+0300\n"
+"POT-Creation-Date: 2022-06-05 12:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:6 src/application.rs:166
+#: data/com.lakoliu.Furtherance.appdata.xml.in:6 src/application.rs:173
 msgid "Track your time without being tracked."
 msgstr ""
 
@@ -29,62 +29,70 @@ msgid ""
 msgstr ""
 
 #: data/com.lakoliu.Furtherance.appdata.xml.in:45
-msgid "Ability to add tasks manually"
+msgid "Generate reports of task history over a specified timeframe"
 msgstr ""
 
 #: data/com.lakoliu.Furtherance.appdata.xml.in:46
+msgid "Bug fixes and improvements"
+msgstr ""
+
+#: data/com.lakoliu.Furtherance.appdata.xml.in:53
+msgid "Ability to add tasks manually"
+msgstr ""
+
+#: data/com.lakoliu.Furtherance.appdata.xml.in:54
 msgid "Auto-save option"
 msgstr ""
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:47
+#: data/com.lakoliu.Furtherance.appdata.xml.in:55
 msgid "Task names can now be changed for an entire group"
 msgstr ""
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:54
+#: data/com.lakoliu.Furtherance.appdata.xml.in:62
 msgid "Added Pomodoro-style countdown timer!"
 msgstr ""
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:55
+#: data/com.lakoliu.Furtherance.appdata.xml.in:63
 msgid "Bug fixes"
 msgstr ""
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:62
+#: data/com.lakoliu.Furtherance.appdata.xml.in:70
 msgid "Ability to add tags!"
 msgstr ""
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:63
+#: data/com.lakoliu.Furtherance.appdata.xml.in:71
 msgid "Fixed icon positioning"
 msgstr ""
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:64
+#: data/com.lakoliu.Furtherance.appdata.xml.in:72
 msgid "Changed start button color and behavior"
 msgstr ""
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:65
+#: data/com.lakoliu.Furtherance.appdata.xml.in:73
 msgid "Changed color of delete buttons"
 msgstr ""
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:66
+#: data/com.lakoliu.Furtherance.appdata.xml.in:74
 msgid "Dutch, Brazilian Portuguese, and French translations"
 msgstr ""
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:73
+#: data/com.lakoliu.Furtherance.appdata.xml.in:81
 msgid "Furtherance has a new icon! And lots of bug fixes and improvements."
 msgstr ""
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:82
+#: data/com.lakoliu.Furtherance.appdata.xml.in:90
 msgid "First stable release of Furtherance."
 msgstr ""
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:86
+#: data/com.lakoliu.Furtherance.appdata.xml.in:94
 msgid "Track time spent on tasks"
 msgstr ""
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:87
+#: data/com.lakoliu.Furtherance.appdata.xml.in:95
 msgid "Change/delete recorded times"
 msgstr ""
 
-#: data/com.lakoliu.Furtherance.appdata.xml.in:88
+#: data/com.lakoliu.Furtherance.appdata.xml.in:96
 msgid "Idle detection"
 msgstr ""
 
@@ -212,15 +220,92 @@ msgstr ""
 msgid "Autosave every X _minutes"
 msgstr ""
 
-#: src/gtk/task_details.ui:8
-msgid "Task Details"
+#: src/gtk/report.ui:8
+msgid "Report"
+msgstr ""
+
+#: src/gtk/report.ui:33
+msgid "Past week"
 msgstr ""
 
-#: src/gtk/task_details.ui:88 src/ui/task_details.rs:190 src/ui/window.rs:331
+#: src/gtk/report.ui:34
+msgid "This month"
+msgstr ""
+
+#: src/gtk/report.ui:35
+msgid "Past 30 days"
+msgstr ""
+
+#: src/gtk/report.ui:36
+msgid "Past 180 days"
+msgstr ""
+
+#: src/gtk/report.ui:37
+msgid "Past year"
+msgstr ""
+
+#: src/gtk/report.ui:38
+msgid "Date range"
+msgstr ""
+
+#: src/gtk/report.ui:52 src/gtk/task_details.ui:88 src/ui/task_details.rs:189
+#: src/ui/window.rs:331
 msgid "Start"
 msgstr ""
 
-#: src/gtk/task_details.ui:96 src/application.rs:280 src/ui/task_details.rs:192
+#: src/gtk/report.ui:58 src/gtk/report.ui:74
+msgid "MM/DD/YYYY"
+msgstr ""
+
+#: src/gtk/report.ui:68
+msgid "End"
+msgstr ""
+
+#: src/gtk/report.ui:83
+msgid "Use the format MM/DD/YYYY"
+msgstr ""
+
+#: src/gtk/report.ui:92
+msgid "Start date must be before end date"
+msgstr ""
+
+#: src/gtk/report.ui:105
+msgid "Sort by:"
+msgstr ""
+
+#: src/gtk/report.ui:110 src/gtk/task_row.ui:22 src/ui/report.rs:155
+msgid "Task"
+msgstr ""
+
+#: src/gtk/report.ui:117
+msgid "Tag"
+msgstr ""
+
+#: src/gtk/report.ui:124
+msgid "Filter by task or tags"
+msgstr ""
+
+#: src/gtk/report.ui:136
+msgid "Tasks"
+msgstr ""
+
+#: src/gtk/report.ui:137 src/ui/task_details.rs:180
+msgid "Tags"
+msgstr ""
+
+#: src/gtk/report.ui:143 src/ui/report.rs:144
+msgid "Task, Task 2"
+msgstr ""
+
+#: src/gtk/report.ui:150
+msgid "Refresh"
+msgstr ""
+
+#: src/gtk/task_details.ui:8
+msgid "Task Details"
+msgstr ""
+
+#: src/gtk/task_details.ui:96 src/application.rs:287 src/ui/task_details.rs:191
 #: src/ui/window.rs:333 src/ui/window.rs:595
 msgid "Stop"
 msgstr ""
@@ -233,10 +318,6 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
-#: src/gtk/task_row.ui:22
-msgid "Task"
-msgstr ""
-
 #: src/gtk/task_row.ui:45
 msgid "Time"
 msgstr ""
@@ -258,103 +339,123 @@ msgid "_Preferences"
 msgstr ""
 
 #: src/gtk/window.ui:96
-msgid "_Delete history"
+msgid "_Time Report"
 msgstr ""
 
 #: src/gtk/window.ui:100
+msgid "_Delete history"
+msgstr ""
+
+#: src/gtk/window.ui:104
 msgid "_About Furtherance"
 msgstr ""
 
-#: src/application.rs:169
+#: src/application.rs:176
 msgid "translator-credits"
 msgstr ""
 
-#: src/application.rs:185
+#: src/application.rs:192
 msgid "Delete history?"
 msgstr ""
 
-#: src/application.rs:188 src/ui/task_details.rs:572 src/ui/window.rs:317
+#: src/application.rs:195 src/ui/task_details.rs:568 src/ui/window.rs:317
 msgid "Cancel"
 msgstr ""
 
-#: src/application.rs:189 src/ui/task_details.rs:573
+#: src/application.rs:196 src/ui/task_details.rs:569
 msgid "Delete"
 msgstr ""
 
-#: src/application.rs:196
+#: src/application.rs:203
 msgid "This will delete ALL of your task history."
 msgstr ""
 
-#: src/application.rs:198
+#: src/application.rs:205
 msgid "Type DELETE in the box below then click Delete to proceed."
 msgstr ""
 
-#: src/application.rs:207
+#: src/application.rs:214
 msgid "DELETE"
 msgstr ""
 
-#: src/application.rs:257 src/ui/window.rs:559
+#: src/application.rs:264 src/ui/window.rs:559
 msgid "Discard"
 msgstr ""
 
-#: src/application.rs:258 src/application.rs:279 src/ui/window.rs:560
+#: src/application.rs:265 src/application.rs:286 src/ui/window.rs:560
 #: src/ui/window.rs:594
 msgid "Continue"
 msgstr ""
 
-#: src/application.rs:269 src/ui/window.rs:591
+#: src/application.rs:276 src/ui/window.rs:591
 msgid "Time's up!"
 msgstr ""
 
-#: src/application.rs:270
+#: src/application.rs:277
 msgid "Your Furtherance timer ended."
 msgstr ""
 
-#: src/ui/task_details.rs:172 src/ui/task_details.rs:500
-msgid "Edit Task"
+#: src/ui/report.rs:146
+msgid "tag, tag 2"
 msgstr ""
 
-#: src/ui/task_details.rs:181
-msgid "Tags"
+#: src/ui/report.rs:158
+msgid "Duration"
+msgstr ""
+
+#: src/ui/report.rs:295
+msgid "No Results"
+msgstr ""
+
+#: src/ui/report.rs:303
+msgid "All Results"
+msgstr ""
+
+#: src/ui/report.rs:445
+msgid "no tags"
+msgstr ""
+
+#: src/ui/task_details.rs:171 src/ui/task_details.rs:497
+msgid "Edit Task"
 msgstr ""
 
-#: src/ui/task_details.rs:211 src/ui/window.rs:355
+#: src/ui/task_details.rs:210 src/ui/window.rs:355
 msgid "*Use the format MMM DD YYYY HH:MM:SS"
 msgstr ""
 
-#: src/ui/task_details.rs:213 src/ui/window.rs:357
+#: src/ui/task_details.rs:212 src/ui/window.rs:357
 msgid "*Use the format MMM DD YYYY HH:MM"
 msgstr ""
 
-#: src/ui/task_details.rs:219 src/ui/window.rs:363
+#: src/ui/task_details.rs:218 src/ui/window.rs:363
 msgid "*Start time cannot be later than stop time."
 msgstr ""
 
-#: src/ui/task_details.rs:224 src/ui/window.rs:368
+#: src/ui/task_details.rs:223 src/ui/window.rs:368
 msgid "*Time cannot be in the future."
 msgstr ""
 
-#: src/ui/task_details.rs:230
+#: src/ui/task_details.rs:229
 msgid "Delete task"
 msgstr ""
 
-#: src/ui/task_details.rs:257
+#: src/ui/task_details.rs:256
 msgid "Delete task?"
 msgstr ""
 
-#: src/ui/task_details.rs:506
+#: src/ui/task_details.rs:503
 msgid "New Name #tags"
 msgstr ""
 
-#: src/ui/task_details.rs:507
+#: src/ui/task_details.rs:504
 msgid "Task name cannot be empty."
 msgstr ""
 
-#: src/ui/task_details.rs:568
+#: src/ui/task_details.rs:564
 msgid "Delete All?"
 msgstr ""
 
-#: src/ui/task_details.rs:570
+#: src/ui/task_details.rs:566
 msgid "This will delete all occurrences of this task on this day."
 msgstr ""
 
diff --git a/src/ui/report.rs b/src/ui/report.rs
index 215aea0..4fcfc51 100644
--- a/src/ui/report.rs
+++ b/src/ui/report.rs
@@ -304,7 +304,6 @@ impl FurReport {
                                                                         (1, &total_time_str)
                                                                     ]);
         }
-        // TODO Bold "All Results"
 
         if imp.sort_by_task.is_active() {
             let mut tasks_by_name: Vec<Vec<(database::Task, i64)>> = Vec::new();