From: v13 Date: Sat, 20 Mar 2010 11:28:29 +0000 (+0000) Subject: Fixed about and help. X-Git-Url: https://vcs.maemo.org/git/?p=maegirls;a=commitdiff_plain;h=824a6e1cca84ffb0be4fc8787f67c3d1bea2acfd Fixed about and help. Added girl name to window title. Increased PMS length to 7. --- diff --git a/trunk/src/algo.py b/trunk/src/algo.py index 2a867cc..32c64bd 100755 --- a/trunk/src/algo.py +++ b/trunk/src/algo.py @@ -72,11 +72,11 @@ class Algo(object): 'day': d, 'len': 5, } - elif d>=self.cycle-6: + elif d>=self.cycle-7: ret={ 'status': 'blue', - 'day': 6+d-self.cycle, - 'len': 6, + 'day': 7+d-self.cycle, + 'len': 7, } elif d>self.cycle-ovbefore-4 and d<=self.cycle-ovbefore: ret={ diff --git a/trunk/src/config.py b/trunk/src/config.py index af11dad..2c90879 100755 --- a/trunk/src/config.py +++ b/trunk/src/config.py @@ -28,7 +28,7 @@ import pickle import time import algo -version="0.1.1" +version="0.1.3" try: home=os.environ['HOME'] diff --git a/trunk/src/win.py b/trunk/src/win.py index 8c78300..41bbe58 100755 --- a/trunk/src/win.py +++ b/trunk/src/win.py @@ -136,20 +136,39 @@ class AboutDialog(MyMsgDialog): MyMsgDialog.__init__(self, *args, **kwargs) txt=self.tr(""" + +

A program to monitor the women's cycle. Good for planning (or acting ;-). Inspired by "MyGirls" app which is (was?) available for Java ME capable phones.

-WARNING!!! This is not accurate nor correct! You cannot trust -this program (or any other program) for accurate predictions! -(after all, this is about women... how can one be sure :-). +WARNING!!! This app is not guaranteed to be accurate or correct! You cannot +trust this program, or any program, to give accurate predictions! +The whole women-cycle-thing highly depends on a number of factors that +only a doctor can tell. +

Send comments and bug reports to the above address. -

This program can be distributed under the terms of the GNU public -license, version 3 or any later. +

License

This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. +

This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY 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 . + + """) self.setWindowTitle(self.tr("About MaeGirls")) @@ -180,24 +199,27 @@ class HelpDialog(MyMsgDialog): txt=self.tr("""

MaeGirls shows information about women's cycle using some generic -guidelines. It assumes that the ovulation happens 14 days before the start +guidelines: It assumes that the ovulation happens 14 days before the start of the next period and that the period cycle is constant. Also, it assumes that sperm can live for 4 days, while an egg can live for 2 days.

WARNING!!! This is not always correct. There are FAR TOO MANY exceptions -to the above rules!!! +to the above rules!!! You MUST consult a doctor in order to get accurate +predictions!!! -

Assuming that you understand the risk of being wrong, you become -entitled to read the graph as follows: +

Assuming that you understand the risks of blindly trusting this program, +you become entitled to read the graph as follows:

In red: The days that menstruation -happens. -

In green: The fertile days. +happens, assumed to last 5 days. +

In green: The fertile days as described above.

In blue: The days of PMS -(Premenstrual Syndrome). +(Premenstrual Syndrome), assumed to last 7 days.

Navigation is easy: Use left-right finger movement to move the calendar view. Use up-down finger movement to zoom in/out. + +

This program allows for "monitoring" the cycle of multiple girls. """) self.setWindowTitle(self.tr("Help")) @@ -340,7 +362,9 @@ class MaeGirls(QMainWindow): m.addAction(self.menuhelp) m.addAction(self.menuabout) - self.setWindowTitle("MaeGirls") + def updateTitle(self): + txt="MaeGirls - %s" % (self.girl, ) + self.setWindowTitle(txt) def setAlgo(self, algo): self.dg.setAlgo(algo) @@ -350,6 +374,7 @@ class MaeGirls(QMainWindow): self.girl=name self.algo.setReference(cfg['day0'], cfg['cycle']) self.update() + self.updateTitle() def menuConfig(self): if self.dlgConfig==None: @@ -452,8 +477,6 @@ def init(algo): loc=locale.setlocale(locale.LC_MESSAGES, '') - print "loc:", loc - # Load translations qttr=QTranslator() qttr.load("qt_" + loc,