[med-svn] [Git][med-team/cycle][upstream] New upstream version 0.3.3
Andreas Tille (@tille)
gitlab at salsa.debian.org
Thu Jun 1 10:03:07 BST 2023
Andreas Tille pushed to branch upstream at Debian Med / cycle
Commits:
9641fac1 by Andreas Tille at 2023-06-01T10:19:57+02:00
New upstream version 0.3.3
- - - - -
9 changed files:
- CHANGELOG
- COPYRIGHT
- README.de.md
- README.md
- README.ru.md
- cal_year.py
- − cycle.spec
- save_load.py
- setup.py
Changes:
=====================================
CHANGELOG
=====================================
@@ -6,6 +6,12 @@
# Other contributors are listed alongside their changes
# Home page: https://github.com/metlov/cycle
#======================================================================
+0.3.3 (31.05.2023)
+ - fixed the Note dialog
+ - merged the actions of LMB and RMB on calendar to make it easier
+ to operate on it from touchscreen devices
+ - fixed some more integer divisions
+ - compatibility with old saves after "sip"->"wx.siplib" module rename
0.3.2 (13.10.2022)
- removed outdated Readme.Debian
- converted README files to Markdown
=====================================
COPYRIGHT
=====================================
@@ -1,7 +1,8 @@
- CYCLE - calendar for women
- Copyright (C) 2002-2005 Oleg S. Gints
+ CYCLE - calendar for women
+ Copyright (C) 2002-2005 Oleg S. Gints
Copyright (C) 2002-2005 "CONERO lab", http://conero.lrn.ru
+ Copyright (C) 2022-2023 Konstantin L. Metlov
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
=====================================
README.de.md
=====================================
@@ -4,10 +4,10 @@
# CYCLE - Ein Kalender für Frauen
-**13.10.2022 Version 0.3.2**
+**DD.MM.YYYY Version 0.3.3**
2002-2005 (c) Oleg Gints (altgo at users.sourceforge.net)
2002-2005 (c) "CONERO lab", http://conero.lrn.ru
-2022 (c) Konstantin L. Metlov (metlov at donfti.ru , metlov at fti.dn.ua)
+2023 (c) Konstantin L. Metlov (metlov at donfti.ru , metlov at fti.dn.ua)
### PROGRAMMFEATURES
=====================================
README.md
=====================================
@@ -4,10 +4,10 @@
# CYCLE - menstrual cycle tracker for women
-**13.10.2022 Version 0.3.2**
+**DD.MM.YYYY Version 0.3.3**
2002-2005 (c) Oleg Gints (altgo at users.sourceforge.net)
2002-2005 (c) "CONERO lab", http://conero.lrn.ru
-2022 (c) Konstantin L. Metlov (metlov at donfti.ru , metlov at fti.dn.ua)
+2023 (c) Konstantin L. Metlov (metlov at donfti.ru , metlov at fti.dn.ua)
### PROGRAM FEATURES
=====================================
README.ru.md
=====================================
@@ -4,10 +4,10 @@
# ЦИКЛ - календарь для женщин
-**13.10.2022 Версия 0.3.2*
+**DD.MM.YYYY Версия 0.3.3*
2002-2005 (c) Олег Гинц (altgo at users.sourceforge.net)
2002-2005 (c) "CONERO lab", http://conero.lrn.ru
-2022 (c) Константин Л. Метлов (metlov at donfti.ru , metlov at fti.dn.ua)
+2023 (c) Константин Л. Метлов (metlov at donfti.ru , metlov at fti.dn.ua)
### Возможности программы:
=====================================
cal_year.py
=====================================
@@ -11,7 +11,7 @@ import wx.adv
import calendar
import operator
from functools import reduce
-
+import dialogs
class Val:
pass
@@ -63,15 +63,14 @@ class Month_Cal(wx.adv.GenericCalendarCtrl):
self.d_click = wx.DateTime() # FromDMY(1, 0,2002)
def OnLeftDown(self, event):
- # HitTest(Point pos) -> (result, date, weekday)
- res, d, w = self.HitTest(event.GetPosition())
- if res == wx.adv.CAL_HITTEST_DAY:
- Val.frame.SetStatusText(info(d))
+ self.OnRightDown(event)
def OnRightDown(self, event):
+ # HitTest(Point pos) -> (result, date, weekday)
res, d, w = self.HitTest(event.GetPosition())
if res == wx.adv.CAL_HITTEST_DAY:
# now d contain clicked day
+ Val.frame.SetStatusText(info(d))
self.d_click = d
menu = wx.Menu()
menu.Append(1, d.Format('%d %B'))
@@ -119,7 +118,7 @@ class Month_Cal(wx.adv.GenericCalendarCtrl):
def OnNote(self, event):
txt = get_note(self.d_click)
- dlg = Note_Dlg(self, self.d_click.Format('%d %B'), txt)
+ dlg = dialogs.Note_Dlg(self, self.d_click.Format('%d %B'), txt)
ret = dlg.ShowModal()
t = dlg.Get_Txt()
dlg.Destroy()
@@ -206,7 +205,7 @@ class Cal_Year(wx.ScrolledWindow):
w = box.GetSize().GetWidth()
h = box.GetSize().GetHeight()
Val.frame.SetClientSize(wx.Size(w+10, h+90))
- self.SetScrollbars(20, 20, w/20, h/20)
+ self.SetScrollbars(20, 20, w//20, h//20)
def Draw_Year(self):
Val.frame.SetTitle(cycle.name+" - "+str(self.year))
@@ -377,7 +376,7 @@ def calc_fert(year):
min, max = min_max(i)
begin = d+wx.DateSpan.Days(min-18) # begin fertile
end = d+wx.DateSpan.Days(max-11) # end fertile
- ovul = end-wx.DateSpan.Days(((max-11)-(min-18))/2) # day of ovul
+ ovul = end-wx.DateSpan.Days(((max-11)-(min-18))//2) # day of ovul
if year_b <= ovul <= year_e:
add_mark(ovul, MARK_OVUL, year)
@@ -424,7 +423,7 @@ def calc_fert(year):
begin = d+wx.DateSpan.Days(min-18) #
end = d+wx.DateSpan.Days(max-11) #
- ovul = end-wx.DateSpan.Days(((max-11)-(min-18))/2) # day of ovul
+ ovul = end-wx.DateSpan.Days(((max-11)-(min-18))//2) # day of ovul
if year_b <= ovul <= year_e:
add_mark(ovul, MARK_OVUL, year)
=====================================
cycle.spec deleted
=====================================
@@ -1,153 +0,0 @@
-%undefine _python_compile_skip_x
-
-Name: cycle
-Version: 0.3.1
-Release: alt1
-
-Summary: Calendar for women
-Summary(ru_RU.KOI8-R):
-License: GPL
-Group: Sciences/Other
-Url: http://conero.lrn.ru
-Packager: Oleg Gints <go at altlinux.ru>
-
-BuildArch: noarch
-Source: %name-%version.tar.bz2
-
-Requires: python-module-wx >= 2.5.3.1
-
-BuildRequires: python
-
-%description
- Possibilities of the program:
-- on given length of the cycle or on typed statistics for several periods
- calculate days begin menstruation
-- calculate days "safe" sex, fertile period and day to ovulations
-- define d.o.b. a child
-- allows to write notes
-- helps to supervise reception of hormonal contraceptive tablets
-%description -l ru_RU.KOI8-R
- :
--
-
-- "" ,
--
--
--
-
-%prep
-%setup -n %name-%version
-
-%build
-#---- cycle ----
-cat >%name <<EOF
-#! /bin/sh
-cd %_datadir/%name
-exec ./cycle.py
-EOF
-#---- set_dir.py ----
-cat >set_dir.py <<EOF
-#generated from cycle.spec
-msg_dir="%_datadir/locale"
-doc_dir="%_docdir/%name-%version"
-icons_dir="%_iconsdir"
-bitmaps_dir="%_datadir/%name/bitmaps"
-EOF
-
-%install
-%__mkdir_p $RPM_BUILD_ROOT{%_bindir,%_datadir/%name/bitmaps,%_man1dir}
-%__install -p -m644 cycle.1 $RPM_BUILD_ROOT%_man1dir
-%__install -p -m755 cycle $RPM_BUILD_ROOT%_bindir/%name
-%__install -p -m644 *.py $RPM_BUILD_ROOT%_datadir/%name
-%__install -p -m755 cycle.py $RPM_BUILD_ROOT%_datadir/%name
-%__install -p -m644 bitmaps/*.* $RPM_BUILD_ROOT%_datadir/%name/bitmaps/
-for d in `find msg -type d -name LC_MESSAGES`; do
- d_l=`echo $d|%__sed -e 's/msg/locale/g'`
- %__mkdir_p $RPM_BUILD_ROOT%_datadir/$d_l
- %__install -p -m644 $d/cycle.mo $RPM_BUILD_ROOT%_datadir/$d_l
-done
-%find_lang %name
-
-# Menu support
-mkdir -p $RPM_BUILD_ROOT{%_menudir,%_iconsdir}
-mkdir -p $RPM_BUILD_ROOT{%_iconsdir/mini,%_iconsdir/large}
-cat >$RPM_BUILD_ROOT%_menudir/%name <<EOF
-?package(%name): \
-needs=x11 \
-section="Applications/Sciences/Other" \
-title=Cycle \
-command=%name \
-icon=%name.xpm \
-longtitle="Calendar for women"
-EOF
-install -p -m644 icons/%name.xpm $RPM_BUILD_ROOT%_iconsdir
-install -p -m644 icons/mini/%name.xpm $RPM_BUILD_ROOT%_miconsdir
-install -p -m644 icons/large/%name.xpm $RPM_BUILD_ROOT%_liconsdir
-
-%add_python_compile_include %_datadir
-
-%post
-%update_menus
-
-%postun
-%clean_menus
-
-%files -f %name.lang
-%doc INSTALL CHANGELOG COPYRIGHT README* THANKS BUGS
-%_bindir/%name
-%_datadir/%name
-%_menudir/*
-%_iconsdir/*.xpm
-%_miconsdir/*.xpm
-%_liconsdir/*.xpm
-%_man1dir/*
-
-%changelog
-* Thu Sep 15 2005 Oleg Gints <go at altlinux.ru> 0.3.1-alt1
-- change to Python > 2.4 (fix problem with rotor module)
-- Added man page from Miriam Ruiz <little_miry at yahoo.es>
-- fix path to bytecompiling python modules
-
-* Tue Dec 21 2004 Oleg Gints <go at altlinux.ru> 0.3.0-alt1
-- change to wxPython = 2.5.X
-- Add translation to the german language
- from Christian Weiske <cweiske at users.sourceforge.net>
-- change install for */cycle.mo files
-
-* Mon Oct 25 2004 Oleg Gints <go at altlinux.ru> 0.2.1-alt1
-- Add colours settings
-
-* Wed Apr 28 2004 Oleg Gints <go at altlinux.ru> 0.2.0-alt1
-- Add translation for czech and slovak language
- from Jozef Riha <zefo at seznam.cz>
-- change to Python 2.3
-- Add description for english language
- from Marco Papa Manzillo <mpapamanz at users.sourceforge.net>
-
-* Fri Sep 12 2003 Oleg Gints <go at altlinux.ru> 0.0.5-alt4
-- add BuildRequires for build in hasher
-- store source in bz2
-- change tag's order
-
-* Wed Jan 22 2003 Oleg Gints <go at altlinux.ru> 0.0.5-alt3
-- again fix exception from LANGUAGE=lang1:lang2
-
-* Fri Jan 17 2003 Oleg Gints <go at altlinux.ru> 0.0.5-alt2
-- fix exception from LANGUAGE=lang1:lang2
-
-* Mon Dec 30 2002 Oleg Gints <go at altlinux.ru> 0.0.5-alt1
-- fix PopupMenu for new wxPythonGTK
-
-* Sun Oct 27 2002 Oleg Gints <go at altlinux.ru> 0.0.4-alt2
-- Change group to Sciences/Other
-
-* Thu Oct 23 2002 Oleg Gints <go at altlinux.ru> 0.0.4-alt1
-- New release
-- Some spec cleanup
-
-* Thu May 16 2002 Gints <go at ltsp.ru> 0.0.3-alt1
-- Add menu
-
-* Mon May 06 2002 Oleg Gints <go at ltsp.ru> 0.0.2-alt1
-- first release
-
=====================================
save_load.py
=====================================
@@ -22,6 +22,18 @@ try:
except:
import p_rotor as rotor
+# Unpickler with class renaming for compatibility with old saves
+import io
+class OldCycleUnpickler(pickle.Unpickler):
+ def find_class(self, module, name):
+ renamed_module = module
+ if module == "sip":
+ renamed_module = "wx.siplib"
+ return super(OldCycleUnpickler, self).find_class(renamed_module, name)
+
+def loadPickledCycles(s):
+ file = io.BytesIO(s)
+ return OldCycleUnpickler(file).load()
def Save_Cycle(name='cycle', passwd='123', file='cycle'):
""" Save the contents of our document to disk.
@@ -79,7 +91,7 @@ def Load_Cycle(name='cycle', passwd='123', file='cycle'):
return False
else:
tmp = tmp[5:] # remove control word 'Cycle'
- objLoad = pickle.loads(tmp)
+ objLoad = loadPickledCycles(tmp)
set_color_default()
for type, d in objLoad:
# print "Load: ", type, d
=====================================
setup.py
=====================================
@@ -3,10 +3,10 @@
from distutils.core import setup
setup(name="cycle",
- version="0.3.1",
+ version="0.3.3",
description="Calendar for women",
- author="Oleg Gints",
- author_email="altgo at users.sourceforge.net",
- url="http://cycle.sourceforge.net",
+ author="Konstantin L. Metlov",
+ author_email="metlov at donfti.ru",
+ url="https://github.com/metlov/cycle",
py_modules=['cycle'],
)
View it on GitLab: https://salsa.debian.org/med-team/cycle/-/commit/9641fac1c4a0317ffb27223ff8647dd7079fe22a
--
View it on GitLab: https://salsa.debian.org/med-team/cycle/-/commit/9641fac1c4a0317ffb27223ff8647dd7079fe22a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20230601/52c622b7/attachment-0001.htm>
More information about the debian-med-commit
mailing list