Browse Source

Update version and copyright

Neal Wilson 8 years ago
parent
commit
9e0332ab3b
6 changed files with 31808 additions and 31668 deletions
  1. 1
    1
      README
  2. 31795
    31574
      src/qrc_resources.cpp
  3. 3
    3
      src/resources/Info.plist
  4. 1
    82
      src/resources/html/about.html
  5. 6
    6
      src/typica.rc
  6. 2
    2
      src/typica.w

+ 1
- 1
README View File

6
 
6
 
7
 Typica is free software released under the MIT license as follows:
7
 Typica is free software released under the MIT license as follows:
8
 
8
 
9
-Copyright 2007-2015 Neal Evan Wilson
9
+Copyright 2007-2016 Neal Evan Wilson
10
 
10
 
11
 Permission is hereby granteed, free of charge, to any person obtaining a copy
11
 Permission is hereby granteed, free of charge, to any person obtaining a copy
12
 of this software and associated documentation files (the "Software"), to deal
12
 of this software and associated documentation files (the "Software"), to deal

+ 31795
- 31574
src/qrc_resources.cpp
File diff suppressed because it is too large
View File


+ 3
- 3
src/resources/Info.plist View File

7
 	<key>CFBundlePackageType</key>
7
 	<key>CFBundlePackageType</key>
8
 	<string>APPL</string>
8
 	<string>APPL</string>
9
 	<key>CFBundleGetInfoString</key>
9
 	<key>CFBundleGetInfoString</key>
10
-	<string>Typica 1.6.4</string>
10
+	<string>Typica 1.7.0</string>
11
 	<key>CFBundleSignature</key>
11
 	<key>CFBundleSignature</key>
12
 	<string>@TYPEINFO@</string>
12
 	<string>@TYPEINFO@</string>
13
 	<key>CFBundleExecutable</key>
13
 	<key>CFBundleExecutable</key>
17
 	<key>CFBundleDisplayName</key>
17
 	<key>CFBundleDisplayName</key>
18
 	<string>Typica</string>
18
 	<string>Typica</string>
19
 	<key>CFBundleShortVersionString</key>
19
 	<key>CFBundleShortVersionString</key>
20
-	<string>1.6.4</string>
20
+	<string>1.7.0</string>
21
 	<key>CFBundleVersion</key>
21
 	<key>CFBundleVersion</key>
22
-	<string>1.6.4</string>
22
+	<string>1.7.0</string>
23
 	<key>NSHumanReadableCopyright</key>
23
 	<key>NSHumanReadableCopyright</key>
24
 	<string>© 2007–2015 Neal Wilson</string>
24
 	<string>© 2007–2015 Neal Wilson</string>
25
 </dict>
25
 </dict>

+ 1
- 82
src/resources/html/about.html View File

13
 					<h2>Version 1.6.4</h2>
13
 					<h2>Version 1.6.4</h2>
14
 				</div>
14
 				</div>
15
 			<div id="maintext">
15
 			<div id="maintext">
16
-				<p>Copyright &copy; 2007&ndash;2015 Neal Evan Wilson
16
+				<p>Copyright &copy; 2007&ndash;2016 Neal Evan Wilson
17
 					<span class="icons">
17
 					<span class="icons">
18
 						<a href="mailto:roaster@wilsonscoffee.com?subject=Thanks%20for%20Typica&amp;body=Message%20initiated%20from%20Typica.">&#9993;</a>
18
 						<a href="mailto:roaster@wilsonscoffee.com?subject=Thanks%20for%20Typica&amp;body=Message%20initiated%20from%20Typica.">&#9993;</a>
19
 						<a href="https://twitter.com/N3Roaster">&#62217;</a>
19
 						<a href="https://twitter.com/N3Roaster">&#62217;</a>
22
 						<a href="http://www.linkedin.com/profile/view?id=179814079">&#62232;</a>
22
 						<a href="http://www.linkedin.com/profile/view?id=179814079">&#62232;</a>
23
 					</span>
23
 					</span>
24
 				</p>
24
 				</p>
