Commit f020779d authored by Andreas Tille's avatar Andreas Tille

refresh patches

parent b533f168
Index: cycle-0.3.1/set_dir.py
===================================================================
--- cycle-0.3.1.orig/set_dir.py 2013-04-04 23:46:44.936865094 +0200
+++ cycle-0.3.1/set_dir.py 2013-04-04 23:46:44.928865093 +0200
--- a/set_dir.py
+++ b/set_dir.py
@@ -1,5 +1,5 @@
-msg_dir="msg"
......
Index: cycle-0.3.1/dialogs.py
===================================================================
--- cycle-0.3.1.orig/dialogs.py 2013-04-04 23:46:51.280865084 +0200
+++ cycle-0.3.1/dialogs.py 2013-04-04 23:46:51.268865087 +0200
@@ -181,20 +181,20 @@
--- a/dialogs.py
+++ b/dialogs.py
@@ -181,20 +181,20 @@ def get_users():
users=[] #array of (user, file) name
p, f_name=get_f_name()
if os.path.exists(p):
......
Index: cycle-0.3.1.orig/dialogs.py
===================================================================
--- cycle-0.3.1.orig.orig/dialogs.py 2005-09-15 07:31:21.000000000 +0200
+++ cycle-0.3.1.orig/dialogs.py 2013-04-05 00:04:17.224863730 +0200
@@ -320,11 +320,11 @@
--- a/dialogs.py
+++ b/dialogs.py
@@ -320,11 +320,11 @@ def get_new_file_name():
def ask_name(parent=None):
# nobody, it is first login
wx.MessageBox(
......
Index: cycle-0.3.1/dialogs.py
===================================================================
--- cycle-0.3.1.orig/dialogs.py 2013-04-04 23:46:55.744865079 +0200
+++ cycle-0.3.1/dialogs.py 2013-04-04 23:46:55.740865079 +0200
@@ -375,9 +375,9 @@
--- a/dialogs.py
+++ b/dialogs.py
@@ -375,9 +375,9 @@ class Legend_Dlg(wx.Dialog):
self._add(box, _('conception'), cycle.colour_set['conception'])
self._add(box, _('safe sex'), cycle.colour_set['safe sex'])
self._add(box, _('fertile'), cycle.colour_set['fertile'])
......@@ -14,7 +12,7 @@ Index: cycle-0.3.1/dialogs.py
self._add(box, _('next 1-st tablet'), cycle.colour_set['next 1-st tablet'])
i=wx.NewId()
@@ -496,9 +496,9 @@
@@ -496,9 +496,9 @@ class Colours_Dlg(wx.Dialog):
self._add(box, _('conception'), 'conception')
self._add(box, _('safe sex'), 'safe sex')
self._add(box, _('fertile'), 'fertile')
......
Index: cycle-0.3.1/cal_year.py
===================================================================
--- cycle-0.3.1.orig/cal_year.py 2013-04-04 23:46:57.696865078 +0200
+++ cycle-0.3.1/cal_year.py 2013-04-04 23:46:57.688865078 +0200
@@ -70,7 +70,7 @@
--- a/cal_year.py
+++ b/cal_year.py
@@ -70,7 +70,7 @@ class Month_Cal(wx.calendar.CalendarCtrl
menu = wx.Menu()
menu.Append(1, d.Format('%d %B'))
menu.AppendSeparator()
......@@ -11,7 +9,7 @@ Index: cycle-0.3.1/cal_year.py
menu.Check(2,is_set_mark(d, MARK_BEGIN, d.GetYear()))
menu.AppendCheckItem(5, _('1-st tablet'))
menu.Check(5,is_set_mark(d, MARK_TABLET, d.GetYear()))
@@ -549,19 +549,18 @@
@@ -549,19 +549,18 @@ def info(day):
if gestation:
k=(day-d2+wx.TimeSpan.Hours(1)).GetDays()+1
w=(k-1)/7
......
Index: cycle-0.3.1/cal_year.py
===================================================================
--- cycle-0.3.1.orig/cal_year.py 2013-04-04 23:46:59.672865074 +0200
+++ cycle-0.3.1/cal_year.py 2013-04-04 23:46:59.668865074 +0200
@@ -630,6 +630,52 @@
--- a/cal_year.py
+++ b/cal_year.py
@@ -630,6 +630,52 @@ def report_year(year):
print s
return s
......
Index: cycle-0.3.1/cycle.py
===================================================================
--- cycle-0.3.1.orig/cycle.py 2013-04-04 23:47:01.600865073 +0200
+++ cycle-0.3.1/cycle.py 2013-04-04 23:47:01.592865073 +0200
@@ -104,10 +104,13 @@
--- a/cycle.py
+++ b/cycle.py
@@ -104,10 +104,13 @@ class MyFrame(wx.Frame):
tb.SetToolSeparation(50)
tb.AddSeparator()
......@@ -17,7 +15,7 @@ Index: cycle-0.3.1/cycle.py
SetToolPath(self, tb, 50, os.path.join(bitmaps_dir,'set.png'), _('Settings'))
wx.EVT_TOOL(self, 50, self.Settings)
@@ -136,6 +139,18 @@
@@ -136,6 +139,18 @@ class MyFrame(wx.Frame):
dlg = Legend_Dlg(self)
dlg.ShowModal()
dlg.Destroy()
......
Index: cycle-0.3.1/save_load.py
===================================================================
--- cycle-0.3.1.orig/save_load.py 2013-04-04 23:47:03.544865069 +0200
+++ cycle-0.3.1/save_load.py 2013-04-04 23:47:03.536865069 +0200
@@ -12,7 +12,7 @@
--- a/save_load.py
+++ b/save_load.py
@@ -12,7 +12,7 @@ warnings.filterwarnings("ignore",
message='.*rotor module', module=__name__)
import wx
......@@ -11,7 +9,7 @@ Index: cycle-0.3.1/save_load.py
import cal_year
try:
import rotor
@@ -23,7 +23,7 @@
@@ -23,7 +23,7 @@ def Save_Cycle(name='cycle', passwd='123
""" Save the contents of our document to disk.
"""
objSave=[]
......@@ -20,7 +18,7 @@ Index: cycle-0.3.1/save_load.py
m.update(passwd)
rt=rotor.newrotor(m.digest())
objSave.append(['period', cal_year.cycle.period])
@@ -59,7 +59,7 @@
@@ -59,7 +59,7 @@ def Load_Cycle(name='cycle', passwd='123
p, f_name=get_f_name(file)
if os.path.isfile(f_name):
......
Index: cycle-0.3.1.orig/dialogs.py
===================================================================
--- cycle-0.3.1.orig.orig/dialogs.py 2013-04-05 01:41:42.576856164 +0200
+++ cycle-0.3.1.orig/dialogs.py 2013-04-05 01:41:42.568856167 +0200
@@ -326,7 +326,7 @@
--- a/dialogs.py
+++ b/dialogs.py
@@ -326,7 +326,7 @@ def ask_name(parent=None):
"of some of your medical data and extracting some statistical\n"
"conclusions from them. You cannot consider this program as a\n"
"substitute for your gynecologist in any way."))
......
......@@ -4,10 +4,8 @@ Bug-Debian: https://bugs.debian.org/758955
Forwarded: no
Last-Update: 2014-09-07
Index: cycle-0.3.1/cal_year.py
===================================================================
--- cycle-0.3.1.orig/cal_year.py
+++ cycle-0.3.1/cal_year.py
--- a/cal_year.py
+++ b/cal_year.py
@@ -28,11 +28,11 @@ MARK_T22_28 = 1<<10 #tablets 22-28 or pa
MARK_NEXT_TABLET = 1<<11
......@@ -79,10 +77,8 @@ Index: cycle-0.3.1/cal_year.py
k+=1
# so visual refresh is more fast
Index: cycle-0.3.1/cycle.py
===================================================================
--- cycle-0.3.1.orig/cycle.py
+++ cycle-0.3.1/cycle.py
--- a/cycle.py
+++ b/cycle.py
@@ -10,7 +10,7 @@ import os, sys, gettext
import locale
......
......@@ -3,8 +3,8 @@ Description: Fix initial size of main window
Forwarded: no
Last-Update: 2014-09-12
--- cycle-0.3.1.orig/cal_year.py
+++ cycle-0.3.1/cal_year.py
--- a/cal_year.py
+++ b/cal_year.py
@@ -201,7 +201,7 @@ class Cal_Year(wx.ScrolledWindow):
box.Fit(self)
w = box.GetSize().GetWidth()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment