Add external actvities feature

.github/workflows/testing.yml

@@ -34,6 +34,8 @@ jobs:
           PACKAGES="$PACKAGES python${{matrix.python-version}}"
           # Normal dependencies
           PACKAGES="$PACKAGES gettext intltool python3-gi python3-cairo python3-dbus python3-xdg libglib2.0-dev libglib2.0-bin gir1.2-gtk-3.0"
+          # Jira dependencies (optional, python3-jira doesn't exists in ubuntu 16)
+          # PACKAGES="$PACKAGES python3-jira python3-urllib3"
           # The gtk-update-icon-cache used to live in libgtk2.0-bin,
           # but was moved to its own package. Similar for distutils
           # (included by default in python stdlib).

.gitignore

@@ -28,3 +28,8 @@ hamster-time-tracker-*.tar.gz
 .lock-waf*
 build
 *.deb
+.project
+.pydevproject
+venv/
+.idea/
+*.iml

NEWS.md

@@ -1,3 +1,13 @@
+## Changes in 3.1.0
+
+* Added new shortcuts:
+  - Ctrl-=: clone or fallback to new if none selected.
+  - e: edit selected activity
+  - x: toggle export flag
+* Gathering activities from external source (right now only Jira and only via dbus)
+* Export activities as worklogs to jira
+* Export activities to external source from command line (`hamster export external` command)
+
 ## Changes in 3.0.2
 
 * Switch from deprecated xml2po to itstool for translating help files

README.md

@@ -97,16 +97,25 @@ commands). Older versions are not supported.
 
 ```bash
 sudo apt install gettext intltool python3-gi python3-cairo python3-distutils python3-dbus python3-xdg libglib2.0-dev libglib2.0-bin gir1.2-gtk-3.0 gtk-update-icon-cache
+# and for exporting issues
+sudo apt install python-tz
 # and for documentation
 sudo apt install itstool yelp
+# and for jira integration (should be python3-jira>=2.0.0, if not - use pip)
+sudo apt install python3-jira python3-urllib3
 ```
 
 ##### openSUSE
 
 Leap-15.0 and Leap-15.1:
 ```bash
 sudo zypper install intltool python3-pyxdg python3-cairo python3-gobject-Gdk
+# and for exporting issues
+sudo zypper install python-tz
+# and for documentation
 sudo zypper install itstool yelp
+# and for jira integration (should be python3-jira>=2.0.0, if not - use pip)
+sudo zypper install python3-jira python3-urllib3
 ```
 
 ##### RPM-based

data/edit_activity.ui

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkEntryCompletion" id="activity completion">
@@ -18,6 +18,9 @@
     <property name="has_resize_grip">True</property>
     <signal name="delete-event" handler="on_close" swapped="no"/>
     <signal name="key-press-event" handler="on_window_key_pressed" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="main vbox">
         <property name="visible">True</property>
@@ -431,29 +434,71 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="tags box">
+          <object class="GtkPaned">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
+            <property name="can_focus">True</property>
             <child>
-              <object class="GtkLabel">
+              <object class="GtkBox" id="tags box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="label" translatable="yes">tags</property>
-                <attributes>
-                  <attribute name="style" value="italic"/>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="label" translatable="yes">tags</property>
+                    <attributes>
+                      <attribute name="style" value="italic"/>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="resize">False</property>
+                <property name="shrink">True</property>
               </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkBox" id="exported box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="label" translatable="yes">exported to external source</property>
+                    <attributes>
+                      <attribute name="style" value="italic"/>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">True</property>
+              </packing>
             </child>
           </object>
           <packing>
@@ -531,10 +576,10 @@
             <property name="position">6</property>
           </packing>
         </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
     </child>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
   </object>
 </interface>

data/org.gnome.hamster.gschema.xml

@@ -7,6 +7,33 @@
                 The folder the last report was saved to
             </description>
         </key>
+        <key type="s" name="activities-source">
+            <default>""</default>
+            <summary>Activities source</summary>
+            <description>
+                The source of activities
+            </description>
+        </key>
+        <key type="s" name="jira-url">
+            <default>"https://jira.unity.pl"</default>
+            <summary>Jira URL</summary>
+        </key>
+        <key type="s" name="jira-user">
+            <default>""</default>
+            <summary>Jira user</summary>
+        </key>
+        <key type="s" name="jira-pass">
+            <default>""</default>
+            <summary>Jira password</summary>
+        </key>
+        <key type="s" name="jira-query">
+            <default>"resolution = Unresolved AND assignee = currentUser()"</default>
+            <summary>Jira query</summary>
+        </key>
+        <key type="s" name="jira-category-field">
+            <default>"customfield_10000"</default>
+            <summary>Jira category field</summary>
+        </key>
 
         <key type="u" name="day-start-minutes">
             <default>330</default>