25
-				<h3>Special Thanks</h3>
26
-				<p>Ongoing development of Typica is made possible through the
27
-				generous financial contributions from the following:</p>
28
-				
29
-				<p>La Cosecha Coffee Roasters</p>
30
-				<p>Pinnacle Coffee Roasting</p>
31
-				<p>Water Street Coffee Roaster</p>
32
-				<p>Anonymous Funders</p>
33
-				
34
-				<p>Hardware for developing Phidgets 1048 support was provided
35
-				by Phidgets, Inc.</p>
36
-				
37
-				<p>Special thanks also to all who have sent bug reports and
38
-				feature requests.</p>
39
-
40
-				<div class="nbg">
41
-				<div class="nextversion">
42
-				<div class="nextbanner">
43
-					<img src="typica2logo96.png" height="96px" width="96px" alt="Typica 2.0 logo" />
44
-					<h1>Preview of the Next Episode</h3>
45
-				</div>
46
-				<p>This will likely be one of the last releases in the 1.x
47
-				series. Typica 1.0 was released in 2007 and I've learned a
48
-				lot from developing this, using it, and having conversations
49
-				with others about how they're using this. While there is the
50
-				possibility of further improvements, I believe Typica has
51
-				reached a point of maturity with a feature set appropriate for
52
-				many coffee roasting firms.</p>
53
-
54
-				<p>There is a large set of features and extensions that I have
55
-				avoided implementing because the changes would have been too
56
-				intrusive for the code base as it currently exists, but that
57
-				feature set has become too compelling for me to leave undone.
58
-				I am, therefore, attempting to spend as much time as I can on
59
-				the development of Typica 2.0. This removes many of the legacy
60
-				considerations and modernizes the tools and techniques used. I
61
-				hope that the result is a better and more broadly useful Typica
62
-				that can be maintained for another several years.</p>
63
-				
64
-				<p>While Typica is free and will continue to be made freely
65
-				available complete with all source code, there are still costs
66
-				associated with ongoing development and keeping the software
67
-				available. Some of the costs include:
68
-					<ul>
69
-						<li>Obtaining and maintaining hardware appropriate for
70
-						building and testing new releases</li>
71
-						<li>Building and maintaining test rigs for various
72
-						types of data acquisition hardware</li>
73
-						<li>Maintaining the ability to test on new operating
74
-						system releases</li>
75
-						<li>Hosting service</li>
76
-					</ul>
77
-				There is also a huge commitment of time in developing, testing,
78
-				and supporting this.</p>
79
-
80
-				<p>Financial support to date does not come close to covering
81
-				these costs, nor has it been enough that I could consider
82
-				hiring people to improve the pace and quality of ongoing
83
-				development. This is fine. I have no intention of halting work
84
-				on the project as my work has benefitted greatly from having
85
-				this software and I expect even greater benefit from the next
86
-				major release. Personally I find the new feature set exciting
87
-				to work on and am willing to cover funding shortfalls when I
88
-				can afford to do so.</p>
89
-				
90
-				<p>That said, if you're finding this software to be useful in
91
-				your business, if you've had a good support experience, or if
92
-				you'd like to help me continue to develop this software, please
93
-				consider providing some financial support to:</p>
94
-				
95
-				<p>Neal Wilson<br />
96
-				c/o Wilson's Coffee &amp; Tea<br />
97
-				3306 Washington Ave.<br />
98
-				Racine, WI 53405<br />
99
-				USA</p>
100
-				
101
-				<p>Another great way to help Typica right now is to reach out
102
-				to your professional colleagues and let them know that you're
103
-				using Typica and what you like about it.</p>
104
-				</div>
105
-				</div>
106
 				
25
 				
107
 				<h3>License Information</h3>
26
 				<h3>License Information</h3>
108
 				<p>Permission is hereby granted, free of charge, to any person
27
 				<p>Permission is hereby granted, free of charge, to any person

+ 6
- 6
src/typica.rc View File

1
 #include <winver.h>
1
 #include <winver.h>
2
 VS_VERSION_INFO	VERSIONINFO
2
 VS_VERSION_INFO	VERSIONINFO
3
-FILEVERSION 	1,6,4,0
4
-PRODUCTVERSION 	1,6,4,0
3
+FILEVERSION 	1,7,0,0
4
+PRODUCTVERSION 	1,7,0,0
5
 FILEFLAGSMASK	0x3fL
5
 FILEFLAGSMASK	0x3fL
6
 #ifdef _DEBUG
6
 #ifdef _DEBUG
7
 	FILEFLAGS	VS_FF_DEBUG
7
 	FILEFLAGS	VS_FF_DEBUG
16
 		BLOCK "040904b0"
16
 		BLOCK "040904b0"
17
 		BEGIN
17
 		BEGIN
18
 			VALUE "CompanyName", "Wilson's Coffee & Tea\0"
18
 			VALUE "CompanyName", "Wilson's Coffee & Tea\0"
19
-			VALUE "FileDescription", "Typica 1.6.4\0"
20
-			VALUE "FileVersion", "1.6.4\0"
19
+			VALUE "FileDescription", "Typica 1.7.0\0"
20
+			VALUE "FileVersion", "1.7.0\0"
21
 			VALUE "InternalName", "Typica\0"
21
 			VALUE "InternalName", "Typica\0"
22
-			VALUE "LegalCopyright", "Copyright 2007-2015 Neal Evan Wilson\0"
22
+			VALUE "LegalCopyright", "Copyright 2007-2016 Neal Evan Wilson\0"
23
 			VALUE "OriginalFilename", "Typica.exe\0"
23
 			VALUE "OriginalFilename", "Typica.exe\0"
24
 			VALUE "ProductName", "Typica\0"
24
 			VALUE "ProductName", "Typica\0"
25
-			VALUE "ProductVersion", "1.6.4\0"
25
+			VALUE "ProductVersion", "1.7.0\0"
26
 		END
26
 		END
27
 	END
27
 	END
28
 	BLOCK "VarFileInfo"
28
 	BLOCK "VarFileInfo"

+ 2
- 2
src/typica.w View File

22
 \mark{\noexpand\nullsec0{A Note on Notation}}
22
 \mark{\noexpand\nullsec0{A Note on Notation}}
23
 \def\pn{Typica}
23
 \def\pn{Typica}
24
 \def\filebase{typica}
24
 \def\filebase{typica}
25
-\def\version{1.6.4 \number\year-\number\month-\number\day}
26
-\def\years{2007--2015}
25
+\def\version{1.7.0 \number\year-\number\month-\number\day}
26
+\def\years{2007--2016}
27
 \def\title{\pn{} (Version \version)}
27
 \def\title{\pn{} (Version \version)}
28
 \newskip\dangerskipb
28
 \newskip\dangerskipb
29
 \newskip\dangerskip
29
 \newskip\dangerskip

Loading…
Cancel
Save