diff --git a/bootstrap.sh b/bootstrap.sh index 3a1e50d..3154dba 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -104,6 +104,8 @@ GENERATED FILES * ax_cxx_compile_stdcxx_11.m4 - auxiliary macro definition file * ax_check_qt.m4 - auxiliary macro definition file * resolve-debbuilddeps.sh - script to install debian package dependencies + * resolve-rpmbuilddeps.sh - script to install RPM package dependencies + * build-resource-file.sh - build resource.qrc file from a resource directory * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle * AUTHORS - replace your name in AUTHORS before first run * NEWS - empty file add your project's news @@ -387,6 +389,8 @@ copy ax_init_standard_project.m4 copy ax_cxx_compile_stdcxx_11.m4 copy ax_check_qt.m4 copy resolve-debbuilddeps.sh +copy resolve-rpmbuilddeps.sh +copy build-resource-file.sh copy mac-create-app-bundle.sh AUTHOR=$(gpg -K | sed -n 's,uid *,,p' | sort | head -1) if test -z "${AUTHOR}"; then diff --git a/build-resource-file.sh b/build-resource-file.sh new file mode 100755 index 0000000..746b82c --- /dev/null +++ b/build-resource-file.sh @@ -0,0 +1,31 @@ +#! /bin/bash -ex + +## @id $Id$ + +## build resource.qrc file from a resource directory +## +## Argument: $1: resource path (default: resources) +## Result: file named .qrc (default: resources.qrc) +## +## Call: +## +## cd src +## ../build-resource-file.sh + +## 1 2 3 4 5 6 7 8 +## 45678901234567890123456789012345678901234567890123456789012345678901234567890 + +RESOURCES=${1:-resources} +TARGET=${RESOURCES}.qrc + +test -d ${RESOURCES} + +echo "" > ${TARGET} +for d in $(find resources -mindepth 1 -type d); do + echo " " >> ${TARGET} + for f in $(find $d -mindepth 1 -maxdepth 1 -type f); do + echo " $f" >> ${TARGET} + done + echo " " >> ${TARGET} +done +echo "" >> ${TARGET} diff --git a/resolve-debbuilddeps.sh b/resolve-debbuilddeps.sh index f0f2496..9da3c80 100755 --- a/resolve-debbuilddeps.sh +++ b/resolve-debbuilddeps.sh @@ -4,8 +4,8 @@ ## Resolve Debian Build Dependencies ## Installs all the required packages -## Call: ./resolve-builddeps 'name of build schroot' -## e.g. call: ./resolve-builddeps trusty_amd64 +## Call: ./resolve-debbuilddeps 'name of build schroot' +## e.g. call: ./resolve-debbuilddeps trusty_amd64 ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 diff --git a/resolve-rpmbuilddeps.sh b/resolve-rpmbuilddeps.sh new file mode 100755 index 0000000..efa546f --- /dev/null +++ b/resolve-rpmbuilddeps.sh @@ -0,0 +1,34 @@ +#! /bin/bash -ex + +## @id $Id$ + +## Resolve RPM Build Dependencies +## Installs all the required packages +## Call: ./resolve-rpmbuilddeps 'name of build schroot' +## e.g. call: ./resolve-rpmbuilddeps opensuse-13.2_x86_64 + +## 1 2 3 4 5 6 7 8 +## 45678901234567890123456789012345678901234567890123456789012345678901234567890 + +SCHROOTNAME="$1" +PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac) + +sed 's,@[^@]*@,dummytext,g' ${PACKAGE_NAME}.spec.in > ${PACKAGE_NAME}.spec + +if test -n "${SCHROOTNAME}"; then + FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') + if test -n "${FILES}"; then + schroot -c ${SCHROOTNAME} -u root -- yum install -y ${FILES} || \ + schroot -c ${SCHROOTNAME} -u root -- zypper install -y ${FILES} || \ + schroot -c ${SCHROOTNAME} -u root -- dnf install -y ${FILES} + fi +else + FILES=$(LANG= rpmbuild -bb --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') + if test -n "${FILES}"; then + yum install -y ${FILES} || \ + zypper install -y ${FILES} || \ + dnf install -y ${FILES} + fi +fi + +echo "**** Success: All Dependencies Resolved" diff --git a/src/browser.ui b/src/browser.ui index 55e97c8..7d7dcb2 100644 --- a/src/browser.ui +++ b/src/browser.ui @@ -70,7 +70,7 @@ 0 0 1009 - 23 + 22 @@ -165,7 +165,7 @@ - :/icons/32x32/butt32_03.png:/icons/32x32/butt32_03.png + :/icons/back.png:/icons/back.png zurückkehren @@ -183,7 +183,7 @@ - :/icons/32x32/butt32_04.png:/icons/32x32/butt32_04.png + :/icons/forward.png:/icons/forward.png weitergehen @@ -198,7 +198,7 @@ - :/icons/32x32/butt32_01.png:/icons/32x32/butt32_01.png + :/icons/gohome.png:/icons/gohome.png Startseite diff --git a/src/resources.qrc b/src/resources.qrc index 146678c..e47e9d4 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -1,36 +1,89 @@ + + resources/icons/tel.png + resources/icons/wp.png + resources/icons/swisssurfer_32x32x32.png + resources/icons/printpreview.svg + resources/icons/newtab.png + resources/icons/source + resources/icons/gohome.png + resources/icons/up.png + resources/icons/newtab.svg + resources/icons/stop.png + resources/icons/settings.png + resources/icons/swisssurfer.png + resources/icons/usercert.png + resources/icons/close.png + resources/icons/forward.png + resources/icons/usercert.svg + resources/icons/settings.svg + resources/icons/addbookmark.png + resources/icons/newwindow.png + resources/icons/clearlocation.svg + resources/icons/printpreview.png + resources/icons/find.png + resources/icons/error.png + resources/icons/newwindow.svg + resources/icons/reload.png + resources/icons/about.png + resources/icons/back.png + resources/icons/clearlocation.png + resources/icons/about.svg + resources/icons/find.svg + resources/icons/swisssurfer.ico + resources/icons/print.png + resources/icons/print.svg + resources/icons/close.svg + resources/icons/addbookmark.svg + resources/icons/gg.png + resources/icons/error.svg + + + resources/icons/48x48/SW_SwissSurfer_48x48x32.png + - resources/icons/32x32/butt32_49.png - resources/icons/32x32/swisssurfer.png - resources/icons/32x32/butt32_01.png resources/icons/32x32/butt32_02.png - resources/icons/32x32/butt32_03.png - resources/icons/32x32/butt32_04.png resources/icons/32x32/butt32_05.png - resources/icons/32x32/butt32_06.png - resources/icons/32x32/butt32_07.png - resources/icons/32x32/butt32_08.png resources/icons/32x32/butt32_09.png resources/icons/32x32/butt32_09_sw.png - resources/icons/32x32/butt32_10.png - resources/icons/32x32/butt32_10_sw.png + resources/icons/32x32/favicon.ico resources/icons/32x32/butt32_11.png + resources/icons/32x32/butt32_06.png + resources/icons/32x32/butt32_10_sw.png + resources/icons/32x32/butt32_01.png + resources/icons/32x32/butt32_03.png + resources/icons/32x32/butt32_07.png + resources/icons/32x32/butt32_49.png + resources/icons/32x32/butt32_10.png + resources/icons/32x32/butt32_04.png + resources/icons/32x32/butt32_08.png + resources/icons/32x32/swisssurfer.png - resources/icons/16x16/butt16_49.png - resources/icons/16x16/swisssurfer.png + resources/icons/16x16/favicon.ico + resources/icons/16x16/butt16_11.png + resources/icons/16x16/butt16_06.png + resources/icons/16x16/butt16_10_sw.png resources/icons/16x16/butt16_01.png - resources/icons/16x16/butt16_02.png resources/icons/16x16/butt16_03.png - resources/icons/16x16/butt16_04.png - resources/icons/16x16/butt16_05.png - resources/icons/16x16/butt16_06.png resources/icons/16x16/butt16_07.png + resources/icons/16x16/butt16_49.png + resources/icons/16x16/butt16_10.png + resources/icons/16x16/butt16_04.png resources/icons/16x16/butt16_08.png - resources/icons/16x16/butt16_09.png + resources/icons/16x16/swisssurfer.png resources/icons/16x16/butt16_09_sw.png - resources/icons/16x16/butt16_10.png - resources/icons/16x16/butt16_10_sw.png - resources/icons/16x16/butt16_11.png + resources/icons/16x16/butt16_02.png + resources/icons/16x16/butt16_05.png + resources/icons/16x16/butt16_09.png + + + resources/icons/512x512/SW_SwissSurfer_512x512x32.png + + + resources/icons/128x128/SW_SwissSurfer_128x128x32.png + + + resources/icons/256x256/SW_SwissSurfer_256x256x32.png