[dots/remove-assistant: 37/38] Add desktop files and icons. Fix dots/pdfdocument_gi.py
- From: Fernando Herrera de las Heras <fherrera src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dots/remove-assistant: 37/38] Add desktop files and icons. Fix dots/pdfdocument_gi.py
- Date: Thu, 15 Jul 2010 21:10:05 +0000 (UTC)
commit cfb262f041bec9894b4e269b8c6c00305ff955d6
Author: Fernando Herrera <fherrera onirica com>
Date: Thu Jul 15 16:18:17 2010 +0200
Add desktop files and icons. Fix dots/pdfdocument_gi.py
configure.ac | 1 +
data/Makefile.am | 15 ++-
data/dots.desktop.in | 9 ++
data/dotstableeditor.desktop.in | 9 ++
data/icons/Makefile.am | 77 ++++++++++++++
data/icons/dots.svg | 182 ++++++++++++++++++++++++++++++++
data/icons/hicolor_apps_48x48_dots.png | Bin 0 -> 2004 bytes
dots/pdfdocument_gi.py | 2 -
po/POTFILES.in | 4 +-
po/es.po | 66 ++++++++----
10 files changed, 337 insertions(+), 28 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 67b3498..bc2ca3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,5 +48,6 @@ bin/dots
dots/Makefile
dots/host_settings.py
data/Makefile
+data/icons/Makefile
po/Makefile.in
])
diff --git a/data/Makefile.am b/data/Makefile.am
index 948d6e8..3a039f2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,12 +1,10 @@
+SUBDIRS = icons
gtkbuilderdir = $(datadir)/dots
gtkbuilder_DATA = dots_assist.xml app_window.xml config.xml
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_DATA = dots.schemas
-EXTRA_DIST = $(gtkbuilder_DATA) $(schemas_DATA)
-
-
if GCONF_SCHEMAS_INSTALL
install-data-local:
if test -z "$(DESTDIR)" ; then \
@@ -23,3 +21,14 @@ install-data-local:
uninstall-local:
endif
+
+desktopdir = $(datadir)/applications
+desktop_in_files = \
+ dots.desktop.in \
+ dotstableeditor.desktop.in
+desktop_DATA = \
+ $(desktop_in_files:.desktop.in=.desktop)
+
+ INTLTOOL_DESKTOP_RULE@
+
+EXTRA_DIST = $(gtkbuilder_DATA) $(schemas_DATA) $(desktop_in_files)
diff --git a/data/dots.desktop.in b/data/dots.desktop.in
new file mode 100644
index 0000000..8c07484
--- /dev/null
+++ b/data/dots.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Dots Braille transcription program
+_Comment=Transcribe pdf, html and odt documents into Braille
+Exec=dots
+Icon=dots
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;
+StartupNotify=true
diff --git a/data/dotstableeditor.desktop.in b/data/dotstableeditor.desktop.in
new file mode 100644
index 0000000..1d5fb8f
--- /dev/null
+++ b/data/dotstableeditor.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Dots table editor
+_Comment=Edit liblouis Braille translation tables
+Exec=dotstableeditor
+Icon=dots
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;
+StartupNotify=true
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644
index 0000000..eb68c25
--- /dev/null
+++ b/data/icons/Makefile.am
@@ -0,0 +1,77 @@
+NULL =
+
+public_icons_themes = \
+ hicolor \
+ $(NULL)
+
+public_icons = \
+ hicolor_apps_48x48_dots.png \
+ $(NULL)
+
+private_icons = \
+ $(NULL)
+
+noinst_DATA = \
+ dots.svg \
+ $(NULL)
+
+EXTRA_DIST = \
+ $(public_icons) \
+ $(private_icons) \
+ $(noinst_DATA) \
+ $(NULL)
+
+###############################################################################
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
+
+update-icon-cache:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ for theme in $(public_icons_themes); do \
+ $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+ done; \
+ else \
+ echo "*** Icon cache not updated. After (un)install, run this:"; \
+ for theme in $(public_icons_themes); do \
+ echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+ done; \
+ fi
+
+install-icons:
+ for icon in $(public_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done; \
+ for icon in $(private_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done
+
+uninstall-icons:
+ -for icon in $(public_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done; \
+ for icon in $(private_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done
+
+install-data-local: install-icons update-icon-cache
+
+uninstall-local: uninstall-icons update-icon-cache
diff --git a/data/icons/dots.svg b/data/icons/dots.svg
new file mode 100644
index 0000000..444976d
--- /dev/null
+++ b/data/icons/dots.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="64px"
+ height="64px"
+ id="svg2816"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="Documento nuevo 2">
+ <defs
+ id="defs2818">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 32 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="64 : 32 : 1"
+ inkscape:persp3d-origin="32 : 21.333333 : 1"
+ id="perspective2824" />
+ <inkscape:perspective
+ id="perspective5076"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective5076-4"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective5076-2"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective5076-1"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective5076-18"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="9.28125"
+ inkscape:cx="14.16835"
+ inkscape:cy="33.822077"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="1440"
+ inkscape:window-height="821"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5062" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2821">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <rect
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2826"
+ width="57.104378"
+ height="54.087543"
+ x="3.8956223"
+ y="4"
+ rx="35.437786"
+ ry="1.8878052" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-opacity:1;stroke-dasharray:none"
+ id="path5066"
+ sodipodi:cx="17.5"
+ sodipodi:cy="12"
+ sodipodi:rx="1.5"
+ sodipodi:ry="1"
+ d="m 19,12 a 1.5,1 0 1 1 -3,0 1.5,1 0 1 1 3,0 z"
+ transform="matrix(1.1764705,0,0,1.7647058,1.4117662,-9.8823521)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-opacity:1;stroke-dasharray:none"
+ id="path5066-3"
+ sodipodi:cx="17.5"
+ sodipodi:cy="12"
+ sodipodi:rx="1.5"
+ sodipodi:ry="1"
+ d="m 19,12 a 1.5,1 0 1 1 -3,0 1.5,1 0 1 1 3,0 z"
+ transform="matrix(1.1764705,0,0,1.7647058,24.352942,-9.8823521)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-opacity:1;stroke-dasharray:none"
+ id="path5066-2"
+ sodipodi:cx="17.5"
+ sodipodi:cy="12"
+ sodipodi:rx="1.5"
+ sodipodi:ry="1"
+ d="m 19,12 a 1.5,1 0 1 1 -3,0 1.5,1 0 1 1 3,0 z"
+ transform="matrix(1.1764705,0,0,1.7647058,1.4117662,1.5882362)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-opacity:1;stroke-dasharray:none"
+ id="path5066-9"
+ sodipodi:cx="17.5"
+ sodipodi:cy="12"
+ sodipodi:rx="1.5"
+ sodipodi:ry="1"
+ d="m 19,12 a 1.5,1 0 1 1 -3,0 1.5,1 0 1 1 3,0 z"
+ transform="matrix(1.1764705,0,0,1.7647058,24.352942,1.5882362)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-opacity:1;stroke-dasharray:none"
+ id="path5066-23"
+ sodipodi:cx="17.5"
+ sodipodi:cy="12"
+ sodipodi:rx="1.5"
+ sodipodi:ry="1"
+ d="m 19,12 a 1.5,1 0 1 1 -3,0 1.5,1 0 1 1 3,0 z"
+ transform="matrix(1.1764705,0,0,1.7647058,1.4117662,13.941177)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-opacity:1;stroke-dasharray:none"
+ id="path5066-1"
+ sodipodi:cx="17.5"
+ sodipodi:cy="12"
+ sodipodi:rx="1.5"
+ sodipodi:ry="1"
+ d="m 19,12 a 1.5,1 0 1 1 -3,0 1.5,1 0 1 1 3,0 z"
+ transform="matrix(1.1764705,0,0,1.7647058,24.352942,13.941177)" />
+ <text
+ xml:space="preserve"
+ style="font-size:14px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="18"
+ y="52"
+ id="text5126"><tspan
+ sodipodi:role="line"
+ id="tspan5128"
+ x="18"
+ y="52">dots</tspan></text>
+ </g>
+</svg>
diff --git a/data/icons/hicolor_apps_48x48_dots.png b/data/icons/hicolor_apps_48x48_dots.png
new file mode 100644
index 0000000..966418a
Binary files /dev/null and b/data/icons/hicolor_apps_48x48_dots.png differ
diff --git a/dots/pdfdocument_gi.py b/dots/pdfdocument_gi.py
index 7c6d63f..4d53472 100644
--- a/dots/pdfdocument_gi.py
+++ b/dots/pdfdocument_gi.py
@@ -30,8 +30,6 @@ class PdfDocument(Document):
text = ""
for p in range(0,npages):
page = document.get_page(p)
- # Currently we are getting the layout from the pdf here
- # we should collapse it
text += page.get_text()
return text
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c7598cd..dae3cd7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,5 +2,7 @@
[type: gettext/glade]data/app_window.xml
[type: gettext/glade]data/config.xml
dots/app_window.py
-dots/dotscmd.py
+bin/dotscmd
+data/dots.desktop.in
+data/dotstableditor.desktop.in
diff --git a/po/es.po b/po/es.po
index 4c1dc73..1408fa2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-14 21:23+0200\n"
+"POT-Creation-Date: 2010-07-15 16:12+0200\n"
"PO-Revision-Date: 2010-07-14 20:30+0200\n"
"Last-Translator: Fernando Herrera <fherrera onirica com>\n"
"Language-Team: Es <fherrera onirica com>\n"
@@ -92,79 +92,101 @@ msgstr "Mostrar números de página:"
msgid "Top"
msgstr "Arriba"
-#: ../dots/app_window.py:174
+#: ../dots/app_window.py:190
msgid "All files"
msgstr "Todos los ficheros"
-#: ../dots/app_window.py:179 ../dots/app_window.py:180
+#: ../dots/app_window.py:195
msgid "Documents"
msgstr "Documentos"
-#: ../dots/app_window.py:288
+#: ../dots/app_window.py:300
+#, fuzzy
+msgid "A Braille translator for GNOME"
+msgstr "escribir traduccion a OUTFILE"
+
+#: ../dots/app_window.py:315
msgid "Unsaved Document"
msgstr "Documento no Guardado"
-#: ../dots/dotscmd.py:39
+#: ../bin/dotscmd:39
msgid "write translation to OUTFILE"
msgstr "escribir traduccion a OUTFILE"
-#: ../dots/dotscmd.py:42
+#: ../bin/dotscmd:42
msgid "include default semantics for the input file type"
msgstr "include semánticas por defecto para el tipo de fichero de entrada"
-#: ../dots/dotscmd.py:44
+#: ../bin/dotscmd:44
msgid "add extra semantics files separated by comas"
msgstr "añadir ficheros extra de semánticas deparados por comas"
-#: ../dots/dotscmd.py:47
+#: ../bin/dotscmd:47
msgid "access the network to download schemas"
msgstr "acceder a la red para descargar esquemas"
-#: ../dots/dotscmd.py:49
+#: ../bin/dotscmd:49
msgid "use TABLE as translation table for literary text"
msgstr "usar TABLE como tabla de traducción para texto literario"
-#: ../dots/dotscmd.py:51
+#: ../bin/dotscmd:51
msgid "cells per line"
msgstr "celdas por lÃnea"
-#: ../dots/dotscmd.py:53
+#: ../bin/dotscmd:53
msgid "lines per page"
msgstr "lÃneas por página"
-#: ../dots/dotscmd.py:56
+#: ../bin/dotscmd:56
msgid "include page number on every page"
msgstr "incluir el número de página en cada lÃnea"
-#: ../dots/dotscmd.py:58
+#: ../bin/dotscmd:58
msgid "set position for page numbers, where POS is top or bottom"
-msgstr "establece la posicion para los números de página, donde POS es top o bottom"
+msgstr ""
+"establece la posicion para los números de página, donde POS es top o bottom"
-#: ../dots/dotscmd.py:62
+#: ../bin/dotscmd:62
msgid "incorrect number of arguments"
msgstr "número incorrecto de argumentos"
-#: ../dots/dotscmd.py:66
+#: ../bin/dotscmd:66
msgid "Cannot open input file "
msgstr "no se puede abrir el fichero de entrada"
-#: ../dots/dotscmd.py:71
+#: ../bin/dotscmd:71
msgid "a translation table must be specified"
msgstr "hay que especificar una tabla de traducción"
-#: ../dots/dotscmd.py:75
+#: ../bin/dotscmd:75
msgid "page postion can only be top or bottom"
msgstr "la posicion del número de página solo puede ser top o bottom"
-#: ../dots/dotscmd.py:79
+#: ../bin/dotscmd:79
msgid "Cannot open table "
msgstr "No se puede abrir la tabla "
-#: ../dots/dotscmd.py:80
+#: ../bin/dotscmd:80
msgid "Installed tables are:"
msgstr "Las tablas instaladas son: "
-#: ../dots/dotscmd.py:121
-#, python-format
+#: ../bin/dotscmd:121
+#, c-format
msgid "Cannot write to %s: %s"
msgstr "No se puede escribir a %s: %s"
+
+#: ../data/dots.desktop.in.h:1
+msgid "Dots Braille transcription program"
+msgstr ""
+
+#: ../data/dots.desktop.in.h:2
+msgid "Transcribe pdf, html and odt documents into Braille"
+msgstr ""
+
+#: ../data/dotstableditor.desktop.in.h:1
+msgid "Dots table editor"
+msgstr ""
+
+#: ../data/dotstableditor.desktop.in.h:2
+msgid "Edit liblouis Braille translation tables"
+msgstr ""
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
