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

migrating icons back

Browse Source
master
Marc Wäckerlin 9 years ago
parent 328d79731f
commit cc9064e7e8
6 changed files with 148 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      bootstrap.sh
  2. 31
      build-resource-file.sh
  3. 4
      resolve-debbuilddeps.sh
  4. 34
      resolve-rpmbuilddeps.sh
  5. 8
      src/browser.ui
  6. 93
      src/resources.qrc

4
bootstrap.sh
Unescape View File

@ -104,6 +104,8 @@ GENERATED FILES
* ax_cxx_compile_stdcxx_11.m4 - auxiliary macro definition file * ax_cxx_compile_stdcxx_11.m4 - auxiliary macro definition file
* ax_check_qt.m4 - auxiliary macro definition file * ax_check_qt.m4 - auxiliary macro definition file
* resolve-debbuilddeps.sh - script to install debian package dependencies * 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 * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
* AUTHORS - replace your name in AUTHORS before first run * AUTHORS - replace your name in AUTHORS before first run
* NEWS - empty file add your project's news * 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_cxx_compile_stdcxx_11.m4
copy ax_check_qt.m4 copy ax_check_qt.m4
copy resolve-debbuilddeps.sh copy resolve-debbuilddeps.sh
copy resolve-rpmbuilddeps.sh
copy build-resource-file.sh
copy mac-create-app-bundle.sh copy mac-create-app-bundle.sh
AUTHOR=$(gpg -K | sed -n 's,uid *,,p' | sort | head -1) AUTHOR=$(gpg -K | sed -n 's,uid *,,p' | sort | head -1)
if test -z "${AUTHOR}"; then if test -z "${AUTHOR}"; then

31
build-resource-file.sh
Unescape View File

@ -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 <resource-path>.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 "<RCC>" > ${TARGET}
for d in $(find resources -mindepth 1 -type d); do
echo " <qresource prefix=\"${d#${RESOURCES}/}\">" >> ${TARGET}
for f in $(find $d -mindepth 1 -maxdepth 1 -type f); do
echo " <file alias=\"${f##*/}\">$f</file>" >> ${TARGET}
done
echo " </qresource>" >> ${TARGET}
done
echo "</RCC>" >> ${TARGET}

4
resolve-debbuilddeps.sh
Unescape View File

@ -4,8 +4,8 @@
## Resolve Debian Build Dependencies ## Resolve Debian Build Dependencies
## Installs all the required packages ## Installs all the required packages
## Call: ./resolve-builddeps 'name of build schroot' ## Call: ./resolve-debbuilddeps 'name of build schroot'
## e.g. call: ./resolve-builddeps trusty_amd64 ## e.g. call: ./resolve-debbuilddeps trusty_amd64
## 1 2 3 4 5 6 7 8 ## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890

34
resolve-rpmbuilddeps.sh
Unescape View File

@ -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"

8
src/browser.ui
Unescape View File

@ -70,7 +70,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1009</width> <width>1009</width>
<height>23</height> <height>22</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuDatei"> <widget class="QMenu" name="menuDatei">
@ -165,7 +165,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/32x32/butt32_03.png</normaloff>:/icons/32x32/butt32_03.png</iconset> <normaloff>:/icons/back.png</normaloff>:/icons/back.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>zurückkehren</string> <string>zurückkehren</string>
@ -183,7 +183,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/32x32/butt32_04.png</normaloff>:/icons/32x32/butt32_04.png</iconset> <normaloff>:/icons/forward.png</normaloff>:/icons/forward.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>weitergehen</string> <string>weitergehen</string>
@ -198,7 +198,7 @@
<action name="actionHome"> <action name="actionHome">
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/32x32/butt32_01.png</normaloff>:/icons/32x32/butt32_01.png</iconset> <normaloff>:/icons/gohome.png</normaloff>:/icons/gohome.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Startseite</string> <string>Startseite</string>

93
src/resources.qrc
Unescape View File

