Skip to content

Commit e47ec47

Browse files
vogellavogella
committed
updates
1 parent cc7d2d2 commit e47ec47

File tree

33 files changed

+1008
-305
lines changed

33 files changed

+1008
-305
lines changed

‎de.vogella.android.notification/src/de/vogella/android/notification/CallNotification.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class CallNotification extends Activity {
1616
public void onCreate(Bundle savedInstanceState) {
1717
super.onCreate(savedInstanceState);
1818
Button button = new Button(this);
19-
button.setText("Create Notification");
19+
button.setText("Create Notification");
2020
button.setOnClickListener(new View.OnClickListener() {
2121
@Override
2222
public void onClick(View v) {
@@ -46,8 +46,8 @@ public void createNotification() {
4646
notification.contentView = view;
4747

4848
Intent intent = new Intent(this, TargetActivity.class);
49-
PendingIntent activity = PendingIntent.getActivity(this, 0, intent,
50-
0);
49+
PendingIntent pendingIntent = PendingIntent.getActivity(context, 0,
50+
intent, PendingIntent.FLAG_CANCEL_CURRENT);
5151
notification.contentIntent = activity;
5252
notificationManager.notify(0, notification);
5353

de.vogella.docbook.first/build.xml renamed to de.vogella.docbook.first/buildchunkedhtml.xml

Lines changed: 20 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,44 @@
11
<?xml version="1.0"?>
2-
<!--
3-
- Author: Lars Vogel
4-
-->
5-
<project name="docbook-src" default="build-html5">
2+
<!-- - Author: Lars Vogel -->
3+
<project name="build HTML5" default="build-chunkedhtml">
64

75
<description>
8-
This Ant buildhtml.xml file is used to transform DocBook XML to html output
9-
</description>
6+
Used to transform DocBook XML to HTML5 output
7+
</description>
108

11-
<!--
12-
- Configure basic properties that will be used in the file.
13-
-->
9+
<!-- Define base properties -->
1410
<property name="input.dir" value="input" />
1511
<property name="output.dir" value="output" />
1612
<property name="docbook.xsl.dir" value="docbook-xsl-1.76.1" />
17-
<property name="mydocbook.xsl.dir" value="docbook-xsl-mystylesheets" />
18-
<property name="xhtml5.stylesheet" value="${docbook.xsl.dir}/xhtml5/docbook.xsl" />
19-
<property name="my.stylesheet" value="${mydocbook.xsl.dir}/myhtmldocbook.xsl" />
20-
<!--
21-
<property name="xhtml.stylesheet" value="${docbook.xsl.dir}/xhtml/docbook.xsl" />
22-
-->
13+
<property name="mydocbook.xsl.dir" value="mystylesheets" />
14+
<property name="xhtml5.stylesheet" value="${docbook.xsl.dir}/xhtml5/chunk.xsl" />
15+
2316
<!-- Making saxon available -->
2417
<path id="saxon.class.path">
2518
<pathelement location="lib/saxon.jar" />
2619
</path>
2720

2821

29-
<!--
30-
- target: usage
31-
-->
32-
<target name="usage" description="Prints the Ant build.xml usage">
22+
<!-- - target: usage -->
23+
<target name="usage" description="Prints help">
3324
<echo message="Use -projecthelp to get a list of the available targets." />
3425
</target>
3526

36-
<!--
37-
- target: clean
38-
-->
27+
<!-- - target: clean -->
3928
<target name="clean" description="Cleans up generated files.">
4029
<delete dir="${output.dir}" />
4130
</target>
4231

43-
<!--
44-
- target: depends
45-
-->
46-
<target name="createtargetdir">
32+
<!-- - target: depends -->
33+
<target name="createtargetdir" description="Generate targetdir.">
4734
<mkdir dir="${output.dir}" />
4835
<mkdir dir="${output.dir}/images" />
4936
</target>
5037

51-
<!--
52-
- target: build-html
53-
- description: Iterates through a directory and transforms
54-
- .xml files into .html files using the DocBook XSL.
55-
-->
56-
<target name="build-html5" depends="clean, createtargetdir" description="Generates HTML files from DocBook XML">
38+
<target name="build-chunkedhtml" depends="clean, createtargetdir"
39+
description="Generates HTML5 files">
40+
<echo message="Building HTML5 output" />
41+
5742
<!-- Copy the stylesheet to the same directory as the HTML files -->
5843
<copy todir="${output.dir}">
5944
<fileset dir="css">
@@ -67,14 +52,14 @@
6752
<include name="title.png" />
6853
</fileset>
6954
</copy>
70-
<xslt style="${my.stylesheet}" extension=".html" basedir="${input.dir}" destdir="${output.dir}">
55+
<!-- Transfer to HTML -->
56+
<xslt style="${xhtml5.stylesheet}" extension=".html" basedir="${input.dir}"
57+
destdir="${output.dir}">
7158
<include name="**/*book.xml" />
7259
<include name="**/*article*.xml" />
7360
<param name="html.stylesheet" expression="style.css" />
7461
<param name="docbook.css.source" expression="" />
7562
<param name="section.autolabel" expression="1" />
76-
<param name="highlight.source" expression="1" />
77-
<param name="highlight.xslthl.config" expression="file:///C:/Users/D034797/workspace/vogella/de.vogella.docbook.first/docbook-xsl-1.76.1/highlighting/xslthl-config.xml" />
7863
<param name="make.clean.html" expression="1" />
7964
<outputproperty name="indent" value="yes" />
8065
<classpath refid="saxon.class.path" />

‎de.vogella.docbook.first/buildhtml.xml‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
<?xml version="1.0"?>
2+
<!-- - Author: Lars Vogel -->
3+
<project name="build HTML5" default="build-html">
4+
5+
<description>
6+
Used to transform DocBook XML to HTML5 output
7+
</description>
8+
9+
<!-- Define base properties -->
10+
<property name="input.dir" value="input" />
11+
<property name="output.dir" value="output" />
12+
<property name="docbook.xsl.dir" value="docbook-xsl-1.76.1" />
13+
<property name="mydocbook.xsl.dir" value="mystylesheets" />
14+
<property name="xhtml5.stylesheet" value="${docbook.xsl.dir}/xhtml5/docbook.xsl" />
15+
16+
<!-- Making saxon available -->
17+
<path id="saxon.class.path">
18+
<pathelement location="lib/saxon.jar" />
19+
</path>
20+
21+
22+
<!-- - target: usage -->
23+
<target name="usage" description="Prints help">
24+
<echo message="Use -projecthelp to get a list of the available targets." />
25+
</target>
26+
27+
<!-- - target: clean -->
28+
<target name="clean" description="Cleans up generated files.">
29+
<delete dir="${output.dir}" />
30+
</target>
31+
32+
<!-- - target: depends -->
33+
<target name="createtargetdir" description="Generate targetdir.">
34+
<mkdir dir="${output.dir}" />
35+
<mkdir dir="${output.dir}/images" />
36+
</target>
37+
38+
39+
<!-- - target: build-html - Iterates through the specified directory and
40+
transforms DocBook files into .html files using the DocBook XSL. -->
41+
<target name="oldbuild-html" depends="clean, createtargetdir"
42+
description="Generates HTML5 files">
43+
<!-- Copy the stylesheet to the same directory as the HTML files -->
44+
<copy todir="${output.dir}">
45+
<fileset dir="css">
46+
<include name="style.css" />
47+
</fileset>
48+
</copy>
49+
50+
<!-- Copy the images to the same directory as the HTML files -->
51+
<copy todir="${output.dir}\images">
52+
<fileset dir="${input.dir}\images">
53+
<include name="title.png" />
54+
</fileset>
55+
</copy>
56+
<!-- Transfer to HTML -->
57+
<xslt style="${xhtml5.stylesheet}" extension=".html" basedir="${input.dir}"
58+
destdir="${output.dir}">
59+
<include name="**/*book.xml" />
60+
<include name="**/*article*.xml" />
61+
<param name="html.stylesheet" expression="style.css" />
62+
<param name="docbook.css.source" expression="" />
63+
<param name="section.autolabel" expression="1" />
64+
<param name="highlight.source" expression="1" />
65+
<param name="highlight.xslthl.config"
66+
expression="file:///C:/Users/D034797/workspace/vogella/de.vogella.docbook.first/docbook-xsl-1.76.1/highlighting/xslthl-config.xml" />
67+
<param name="make.clean.html" expression="1" />
68+
<outputproperty name="indent" value="yes" />
69+
<classpath refid="saxon.class.path" />
70+
</xslt>
71+
72+
</target>
73+
74+
75+
76+
77+
<target name="build-html" depends="clean, createtargetdir"
78+
description="Generates HTML5 files">
79+
<echo message="Building HTML5 output" />
80+
81+
<!-- Copy the stylesheet to the same directory as the HTML files -->
82+
<copy todir="${output.dir}">
83+
<fileset dir="css">
84+
<include name="style.css" />
85+
</fileset>
86+
</copy>
87+
88+
<!-- Copy the images to the same directory as the HTML files -->
89+
<copy todir="${output.dir}\images">
90+
<fileset dir="${input.dir}\images">
91+
<include name="title.png" />
92+
</fileset>
93+
</copy>
94+
<!-- Transfer to HTML -->
95+
<xslt style="${xhtml5.stylesheet}" extension=".html2" basedir="${input.dir}"
96+
destdir="${output.dir}">
97+
<include name="**/*book.xml" />
98+
<include name="**/*article*.xml" />
99+
<param name="html.stylesheet" expression="style.css" />
100+
<param name="docbook.css.source" expression="" />
101+
<param name="section.autolabel" expression="1" />
102+
<param name="make.clean.html" expression="1" />
103+
<outputproperty name="indent" value="yes" />
104+
<classpath refid="saxon.class.path" />
105+
</xslt>
106+
</target>
107+
108+
</project>

‎de.vogella.docbook.first/css/style.css‎

Lines changed: 2 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,5 @@
1-
<?xml version="1.0"?>
2-
<style>
1+
h1 {
2+
text-transform: uppercase;
33

4-
/********************************/
5-
/* start of styles in block.xsl */
6-
7-
.formalpara-title {
8-
font-weight: bold;
9-
}
10-
11-
div.blockquote-title {
12-
font-weight: bold;
13-
margin-top: 1em;
14-
margin-bottom: 1em;
15-
}
16-
17-
span.msgmain-title {
18-
font-weight: bold;
19-
}
20-
21-
span.msgsub-title {
22-
font-weight: bold;
23-
}
24-
25-
span.msgrel-title {
26-
font-weight: bold;
27-
}
28-
29-
div.msglevel, div.msgorig, div.msgaud {
30-
margin-top: 1em;
31-
margin-bottom: 1em;
32-
}
33-
34-
span.msglevel-title, span.msgorig-title, span.msgaud-title {
35-
font-weight: bold;
36-
}
37-
38-
div.msgexplan {
39-
margin-top: 1em;
40-
margin-bottom: 1em;
41-
}
42-
43-
span.msgexplan-title {
44-
font-weight: bold;
45-
}
46-
47-
/* end of styles in block.xsl */
48-
/********************************/
49-
50-
/********************************/
51-
/* start of styles in autotoc.xsl */
52-
53-
54-
/* end of styles in autotoc.xsl */
55-
/********************************/
56-
57-
/********************************/
58-
/* start of styles in formal.xsl */
59-
60-
div.figure-title {
61-
font-weight: bold;
62-
}
63-
64-
div.example-title {
65-
font-weight: bold;
66-
}
67-
68-
div.equation-title {
69-
font-weight: bold;
70-
}
71-
72-
div.table-title {
73-
font-weight: bold;
74-
}
75-
76-
div.sidebar-title {
77-
font-weight: bold;
78-
}
79-
80-
81-
/* end of styles in formal.xsl */
82-
/********************************/
83-
84-
/********************************/
85-
/* start of styles in verbatim.xsl */
86-
87-
div.programlisting {
88-
white-space: pre;
89-
font-family: "Droid Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace
90-
}
91-
92-
.hl-keyword {
93-
color:#7F0055;
94-
font-weight:bold;
95-
}
96-
97-
div.screen {
98-
white-space: pre;
99-
font-family: monospace;
100-
}
101-
102-
div.synopsis {
103-
white-space: pre;
104-
font-family: monospace;
1054
}
1065

107-
/* end of styles in verbatim.xsl */
108-
/********************************/
109-
</style>

0 commit comments

Comments
 (0)