[Libreoffice-commits] .: 2 commits - odk/docs odk/examples
Andras Timar
timar at kemper.freedesktop.org
Wed Dec 14 03:52:07 PST 2011
odk/docs/images/bluball.gif |binary
odk/docs/tools.html | 4 -
odk/examples/DevelopersGuide/examples.html | 103 ++++++++++++-----------------
odk/examples/examples.html | 74 +++++++++++---------
odk/examples/python/makefile.mk | 74 ++++++++++++++++++++
5 files changed, 160 insertions(+), 95 deletions(-)
New commits:
commit 8f3a15ca0ecd859bc34b082c935edd69cdad6a52
Author: Andras Timar <atimar at suse.com>
Date: Wed Dec 14 12:48:42 2011 +0100
set correct header/footer of examples html pages
diff --git a/odk/docs/images/bluball.gif b/odk/docs/images/bluball.gif
index dc7c020..fcadd22 100644
Binary files a/odk/docs/images/bluball.gif and b/odk/docs/images/bluball.gif differ
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 6a7b7ca..88d5266 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -5,9 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="author" content="Jürgen Schmidt">
</head>
-
-</head>
- <body>
+<body>
<a name="tools"></a>
<div id="BgContainer">
<div id="Container">
diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html
index 4beca94..1ae8efd 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -1,51 +1,32 @@
<html>
<head>
- <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Developer's Guide Examples</title>
- <link rel="stylesheet" type="text/css"
- href="../../docs/sdk_styles.css">
- <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
+ <title>LibreOffice %PRODUCT_RELEASE% SDK - Developer's Guide Examples</title>
+ <link rel="stylesheet" type="text/css" href="../../docs/sdk_styles.css">
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="author" content="Jürgen Schmidt">
- <meta name="created" content="2004-12-14">
</head>
-<body class="sdkbody">
-<a name="examples"></a>
-<table class="table1" cellpadding="0">
- <tbody>
- <tr style="background-image:url(../../docs/images/sdk_head-2.png); backgorund-position: bottom; ">
- <td class="background" colspan="3" align="left"><img src="../../docs/images/sdk_head-1.png" width="800" height="120" usemap="#Map" border="0"></td>
- </tr>
+<body>
+ <a name="tools"></a>
+ <div id="BgContainer">
+ <div id="Container">
+ <div id="TopHeader">
+ <a id="Logo" href="http://www.libreoffice.org/" title="Go to the Home of LibreOffice and the LibreOffice Community page"></a>
+ <p id="HeaderTagLine">
+ Software Development Kit %PRODUCT_RELEASE%
+ </p>
+ </div>
+ <div class="clear">
+ </div>
+ <div id="Layout">
+ <div class="typography">
+ <h1>
+ Developer's Guide Examples
+ </h1>
+<table class="table1" cellpadding=0>
<tr>
<td colspan="3"><img class="nothing10"
src="../../docs/images/nada.gif"></td>
</tr>
- <tr>
- <td class="content1"><img class="nothing8"
- src="../../docs/images/nada.gif"></td>
- <td>
- <table class="table2">
- <tbody>
- <tr>
- <td colspan="3"><img class="nothing1"
- src="../../docs/images/nada.gif"></td>
- </tr>
- <tr>
- <td>
- <table class="table3">
- <tbody>
- <tr>
- <td colspan="2" class="head1">Developer's Guide
-Examples</td>
- <td align="right"> <a href="../examples.html"
- title="link to the examples overview"><img class="navigate"
- src="../../docs/images/nav_left.png"></a> <a href="../../index.html"
- title="link to the SDK start page"><img class="navigate"
- src="../../docs/images/nav_home.png"></a></td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
<tr>
<td>
<table class="table3">
@@ -3010,23 +2991,27 @@ for the Office application.</td>
<tr>
<td colspan="3"><img class="nothing30"
src="../../docs/images/nada.gif"></td>
- </tr>
- <tr>
- <td colspan="3"><img class="line"
- src="../../docs/images/sdk_line-1.gif"></td>
- </tr>
- <tr>
- <td colspan="3">
- <div class="centertext">
- <p><img class="oraclelogo" src="../../docs/images/odk-footer-logo.gif" title="Sponsored by Oracle" alt="Oracle Logo" />
- Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.<p>
- </div>
- </td>
- </tr>
- </tbody>
+ </tr>
</table>
-<map name="Map">
-<area shape="rect" coords="10,68,93,105" href="http://www.oracle.com">
-</map>
-</body>
-</html>
+ </div>
+ <div id="Footer">
+ <div id="FooterText">
+ <p>
+ Copyright © 2000, 2010 LibreOffice contributors and/or their affiliates. All rights reserved.
+ <br>
+ LibreOffice was created by The Document Foundation, based on OpenOffice.org, which is Copyright 2000, 2010 Oracle and/or its affiliates.
+ <br>
+ The Document Foundation acknowledges all community members, please find more info <a href="http://www.libreoffice.org/about-us/credits/" target="_blank">at our website</a>.
+ </p>
+ <p>
+
+ </p>
+ <p>
+ <a href="http://www.libreoffice.org/privacy" target="_blank">Privacy Policy</a> | <a href="http://www.libreoffice.org/imprint" target="_blank">Impressum (Legal Info)</a>
+ | Copyright information: The source code of LibreOffice is licensed under the GNU Lesser General Public License (<a href="http://www.libreoffice.org/download/license/" target="_blank">LGPLv3</a>). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our <a href="http://wiki.documentfoundation.org/TradeMark_Policy" target="_blank">trademark policy</a>.
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </body>
diff --git a/odk/examples/examples.html b/odk/examples/examples.html
index a3d11a5..cbc6732 100644
--- a/odk/examples/examples.html
+++ b/odk/examples/examples.html
@@ -2,16 +2,28 @@
<head>
<title>LibreOffice %PRODUCT_RELEASE% SDK - Examples</title>
<link rel="stylesheet" type="text/css" href="../docs/sdk_styles.css">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="author" content="Jürgen Schmidt">
- <meta name="created" content="2004-12-14">
</head>
+<body>
+ <a name="exapmles"></a>
+ <div id="BgContainer">
+ <div id="Container">
+ <div id="TopHeader">
+ <a id="Logo" href="http://www.libreoffice.org/" title="Go to the Home of LibreOffice and the LibreOffice Community page"></a>
+ <p id="HeaderTagLine">
+ Software Development Kit %PRODUCT_RELEASE%
+ </p>
+ </div>
+ <div class="clear">
+ </div>
+ <div id="Layout">
+ <div class="typography">
+ <h1>
+ Examples
+ </h1>
-<body class="sdkbody"><a name="examples"/>
<table class="table1" cellpadding=0>
- <tr style="background-image:url(../docs/images/sdk_head-2.png); backgorund-position: bottom; ">
- <td class="background" colspan="3" align="left"><img src="../docs/images/sdk_head-1.png" height="120" usemap="#Map" border="0"></td>
- </tr>
<tr>
<td colspan="3"><img class="nothing10" src="../docs/images/nada.gif"></td>
</tr>
@@ -26,16 +38,6 @@
<td>
<table class="table3">
<tr>
- <td colspan="2" class="head1">Examples</td>
- <td align="right"><a href="../index.html" title="link to the SDK start page"><img class="navigate" src="../docs/images/nav_home.png"></a></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <table class="table3">
- <tr>
<td colspan="3">
<p>The SDK provides a rich set of examples in different programming
languages (Java, Python, C++, LibreOffice %PRODUCT_RELEASE% Basic, OLE) to illustrate the use
@@ -785,23 +787,29 @@
</td>
<td class="content1"><img class="nothing8" src="../docs/images/nada.gif"></td>
</tr>
- <tr>
- <td colspan="3"><img class="nothing30" src="../docs/images/nada.gif"></td>
- </tr>
- <tr>
- <td colspan="3"><img class="line" src="../docs/images/sdk_line-1.gif"></td>
- </tr>
- <tr>
- <td colspan="3">
- <div class="centertext">
- <p><img class="oraclelogo" src="../docs/images/odk-footer-logo.gif" title="Sponsored by Oracle" alt="Oracle Logo" />
- Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.<p>
- </div>
- </td>
- </tr>
</table>
-<map name="Map">
- <area shape="rect" coords="10,68,93,105" href="http://www.oracle.com">
-</map>
+ </div>
+ <div id="Footer">
+ <div id="FooterText">
+ <p>
+ Copyright © 2000, 2010 LibreOffice contributors and/or their affiliates. All rights reserved.
+ <br>
+ LibreOffice was created by The Document Foundation, based on OpenOffice.org, which is Copyright 2000, 2010 Oracle and/or its affiliates.
+ <br>
+ The Document Foundation acknowledges all community members, please find more info <a href="http://www.libreoffice.org/about-us/credits/" target="_blank">at our website</a>.
+ </p>
+ <p>
+
+ </p>
+ <p>
+ <a href="http://www.libreoffice.org/privacy" target="_blank">Privacy Policy</a> | <a href="http://www.libreoffice.org/imprint" target="_blank">Impressum (Legal Info)</a>
+ | Copyright information: The source code of LibreOffice is licensed under the GNU Lesser General Public License (<a href="http://www.libreoffice.org/download/license/" target="_blank">LGPLv3</a>). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our <a href="http://wiki.documentfoundation.org/TradeMark_Policy" target="_blank">trademark policy</a>.
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
</body>
</html>
commit 1917825c534cd1d68c24e5bace6d4872c2947b32
Author: Andras Timar <atimar at suse.com>
Date: Wed Dec 14 12:06:15 2011 +0100
add makefile.mk that copies Python example to SDK
diff --git a/odk/examples/python/makefile.mk b/odk/examples/python/makefile.mk
new file mode 100644
index 0000000..f81d6ef
--- /dev/null
+++ b/odk/examples/python/makefile.mk
@@ -0,0 +1,74 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Andras Timar <atimar at suse.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+PRJ=../..
+PRJNAME=odk
+TARGET=python
+
+#----------------------------------------------------------------
+.INCLUDE: settings.mk
+.INCLUDE: $(PRJ)/util/makefile.pmk
+#----------------------------------------------------------------
+
+#----------------------------------------------------
+# this makefile is only used for copying the example
+# files into the SDK
+#----------------------------------------------------
+
+PYTHONEXAMPLE=\
+ $(DESTDIRPYTHONEXAMPLES)/toolpanel/readme \
+ $(DESTDIRPYTHONEXAMPLES)/toolpanel/Factory.xcu \
+ $(DESTDIRPYTHONEXAMPLES)/toolpanel/toolpanels/poc.xdl \
+ $(DESTDIRPYTHONEXAMPLES)/toolpanel/META-INF/manifest.xml \
+ $(DESTDIRPYTHONEXAMPLES)/toolpanel/toolpanel.component \
+ $(DESTDIRPYTHONEXAMPLES)/toolpanel/toolpanel.py \
+ $(DESTDIRPYTHONEXAMPLES)/toolpanel/Makefile \
+ $(DESTDIRPYTHONEXAMPLES)/toolpanel/description.xml \
+ $(DESTDIRPYTHONEXAMPLES)/toolpanel/toolPanelPocBasic/Module1.xba \
+ $(DESTDIRPYTHONEXAMPLES)/toolpanel/toolPanelPocBasic/script.xlb \
+ $(DESTDIRPYTHONEXAMPLES)/toolpanel/toolPanelPocBasic/dialog.xlb \
+ $(DESTDIRPYTHONEXAMPLES)/toolpanel/CalcWindowState.xcu
+
+DIR_FILE_LIST= \
+ $(PYTHONEXAMPLE)
+
+DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
+DIR_CREATE_FLAG=$(MISC)/ex_$(TARGET)_dirs_created.txt
+DIR_FILE_FLAG=$(MISC)/ex_$(TARGET)_files.txt
+
+#--------------------------------------------------
+# TARGETS
+#--------------------------------------------------
+all : \
+ $(DIR_FILE_FLAG)
+
+#--------------------------------------------------
+# use global rules
+#--------------------------------------------------
+.INCLUDE: $(PRJ)/util/odk_rules.pmk
diff --git a/odk/examples/python/toolpanel/description.xml b/odk/examples/python/toolpanel/description.xml
old mode 100755
new mode 100644
More information about the Libreoffice-commits
mailing list