@ -1,36 +1,89 @@
<RCC> <RCC>
<qresource prefix="icons">
<file alias="tel.png">resources/icons/tel.png</file>
<file alias="wp.png">resources/icons/wp.png</file>
<file alias="swisssurfer_32x32x32.png">resources/icons/swisssurfer_32x32x32.png</file>
<file alias="printpreview.svg">resources/icons/printpreview.svg</file>
<file alias="newtab.png">resources/icons/newtab.png</file>
<file alias="source">resources/icons/source</file>
<file alias="gohome.png">resources/icons/gohome.png</file>
<file alias="up.png">resources/icons/up.png</file>
<file alias="newtab.svg">resources/icons/newtab.svg</file>
<file alias="stop.png">resources/icons/stop.png</file>
<file alias="settings.png">resources/icons/settings.png</file>
<file alias="swisssurfer.png">resources/icons/swisssurfer.png</file>
<file alias="usercert.png">resources/icons/usercert.png</file>
<file alias="close.png">resources/icons/close.png</file>
<file alias="forward.png">resources/icons/forward.png</file>
<file alias="usercert.svg">resources/icons/usercert.svg</file>
<file alias="settings.svg">resources/icons/settings.svg</file>
<file alias="addbookmark.png">resources/icons/addbookmark.png</file>
<file alias="newwindow.png">resources/icons/newwindow.png</file>
<file alias="clearlocation.svg">resources/icons/clearlocation.svg</file>
<file alias="printpreview.png">resources/icons/printpreview.png</file>
<file alias="find.png">resources/icons/find.png</file>
<file alias="error.png">resources/icons/error.png</file>
<file alias="newwindow.svg">resources/icons/newwindow.svg</file>
<file alias="reload.png">resources/icons/reload.png</file>
<file alias="about.png">resources/icons/about.png</file>
<file alias="back.png">resources/icons/back.png</file>
<file alias="clearlocation.png">resources/icons/clearlocation.png</file>
<file alias="about.svg">resources/icons/about.svg</file>
<file alias="find.svg">resources/icons/find.svg</file>
<file alias="swisssurfer.ico">resources/icons/swisssurfer.ico</file>
<file alias="print.png">resources/icons/print.png</file>
<file alias="print.svg">resources/icons/print.svg</file>
<file alias="close.svg">resources/icons/close.svg</file>
<file alias="addbookmark.svg">resources/icons/addbookmark.svg</file>
<file alias="gg.png">resources/icons/gg.png</file>
<file alias="error.svg">resources/icons/error.svg</file>
</qresource>
<qresource prefix="icons/48x48">
<file alias="SW_SwissSurfer_48x48x32.png">resources/icons/48x48/SW_SwissSurfer_48x48x32.png</file>
</qresource>
<qresource prefix="icons/32x32"> <qresource prefix="icons/32x32">
<file alias="butt32_49.png">resources/icons/32x32/butt32_49.png</file>
<file alias="swisssurfer.png">resources/icons/32x32/swisssurfer.png</file>
<file alias="butt32_01.png">resources/icons/32x32/butt32_01.png</file>
<file alias="butt32_02.png">resources/icons/32x32/butt32_02.png</file> <file alias="butt32_02.png">resources/icons/32x32/butt32_02.png</file>
<file alias="butt32_03.png">resources/icons/32x32/butt32_03.png</file>
<file alias="butt32_04.png">resources/icons/32x32/butt32_04.png</file>
<file alias="butt32_05.png">resources/icons/32x32/butt32_05.png</file> <file alias="butt32_05.png">resources/icons/32x32/butt32_05.png</file>
<file alias="butt32_06.png">resources/icons/32x32/butt32_06.png</file>
<file alias="butt32_07.png">resources/icons/32x32/butt32_07.png</file>
<file alias="butt32_08.png">resources/icons/32x32/butt32_08.png</file>
<file alias="butt32_09.png">resources/icons/32x32/butt32_09.png</file> <file alias="butt32_09.png">resources/icons/32x32/butt32_09.png</file>
<file alias="butt32_09_sw.png">resources/icons/32x32/butt32_09_sw.png</file> <file alias="butt32_09_sw.png">resources/icons/32x32/butt32_09_sw.png</file>
<file alias="butt32_10.png">resources/icons/32x32/butt32_10.png</file> <file alias="favicon.ico">resources/icons/32x32/favicon.ico</file>
<file alias="butt32_10_sw.png">resources/icons/32x32/butt32_10_sw.png</file>
<file alias="butt32_11.png">resources/icons/32x32/butt32_11.png</file> <file alias="butt32_11.png">resources/icons/32x32/butt32_11.png</file>
<file alias="butt32_06.png">resources/icons/32x32/butt32_06.png</file>
<file alias="butt32_10_sw.png">resources/icons/32x32/butt32_10_sw.png</file>
<file alias="butt32_01.png">resources/icons/32x32/butt32_01.png</file>
<file alias="butt32_03.png">resources/icons/32x32/butt32_03.png</file>
<file alias="butt32_07.png">resources/icons/32x32/butt32_07.png</file>
<file alias="butt32_49.png">resources/icons/32x32/butt32_49.png</file>
<file alias="butt32_10.png">resources/icons/32x32/butt32_10.png</file>
<file alias="butt32_04.png">resources/icons/32x32/butt32_04.png</file>
<file alias="butt32_08.png">resources/icons/32x32/butt32_08.png</file>
<file alias="swisssurfer.png">resources/icons/32x32/swisssurfer.png</file>
</qresource> </qresource>
<qresource prefix="icons/16x16"> <qresource prefix="icons/16x16">
<file alias="butt16_49.png">resources/icons/16x16/butt16_49.png</file> <file alias="favicon.ico">resources/icons/16x16/favicon.ico</file>
<file alias="swisssurfer.png">resources/icons/16x16/swisssurfer.png</file> <file alias="butt16_11.png">resources/icons/16x16/butt16_11.png</file>
<file alias="butt16_06.png">resources/icons/16x16/butt16_06.png</file>
<file alias="butt16_10_sw.png">resources/icons/16x16/butt16_10_sw.png</file>
<file alias="butt16_01.png">resources/icons/16x16/butt16_01.png</file> <file alias="butt16_01.png">resources/icons/16x16/butt16_01.png</file>
<file alias="butt16_02.png">resources/icons/16x16/butt16_02.png</file>
<file alias="butt16_03.png">resources/icons/16x16/butt16_03.png</file> <file alias="butt16_03.png">resources/icons/16x16/butt16_03.png</file>
<file alias="butt16_04.png">resources/icons/16x16/butt16_04.png</file>
<file alias="butt16_05.png">resources/icons/16x16/butt16_05.png</file>
<file alias="butt16_06.png">resources/icons/16x16/butt16_06.png</file>
<file alias="butt16_07.png">resources/icons/16x16/butt16_07.png</file> <file alias="butt16_07.png">resources/icons/16x16/butt16_07.png</file>
<file alias="butt16_49.png">resources/icons/16x16/butt16_49.png</file>
<file alias="butt16_10.png">resources/icons/16x16/butt16_10.png</file>
<file alias="butt16_04.png">resources/icons/16x16/butt16_04.png</file>
<file alias="butt16_08.png">resources/icons/16x16/butt16_08.png</file> <file alias="butt16_08.png">resources/icons/16x16/butt16_08.png</file>
<file alias="butt16_09.png">resources/icons/16x16/butt16_09.png</file> <file alias="swisssurfer.png">resources/icons/16x16/swisssurfer.png</file>
<file alias="butt16_09_sw.png">resources/icons/16x16/butt16_09_sw.png</file> <file alias="butt16_09_sw.png">resources/icons/16x16/butt16_09_sw.png</file>
<file alias="butt16_10.png">resources/icons/16x16/butt16_10.png</file> <file alias="butt16_02.png">resources/icons/16x16/butt16_02.png</file>
<file alias="butt16_10_sw.png">resources/icons/16x16/butt16_10_sw.png</file> <file alias="butt16_05.png">resources/icons/16x16/butt16_05.png</file>
<file alias="butt16_11.png">resources/icons/16x16/butt16_11.png</file> <file alias="butt16_09.png">resources/icons/16x16/butt16_09.png</file>
</qresource>
<qresource prefix="icons/512x512">
<file alias="SW_SwissSurfer_512x512x32.png">resources/icons/512x512/SW_SwissSurfer_512x512x32.png</file>
</qresource>
<qresource prefix="icons/128x128">
<file alias="SW_SwissSurfer_128x128x32.png">resources/icons/128x128/SW_SwissSurfer_128x128x32.png</file>
</qresource>
<qresource prefix="icons/256x256">
<file alias="SW_SwissSurfer_256x256x32.png">resources/icons/256x256/SW_SwissSurfer_256x256x32.png</file>
</qresource> </qresource>
</RCC> </RCC>

Write Preview
Loading…
Cancel
Save