Browse Source

Project, email, social, and icon links in about box.

Neal Wilson 11 years ago
parent
commit
b3162784e2
6 changed files with 724 additions and 678 deletions
  1. 1
    0
      src/resources.qrc
  2. BIN
      src/resources/fonts/entypo.ttf
  3. 15
    3
      src/resources/html/about.html
  4. 10
    0
      src/resources/html/style.css
  5. 687
    675
      src/typica.cpp
  6. 11
    0
      src/typica.w

+ 1
- 0
src/resources.qrc View File

14
         <file>resources/icons/appicons/logo96.png</file>
14
         <file>resources/icons/appicons/logo96.png</file>
15
         <file>resources/html/about.html</file>
15
         <file>resources/html/about.html</file>
16
         <file>resources/html/style.css</file>
16
         <file>resources/html/style.css</file>
17
+        <file>resources/fonts/entypo.ttf</file>
17
     </qresource>
18
     </qresource>
18
 </RCC>
19
 </RCC>

BIN
src/resources/fonts/entypo.ttf View File


+ 15
- 3
src/resources/html/about.html View File

8
 		<div id="page">
8
 		<div id="page">
9
 			<div id="topmatter">
9
 			<div id="topmatter">
10
 				<div id="topbanner">
10
 				<div id="topbanner">
11
-					<img src="../icons/appicons/logo96.png" height="96px" width="96px" alt="Typica logo" />
12
-					<h1>Typica</h1>
11
+					<a href="http://www.randomfield.com/programs/typica/"><img src="../icons/appicons/logo96.png" height="96px" width="96px" alt="Typica logo" /></a>
12
+					<h1><a href="http://www.randomfield.com/programs/typica/">Typica</a></h1>
13
 					<h2>Version 1.5</h2>
13
 					<h2>Version 1.5</h2>
14
 				</div>
14
 				</div>
15
 			<div id="maintext">
15
 			<div id="maintext">
16
-				<p>Copyright &copy; 2007&ndash;2013 Neal Evan Wilson</p>
16
+				<p>Copyright &copy; 2007&ndash;2013 Neal Evan Wilson
17
+					<span class="icons">
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>
20
+						<a href="https://github.com/N3Roaster">&#62208;</a>
21
+						<a href="http://appliedcoffeetechnology.tumblr.com/">&#62229;</a>
22
+						<a href="http://www.linkedin.com/profile/view?id=179814079">&#62232;</a>
23
+					</span>
24
+				</p>
17
 				<h3>Special Thanks</h3>
25
 				<h3>Special Thanks</h3>
18
 				<p>Ongoing development of Typica is made possible through the
26
 				<p>Ongoing development of Typica is made possible through the
19
 				generous financial contributions from the following:</p>
27
 				generous financial contributions from the following:</p>
126
 				OTHER DEALINGS IN THE SOFTWARE.</p>
134
 				OTHER DEALINGS IN THE SOFTWARE.</p>
127
 				<p>Typica also makes use of the <a href="typica://aboutqt">Qt</a>
135
 				<p>Typica also makes use of the <a href="typica://aboutqt">Qt</a>
128
 				framework.</p>
136
 				framework.</p>
137
+				<p>Public domain icons are courtesy of the
138
+				<a href="http://tango.freedesktop.org">Tango Desktop Project</a>.</p>
139
+				<p>Entypo pictograms by Daniel Bruce &mdash;
140
+				<a href="http://www.entypo.com">www.entypo.com</a></p>
129
 			</div>
141
 			</div>
130
 		</div>
142
 		</div>
131
 	</body>
143
 	</body>

+ 10
- 0
src/resources/html/style.css View File

12
 	height: 96px;
12
 	height: 96px;
13
 	margin-bottom: 2px;
13
 	margin-bottom: 2px;
14
 }
14
 }
15
+#topbanner a {
16
+	text-decoration: none;
17
+	color: black;
18
+}
15
 #topbanner img {
19
 #topbanner img {
16
 	float: left;
20
 	float: left;
17
 }
21
 }
33
 	margin-left: 10px;
37
 	margin-left: 10px;
34
 	margin-right: 10px;
38
 	margin-right: 10px;
35
 	padding-bottom: 10px;
39
 	padding-bottom: 10px;
40
+}
41
+.icons {
42
+	font-family: Entypo
43
+}
44
+.icons a {
45
+	text-decoration: none;
36
 }
46
 }

+ 687
- 675
src/typica.cpp
File diff suppressed because it is too large
View File


+ 11
- 0
src/typica.w View File

12367
 	int *c = &argc;
12367
 	int *c = &argc;
12368
 	Application app(*c, argv);
12368
 	Application app(*c, argv);
12369
 	@<Set up icons@>@;
12369
 	@<Set up icons@>@;
12370
+	@<Set up fonts@>@;
12371
+	
12370
 	QSettings settings;
12372
 	QSettings settings;
12371
 	
12373
 	
12372
 	@<Register device configuration widgets@>@;
12374
 	@<Register device configuration widgets@>@;
12392
 QIcon::setThemeName(":/resources/icons/tango");
12394
 QIcon::setThemeName(":/resources/icons/tango");
12393
 app.setWindowIcon(QIcon(":/resources/icons/appicons/logo.svg"));
12395
 app.setWindowIcon(QIcon(":/resources/icons/appicons/logo.svg"));
12394
 
12396
 
12397
+@ Similarly some elements make use of a special font which is loaded from
12398
+resource data.
12399
+
12400
+@<Set up fonts@>=
12401
+QFile entypo(":/resources/fonts/entypo.ttf");
12402
+entypo.open(QIODevice::ReadOnly);
12403
+QFontDatabase::addApplicationFontFromData(entypo.readAll());
12404
+entypo.close();
12405
+
12395
 @ Some widgets provided by \pn{} require access to a database in order to work.
12406
 @ Some widgets provided by \pn{} require access to a database in order to work.
12396
 To simplify using these widgets, the application will request information
12407
 To simplify using these widgets, the application will request information
12397
 needed to connect to a database. The use of two distinct |if| blocks rather than
12408
 needed to connect to a database. The use of two distinct |if| blocks rather than

Loading…
Cancel
Save