Skip to content

Commit b5a9963

Browse files
committed
Small fixes and update InnoSetup-file
1 parent e105684 commit b5a9963

8 files changed

+1606
-990
lines changed

easy_abc.py

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/python2.7
22
#
3-
program_name = 'EasyABC 1.3.7.1 2016-01-31'
3+
program_name = 'EasyABC 1.3.7.1 2016-02-03'
44
# Copyright (C) 2011-2014 Nils Liberg (mail: kotorinl at yahoo.co.uk)
5-
# Copyright (C) 2015 Seymour Shlien (mail:seymour.shlien@crc.ca)
5+
# Copyright (C) 2015-2016 Seymour Shlien (mail: fy733@ncf.ca)
66
#
77
# This program is free software: you can redistribute it and/or modify
88
# it under the terms of the GNU Lesser General Public License as published by
@@ -17,6 +17,10 @@
1717
# You should have received a copy of the GNU Lesser General Public License
1818
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
#
20+
# V1.3.7.1
21+
# - Dutch translation
22+
# - ABC assist improvements
23+
#
2024
# V1.3.7.0
2125
# Incremental improvements and bug fixes.
2226
#
@@ -7951,7 +7955,7 @@ def update_recent_files_menu(self):
79517955
def on_recent_file(self, event):
79527956
menu = event.EventObject
79537957
menu_item = menu.FindItemById(event.Id)
7954-
path = menu_item.Help
7958+
path = menu_item.Help # 1.3.7.1 [JWDJ] sometimes wrong recent file was opened
79557959
if not self.editor.GetModify() and not self.current_file: # if a new unmodified document
79567960
self.load(path)
79577961
else:
@@ -7992,7 +7996,7 @@ def OnDropFiles(self, x, y, filenames):
79927996
self.frame.OnTuneSelected(None)
79937997

