web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some fixes, does not yet compile

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-03-14 09:03:25 +00:00
parent 6fda6d8c9e
commit 7cd3999fcc
34 changed files with 954 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/designer/makefile.am
View File

@@ -34,22 +34,22 @@ TARGETS = ${QMAKE_TARGET}
QMAKE_MAKEFILE = ${QMAKE_TARGET:%=makefile.qmake.%}
all: ${TARGETS} $
#$(LANGS:%=@PACKAGENAME@_%.ts)
#$(LANGS:%=@PACKAGE_NAME@_%.ts)
rebuild-ts: $(LANGS)
${LUPDATE} @LUPDATE_ARGS@ ${QMAKE_PROJECT}
# ${LANGS}: ${ALL_SRC}
# -rm @PACKAGENAME@_$@.qm
# svn revert @PACKAGENAME@_$@.ts
# mv @PACKAGENAME@_$@.ts translation.old
# -rm @PACKAGE_NAME@_$@.qm
# svn revert @PACKAGE_NAME@_$@.ts
# mv @PACKAGE_NAME@_$@.ts translation.old
# ${LUPDATE} @LUPDATE_ARGS@ ${QMAKE_PROJECT}
# mv @PACKAGENAME@_$@.ts translation.new
# echo '<?xml version="1.0" encoding="utf-8"?>' > @PACKAGENAME@_$@.ts
# echo '<!DOCTYPE TS>' >> @PACKAGENAME@_$@.ts
# echo '<TS version="2.0" language="'$@'">' >> @PACKAGENAME@_$@.ts
# xqilla merge-translation.xquery >> @PACKAGENAME@_$@.ts
# echo '</TS>' >> @PACKAGENAME@_$@.ts
# mv @PACKAGE_NAME@_$@.ts translation.new
# echo '<?xml version="1.0" encoding="utf-8"?>' > @PACKAGE_NAME@_$@.ts
# echo '<!DOCTYPE TS>' >> @PACKAGE_NAME@_$@.ts
# echo '<TS version="2.0" language="'$@'">' >> @PACKAGE_NAME@_$@.ts
# xqilla merge-translation.xquery >> @PACKAGE_NAME@_$@.ts
# echo '</TS>' >> @PACKAGE_NAME@_$@.ts
# rm translation.old translation.new
print:
@@ -62,7 +62,7 @@ print:
@echo "TARGETS=${TARGETS}"
# @PACKAGENAME@_%.qm: @srcdir@/@PACKAGENAME@_%.ts
# @PACKAGE_NAME@_%.qm: @srcdir@/@PACKAGE_NAME@_%.ts
# ${LRELEASE} $< -qm $@
%.xpm: resources/%.png
@@ -74,7 +74,7 @@ print:
${QMAKE_MAKEFILE}: ${QMAKE_PROJECT} ${ALL_SRC}
${QMAKE} -o $@ $< CONFIG+=${@:makefile.qmake.%=%}
# $(LANGS:%=@PACKAGENAME@_%.qm)
# $(LANGS:%=@PACKAGE_NAME@_%.qm)
${QMAKE_TARGET}: ${QMAKE_MAKEFILE} ${ALL_SRC}
make -f makefile.qmake.$@
@@ -92,7 +92,7 @@ uninstall-local:
clean-local:
-rm -r ${QMAKE_TARGET:%=lib%*}
# $(LANGS:%=@PACKAGENAME@_%.qm)
# $(LANGS:%=@PACKAGE_NAME@_%.qm)
CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} \
*.o *.obj qrc_*.cpp ui_*.h moc_*.cpp *.dll \
${QMAKE_TARGET:%=lib%*}

8
src/languages.qrc.in
View File

@@ -1,8 +1,8 @@
<RCC>
<qresource prefix="/language">
<file>@PACKAGENAME@_de.qm</file>
<file>@PACKAGENAME@_fr.qm</file>
<file>@PACKAGENAME@_it.qm</file>
<file>@PACKAGENAME@_en.qm</file>
<file>@PACKAGE_NAME@_de.qm</file>
<file>@PACKAGE_NAME@_fr.qm</file>
<file>@PACKAGE_NAME@_it.qm</file>
<file>@PACKAGE_NAME@_en.qm</file>
</qresource>
</RCC>

10
src/qmake.pro.in
View File

@@ -31,10 +31,10 @@ win32 {
}
ICON = swisssurfer.icns
TRANSLATIONS = @PACKAGENAME@_en.ts \
@PACKAGENAME@_de.ts \
@PACKAGENAME@_fr.ts \
@PACKAGENAME@_it.ts
TRANSLATIONS = @PACKAGE_NAME@_en.ts \
@PACKAGE_NAME@_de.ts \
@PACKAGE_NAME@_fr.ts \
@PACKAGE_NAME@_it.ts
SOURCES = @srcdir@/main.cxx
@@ -54,7 +54,7 @@ FORMS = @srcdir@/browser.ui \
RESOURCES = languages.qrc @srcdir@/resources.qrc
TARGET = @PACKAGENAME@
TARGET = @PACKAGE_NAME@
CODECFORSRC = UTF-8
CODECFORTR = UTF-8

6
src/version.cxx.in
View File

@@ -9,8 +9,8 @@
namespace xml {
std::string version() {
return "@PACKAGENAME@-@VERSION@";
return "@PACKAGE_NAME@-@VERSION@";
}
const std::string WHAT("#(@) @PACKAGENAME@-@VERSION@");
const std::string IDENT("$Id: @PACKAGENAME@-@VERSION@ $");
const std::string WHAT("#(@) @PACKAGE_NAME@-@VERSION@");
const std::string IDENT("$Id: @PACKAGE_NAME@-@VERSION@ $");
}