diff -Nru indicator-remindor-14.01/data/ui/AboutDialog.ui indicator-remindor-14.01.1/data/ui/AboutDialog.ui
--- indicator-remindor-14.01/data/ui/AboutDialog.ui 2014-01-07 01:58:37.000000000 +0000
+++ indicator-remindor-14.01.1/data/ui/AboutDialog.ui 2014-04-20 21:15:55.000000000 +0000
@@ -15,7 +15,7 @@
Indicator Remindor14.01Copyright (C) 2013 Brian Douglass
- http://bhdouglass.tk/indicator-remindor/
+ http://bhdouglass.com/remindor/WebsiteCopyright (C) 2013 Brian Douglass
This program is free software: you can redistribute it and/or modify it
diff -Nru indicator-remindor-14.01/debian/changelog indicator-remindor-14.01.1/debian/changelog
--- indicator-remindor-14.01/debian/changelog 2014-01-13 22:00:20.000000000 +0000
+++ indicator-remindor-14.01.1/debian/changelog 2014-05-26 11:54:50.000000000 +0000
@@ -1,3 +1,9 @@
+indicator-remindor (14.01.1-0ubuntu1~quantal) quantal; urgency=low
+
+ * Changed to only use html help files
+
+ -- Brian Douglass Mon, 26 May 2014 07:50:00 -0500
+
indicator-remindor (14.01-0ubuntu1~quantal) quantal; urgency=low
* Added Pushbullet integration
diff -Nru indicator-remindor-14.01/help/C/date.page indicator-remindor-14.01.1/help/C/date.page
--- indicator-remindor-14.01/help/C/date.page 2013-07-26 12:10:30.000000000 +0000
+++ indicator-remindor-14.01.1/help/C/date.page 2014-01-20 03:39:58.000000000 +0000
@@ -21,6 +21,7 @@
Translations assume today's date is September 26, 2012 and date format is '12/31/2000'.
(All dates are case insensitive)
+ Any date with the optional [next] prefix added will translate to the next occurance of that date.
today
@@ -35,18 +36,12 @@
Translation: 09/25/2012
- monday
+ [next] monday
Translation: 10/01/2012
Any day of the week is valid
See also Abbreviations
- next monday
-
-
Translation: 10/08/2012
-
Any day of the week is valid
-
See also Abbreviations
- October 28, 2012
Translation: 10/28/2012
@@ -86,10 +81,38 @@
Translation: 10/31/2012
Next 31st of the month (since Sept only has 30 days, this becomes Oct 31)
- christmas
+ [next] christmas
Translation: 12/25/2012
+ [next] christmas eve
+
+
Translation: 12/24/2012
+
+ [next] easter
+
+
The next occurence of Easter
+
+ [next] new years eve
+
+
Translation: 12/31/2012
+
+ [next] new years
+
+
Translation: 01/01/2012
+
+ [next] groundhogs day
+
+
Translation: 02/02/2013
+
+ [next] valentines day
+
+
Translation: 02/14/2013
+
+ [next] halloween
+
+
Translation: 10/31/2012
+
@@ -144,6 +167,13 @@
If no start date is specified, today's date becomes the start date
If no end date is specified, the date repeats forever
+ every weekdays [from start [to end]]
+
+
Every weekday specifed in the weekdays list starting on start and ending on end
+
weekdays is a comma separated list of weekdays. Example: monday, tues,friday
+
If no start date is specified, today's date becomes the start date
+
If no end date is specified, the date repeats forever
+ next X days [from start]
Every day for the next X days starting on start
diff -Nru indicator-remindor-14.01/help/C/index.page indicator-remindor-14.01.1/help/C/index.page
--- indicator-remindor-14.01/help/C/index.page 2013-07-30 11:31:07.000000000 +0000
+++ indicator-remindor-14.01.1/help/C/index.page 2014-04-20 21:16:23.000000000 +0000
@@ -27,9 +27,9 @@
A reminder can be configured to show a notification, play a sound, and/or run a command.
Reminders can be scheduled on one day or they can be set to repeat every day, every monday,
every 30 days, etc. They can also be set to repeat minutely or hourly.
-
Home Page
-
Screenshots
-
Blog
+
Home Page
+
Screenshots
+
Blog
diff -Nru indicator-remindor-14.01/help/C/simple.page indicator-remindor-14.01.1/help/C/simple.page
--- indicator-remindor-14.01/help/C/simple.page 2013-07-26 12:08:53.000000000 +0000
+++ indicator-remindor-14.01.1/help/C/simple.page 2014-01-20 03:20:07.000000000 +0000
@@ -21,11 +21,13 @@
time can be any valid singular time.
X is any positive integer.
If no time is specified it is assumed to be the current time.
+ If no date is specified it is assumed to be the current date.
- label every X (days|weeks|months|years) [at time]
+ labelevery repeating date [at time]
-
Repeating reminder runs every X days, weeks, months, or years at the specifed time
+
Repeating reminder runs every so often at the specifed time
+
every repeating date can be any valid repeating date starting with "every"
label on date [at time]
diff -Nru indicator-remindor-14.01/help/C/time.page indicator-remindor-14.01.1/help/C/time.page
--- indicator-remindor-14.01/help/C/time.page 2013-07-26 12:10:07.000000000 +0000
+++ indicator-remindor-14.01.1/help/C/time.page 2014-01-20 03:06:01.000000000 +0000
@@ -18,6 +18,9 @@
Valid Singular Times
+
+ X is any positive integer.
+
now
@@ -39,6 +42,18 @@
12:00am or 00:00
+ +X
+
+
Plus X minutes from now
+
At most this will equal 11:59pm/23:59
+
+
+ -X
+
+
Minus X minutes from now
+
At most this will equal 12:00am/00:00
+
+ 1:00pm1:00 pm13:00
diff -Nru indicator-remindor-14.01/indicator_remindor/helperdialogs.py indicator-remindor-14.01.1/indicator_remindor/helperdialogs.py
--- indicator-remindor-14.01/indicator_remindor/helperdialogs.py 2013-10-22 11:42:12.000000000 +0000
+++ indicator-remindor-14.01.1/indicator_remindor/helperdialogs.py 2014-04-25 21:47:35.000000000 +0000
@@ -87,6 +87,8 @@
self.date_once_c.set_active(0)
self.date_every_c.set_active(0)
+ self.date_changed(self.date_c)
+
def on_delete_event(self, widget, data=None):
self.destroy()
@@ -294,6 +296,7 @@
self.time_to_e.connect('icon-release', self.clear_widget)
self.time_c.set_active(0)
+ self.time_changed(self.time_c)
def on_btn_ok_clicked(self, widget, data=None):
index = self.time_c.get_active()
diff -Nru indicator-remindor-14.01/indicator_remindor/helpers.py indicator-remindor-14.01.1/indicator_remindor/helpers.py
--- indicator-remindor-14.01/indicator_remindor/helpers.py 2013-10-22 11:42:50.000000000 +0000
+++ indicator-remindor-14.01.1/indicator_remindor/helpers.py 2014-05-26 11:10:09.000000000 +0000
@@ -99,28 +99,11 @@
lib_logger.debug('extra verbose mode')
def get_help_uri(page=None):
- here = os.path.dirname(__file__)
- distro = platform.linux_distribution()
- help_uri = ''
+ if page is None:
+ page = 'index'
- if distro[0] == 'LinuxMint':
- if page is None:
- page = 'index'
-
- path = os.path.abspath(helpers.data_file('html', '%s.html' % (page)))
- help_uri = 'file://%s' % (path)
- else:
- help_uri = os.path.abspath(os.path.join(here, '..', 'help', 'C'))
-
- if not os.path.exists(help_uri):
- # installed so use gnome help tree - user's language
- help_uri = 'indicator-remindor'
-
- # unspecified page is the index.page
- if page is not None:
- help_uri = '%s#%s' % (help_uri, page)
-
- help_uri = 'ghelp:%s' % (help_uri)
+ path = os.path.abspath(helpers.data_file('html', '%s.html' % (page)))
+ help_uri = 'file://%s' % (path)
return help_uri
diff -Nru indicator-remindor-14.01/indicator_remindor/indicator_remindorconfig.py indicator-remindor-14.01.1/indicator_remindor/indicator_remindorconfig.py
--- indicator-remindor-14.01/indicator_remindor/indicator_remindorconfig.py 2014-01-13 21:59:10.000000000 +0000
+++ indicator-remindor-14.01.1/indicator_remindor/indicator_remindorconfig.py 2014-05-26 11:53:50.000000000 +0000
@@ -29,7 +29,7 @@
# files). By default, this is ../data, relative your trunk layout
__indicator_remindor_data_directory__ = '/home/brian/dev/desktop/remindor/indicator-remindor/data/'
__license__ = 'GPL-3'
-__version__ = '14.01'
+__version__ = '14.01.1'
import os
diff -Nru indicator-remindor-14.01/po/indicator-remindor.pot indicator-remindor-14.01.1/po/indicator-remindor.pot
--- indicator-remindor-14.01/po/indicator-remindor.pot 2014-01-13 21:59:10.000000000 +0000
+++ indicator-remindor-14.01.1/po/indicator-remindor.pot 2014-05-26 11:52:10.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-13 16:59-0500\n"
+"POT-Creation-Date: 2014-05-26 07:52-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -60,13 +60,13 @@
msgstr ""
#: ../data/ui/DateDialog.ui.h:11 ../data/ui/TimeDialog.ui.h:4
-#: ../indicator_remindor/helperdialogs.py:190
-#: ../indicator_remindor/helperdialogs.py:201
+#: ../indicator_remindor/helperdialogs.py:192
+#: ../indicator_remindor/helperdialogs.py:203
msgid "Every"
msgstr ""
-#: ../data/ui/DateDialog.ui.h:12 ../indicator_remindor/helperdialogs.py:194
-#: ../indicator_remindor/helperdialogs.py:229
+#: ../data/ui/DateDialog.ui.h:12 ../indicator_remindor/helperdialogs.py:196
+#: ../indicator_remindor/helperdialogs.py:231
msgid "Day(s)"
msgstr ""
@@ -743,21 +743,21 @@
"would you still like to use a notification?"
msgstr ""
-#: ../indicator_remindor/helperdialogs.py:206
+#: ../indicator_remindor/helperdialogs.py:208
msgid "of the month"
msgstr ""
-#: ../indicator_remindor/helperdialogs.py:225
+#: ../indicator_remindor/helperdialogs.py:227
msgid "Next"
msgstr ""
#. minutes
-#: ../indicator_remindor/helperdialogs.py:401
+#: ../indicator_remindor/helperdialogs.py:404
msgid "Minute(s)"
msgstr ""
#. hours
-#: ../indicator_remindor/helperdialogs.py:403
+#: ../indicator_remindor/helperdialogs.py:406
msgid "Hour(s)"
msgstr ""
diff -Nru indicator-remindor-14.01/README.md indicator-remindor-14.01.1/README.md
--- indicator-remindor-14.01/README.md 2013-06-13 11:42:22.000000000 +0000
+++ indicator-remindor-14.01.1/README.md 2014-04-20 21:15:31.000000000 +0000
@@ -3,7 +3,7 @@
Indicator Remindor is an indicator app that allows you to schedule reminders. A reminder can be configured to show a notification, play a sound, and/or run a command. Reminders can be scheduled on one day or they can be set to repeat every day, every monday, every 30 days, etc. They can also be set to repeat minutely or hourly.
-[Website](http://bhdouglass.tk/indicator-remindor.php)
+[Website](http://bhdouglass.com/remindor/)
*Needs [remindor-common](https://github.com/bhdouglass/remindor-common) to function*
@@ -17,4 +17,4 @@
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along with this program. If not, see .
\ No newline at end of file
+You should have received a copy of the GNU General Public License along with this program. If not, see .
diff -Nru indicator-remindor-14.01/setup.py indicator-remindor-14.01.1/setup.py
--- indicator-remindor-14.01/setup.py 2014-01-07 01:57:56.000000000 +0000
+++ indicator-remindor-14.01.1/setup.py 2014-05-26 11:53:06.000000000 +0000
@@ -66,7 +66,7 @@
DistUtilsExtra.auto.setup(
name='indicator-remindor',
- version='14.01',
+ version='14.01.1',
license='GPL-3',
author='Brian Douglass',
author_email='bhdouglass@gmail.com',