79947998
class AboutFrame(wx.Dialog):
7995-
htmlpage = _('''
7999+
htmlpage = '''
79968000
<html>
79978001
<body bgcolor="#FAFAF0">
79988002
<center><img src="img/abclogo.png"/>
@@ -8049,7 +8053,7 @@ class AboutFrame(wx.Dialog):
80498053
</ul>
80508054
</body>
80518055
</html>
8052-
''').format(program_name)
8056+
'''.format(program_name)
80538057

80548058
def __init__(self, parent):
80558059
wx.Dialog.__init__(self, parent, -1, _('About EasyABC'), size=(900, 600) )

gpl-license.txt

+240
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,240 @@
1+
EasyABC - a free ABC music score editor
2+
Copyright (C) 2011 Nils Liberg
3+
Copyright (C) 2016 Seymour Shlien
4+
5+
This program is free software; you can redistribute it and/or modify
6+
it under the terms of the GNU General Public License as published by
7+
the Free Software Foundation; either version 2 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU General Public License below for more details.
14+
15+
To receive a copy of the source code send an email to:
16+
kotorinl at yahoo.co.uk
17+
18+
---------------------------------------------------------
19+
20+
GNU GENERAL PUBLIC LICENSE
21+
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
22+
23+
0. This License applies to any program or other work which contains
24+
a notice placed by the copyright holder saying it may be distributed
25+
under the terms of this General Public License. The "Program", below,
26+
refers to any such program or work, and a "work based on the Program"
27+
means either the Program or any derivative work under copyright law:
28+
that is to say, a work containing the Program or a portion of it,
29+
either verbatim or with modifications and/or translated into another
30+
language. (Hereinafter, translation is included without limitation in
31+
the term "modification".) Each licensee is addressed as "you".
32+
33+
Activities other than copying, distribution and modification are not
34+
covered by this License; they are outside its scope. The act of
35+
running the Program is not restricted, and the output from the Program
36+
is covered only if its contents constitute a work based on the
37+
Program (independent of having been made by running the Program).
38+
Whether that is true depends on what the Program does.
39+
40+
1. You may copy and distribute verbatim copies of the Program's
41+
source code as you receive it, in any medium, provided that you
42+
conspicuously and appropriately publish on each copy an appropriate
43+
copyright notice and disclaimer of warranty; keep intact all the
44+
notices that refer to this License and to the absence of any warranty;
45+
and give any other recipients of the Program a copy of this License
46+
along with the Program.
47+
48+
You may charge a fee for the physical act of transferring a copy, and
49+
you may at your option offer warranty protection in exchange for a fee.
50+
51+
2. You may modify your copy or copies of the Program or any portion
52+
of it, thus forming a work based on the Program, and copy and
53+
distribute such modifications or work under the terms of Section 1
54+
above, provided that you also meet all of these conditions:
55+
56+
a) You must cause the modified files to carry prominent notices
57+
stating that you changed the files and the date of any change.
58+
59+
b) You must cause any work that you distribute or publish, that in
60+
whole or in part contains or is derived from the Program or any
61+
part thereof, to be licensed as a whole at no charge to all third
62+
parties under the terms of this License.
63+
64+
c) If the modified program normally reads commands interactively
65+
when run, you must cause it, when started running for such
66+
interactive use in the most ordinary way, to print or display an
67+
announcement including an appropriate copyright notice and a
68+
notice that there is no warranty (or else, saying that you provide
69+
a warranty) and that users may redistribute the program under
70+
these conditions, and telling the user how to view a copy of this
71+
License. (Exception: if the Program itself is interactive but
72+
does not normally print such an announcement, your work based on
73+
the Program is not required to print an announcement.)
74+
75+
These requirements apply to the modified work as a whole. If
76+
identifiable sections of that work are not derived from the Program,
77+
and can be reasonably considered independent and separate works in
78+
themselves, then this License, and its terms, do not apply to those
79+
sections when you distribute them as separate works. But when you
80+
distribute the same sections as part of a whole which is a work based
81+
on the Program, the distribution of the whole must be on the terms of
82+
this License, whose permissions for other licensees extend to the
83+
entire whole, and thus to each and every part regardless of who wrote it.
84+
85+
Thus, it is not the intent of this section to claim rights or contest
86+
your rights to work written entirely by you; rather, the intent is to
87+
exercise the right to control the distribution of derivative or
88+
collective works based on the Program.
89+
90+
In addition, mere aggregation of another work not based on the Program
91+
with the Program (or with a work based on the Program) on a volume of
92+
a storage or distribution medium does not bring the other work under
93+
the scope of this License.
94+
95+
3. You may copy and distribute the Program (or a work based on it,
96+
under Section 2) in object code or executable form under the terms of
97+
Sections 1 and 2 above provided that you also do one of the following:
98+
99+
a) Accompany it with the complete corresponding machine-readable
100+
source code, which must be distributed under the terms of Sections
101+
1 and 2 above on a medium customarily used for software interchange; or,
102+
103+
b) Accompany it with a written offer, valid for at least three
104+
years, to give any third party, for a charge no more than your
105+
cost of physically performing source distribution, a complete
106+
machine-readable copy of the corresponding source code, to be
107+
distributed under the terms of Sections 1 and 2 above on a medium
108+
customarily used for software interchange; or,
109+
110+
c) Accompany it with the information you received as to the offer
111+
to distribute corresponding source code. (This alternative is
112+
allowed only for noncommercial distribution and only if you
113+
received the program in object code or executable form with such
114+
an offer, in accord with Subsection b above.)
115+
116+
The source code for a work means the preferred form of the work for
117+
making modifications to it. For an executable work, complete source
118+
code means all the source code for all modules it contains, plus any
119+
associated interface definition files, plus the scripts used to
120+
control compilation and installation of the executable. However, as a
121+
special exception, the source code distributed need not include
122+
anything that is normally distributed (in either source or binary
123+
form) with the major components (compiler, kernel, and so on) of the
124+
operating system on which the executable runs, unless that component
125+
itself accompanies the executable.
126+
127+
If distribution of executable or object code is made by offering
128+
access to copy from a designated place, then offering equivalent
129+
access to copy the source code from the same place counts as
130+
distribution of the source code, even though third parties are not
131+
compelled to copy the source along with the object code.
132+
133+
4. You may not copy, modify, sublicense, or distribute the Program
134+
except as expressly provided under this License. Any attempt
135+
otherwise to copy, modify, sublicense or distribute the Program is
136+
void, and will automatically terminate your rights under this License.
137+
However, parties who have received copies, or rights, from you under
138+
this License will not have their licenses terminated so long as such
139+
parties remain in full compliance.
140+
141+
5. You are not required to accept this License, since you have not
142+
signed it. However, nothing else grants you permission to modify or
143+
distribute the Program or its derivative works. These actions are
144+
prohibited by law if you do not accept this License. Therefore, by
145+
modifying or distributing the Program (or any work based on the
146+
Program), you indicate your acceptance of this License to do so, and
147+
all its terms and conditions for copying, distributing or modifying
148+
the Program or works based on it.
149+
150+
6. Each time you redistribute the Program (or any work based on the
151+
Program), the recipient automatically receives a license from the
152+
original licensor to copy, distribute or modify the Program subject to
153+
these terms and conditions. You may not impose any further
154+
restrictions on the recipients' exercise of the rights granted herein.
155+
You are not responsible for enforcing compliance by third parties to
156+
this License.
157+
158+
7. If, as a consequence of a court judgment or allegation of patent
159+
infringement or for any other reason (not limited to patent issues),
160+
conditions are imposed on you (whether by court order, agreement or
161+
otherwise) that contradict the conditions of this License, they do not
162+
excuse you from the conditions of this License. If you cannot
163+
distribute so as to satisfy simultaneously your obligations under this
164+
License and any other pertinent obligations, then as a consequence you
165+
may not distribute the Program at all. For example, if a patent
166+
license would not permit royalty-free redistribution of the Program by
167+
all those who receive copies directly or indirectly through you, then
168+
the only way you could satisfy both it and this License would be to
169+
refrain entirely from distribution of the Program.
170+
171+
If any portion of this section is held invalid or unenforceable under
172+
any particular circumstance, the balance of the section is intended to
173+
apply and the section as a whole is intended to apply in other
174+
circumstances.
175+
176+
It is not the purpose of this section to induce you to infringe any
177+
patents or other property right claims or to contest validity of any
178+
such claims; this section has the sole purpose of protecting the
179+
integrity of the free software distribution system, which is
180+
implemented by public license practices. Many people have made
181+
generous contributions to the wide range of software distributed
182+
through that system in reliance on consistent application of that
183+
system; it is up to the author/donor to decide if he or she is willing
184+
to distribute software through any other system and a licensee cannot
185+
impose that choice.
186+
187+
This section is intended to make thoroughly clear what is believed to
188+
be a consequence of the rest of this License.
189+
190+
8. If the distribution and/or use of the Program is restricted in
191+
certain countries either by patents or by copyrighted interfaces, the
192+
original copyright holder who places the Program under this License
193+
may add an explicit geographical distribution limitation excluding
194+
those countries, so that distribution is permitted only in or among
195+
countries not thus excluded. In such case, this License incorporates
196+
the limitation as if written in the body of this License.
197+
198+
9. The Free Software Foundation may publish revised and/or new versions
199+
of the General Public License from time to time. Such new versions will
200+
be similar in spirit to the present version, but may differ in detail to
201+
address new problems or concerns.
202+
203+
Each version is given a distinguishing version number. If the Program
204+
specifies a version number of this License which applies to it and "any
205+
later version", you have the option of following the terms and conditions
206+
either of that version or of any later version published by the Free
207+
Software Foundation. If the Program does not specify a version number of
208+
this License, you may choose any version ever published by the Free Software
209+
Foundation.
210+
211+
10. If you wish to incorporate parts of the Program into other free
212+
programs whose distribution conditions are different, write to the author
213+
to ask for permission. For software which is copyrighted by the Free
214+
Software Foundation, write to the Free Software Foundation; we sometimes
215+
make exceptions for this. Our decision will be guided by the two goals
216+
of preserving the free status of all derivatives of our free software and
217+
of promoting the sharing and reuse of software generally.
218+
219+
NO WARRANTY
220+
221+
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
222+
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
223+
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
224+
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
225+
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
226+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
227+
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
228+
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
229+
REPAIR OR CORRECTION.
230+
231+
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
232+
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
233+
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
234+
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
235+
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
236+
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
237+
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
238+
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
239+
POSSIBILITY OF SUCH DAMAGES.
240+

0 commit comments

Comments
 (0)