From 58e4b6d9320ae9c2d00a85e9a9cfa6f4eafbe30d Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 17 May 2008 20:41:33 +0000 Subject: [FIX] Pokemodr overlays are now in overlays, not images/overlays [FIX] Better installing procedures [FIX] Desktop file now valid [FIX] Building now does not touch out of main directory [FIX] Documentation moved around to proper places git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@145 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokemodr/images/overlays.qrc | 11 ----------- pokemodr/images/overlays/effect.png | Bin 340 -> 0 bytes pokemodr/images/overlays/no-walk.png | Bin 149 -> 0 bytes pokemodr/images/overlays/trainer.png | Bin 284 -> 0 bytes pokemodr/images/overlays/walk.png | Bin 192 -> 0 bytes pokemodr/images/overlays/warp.png | Bin 296 -> 0 bytes pokemodr/images/overlays/water.png | Bin 192 -> 0 bytes pokemodr/images/overlays/wilds.png | Bin 418 -> 0 bytes pokemodr/overlays/effect.png | Bin 0 -> 340 bytes pokemodr/overlays/no-walk.png | Bin 0 -> 149 bytes pokemodr/overlays/overlays.qrc | 11 +++++++++++ pokemodr/overlays/trainer.png | Bin 0 -> 284 bytes pokemodr/overlays/walk.png | Bin 0 -> 192 bytes pokemodr/overlays/warp.png | Bin 0 -> 296 bytes pokemodr/overlays/water.png | Bin 0 -> 192 bytes pokemodr/overlays/wilds.png | Bin 0 -> 418 bytes pokemodr/pokemodr.desktop | 9 +++++---- pokemodr/pokemodr.pro | 30 ++++++++++++++++++++++++------ 18 files changed, 40 insertions(+), 21 deletions(-) delete mode 100644 pokemodr/images/overlays.qrc delete mode 100644 pokemodr/images/overlays/effect.png delete mode 100644 pokemodr/images/overlays/no-walk.png delete mode 100644 pokemodr/images/overlays/trainer.png delete mode 100644 pokemodr/images/overlays/walk.png delete mode 100644 pokemodr/images/overlays/warp.png delete mode 100644 pokemodr/images/overlays/water.png delete mode 100644 pokemodr/images/overlays/wilds.png create mode 100644 pokemodr/overlays/effect.png create mode 100644 pokemodr/overlays/no-walk.png create mode 100644 pokemodr/overlays/overlays.qrc create mode 100644 pokemodr/overlays/trainer.png create mode 100644 pokemodr/overlays/walk.png create mode 100644 pokemodr/overlays/warp.png create mode 100644 pokemodr/overlays/water.png create mode 100644 pokemodr/overlays/wilds.png (limited to 'pokemodr') diff --git a/pokemodr/images/overlays.qrc b/pokemodr/images/overlays.qrc deleted file mode 100644 index 98be3f31..00000000 --- a/pokemodr/images/overlays.qrc +++ /dev/null @@ -1,11 +0,0 @@ - - - overlays/effect.png - overlays/no-walk.png - overlays/trainer.png - overlays/walk.png - overlays/warp.png - overlays/water.png - overlays/wilds.png - - diff --git a/pokemodr/images/overlays/effect.png b/pokemodr/images/overlays/effect.png deleted file mode 100644 index 6d4c38a1..00000000 Binary files a/pokemodr/images/overlays/effect.png and /dev/null differ diff --git a/pokemodr/images/overlays/no-walk.png b/pokemodr/images/overlays/no-walk.png deleted file mode 100644 index 11b15e81..00000000 Binary files a/pokemodr/images/overlays/no-walk.png and /dev/null differ diff --git a/pokemodr/images/overlays/trainer.png b/pokemodr/images/overlays/trainer.png deleted file mode 100644 index e0d23cae..00000000 Binary files a/pokemodr/images/overlays/trainer.png and /dev/null differ diff --git a/pokemodr/images/overlays/walk.png b/pokemodr/images/overlays/walk.png deleted file mode 100644 index f4e69557..00000000 Binary files a/pokemodr/images/overlays/walk.png and /dev/null differ diff --git a/pokemodr/images/overlays/warp.png b/pokemodr/images/overlays/warp.png deleted file mode 100644 index 20baeb10..00000000 Binary files a/pokemodr/images/overlays/warp.png and /dev/null differ diff --git a/pokemodr/images/overlays/water.png b/pokemodr/images/overlays/water.png deleted file mode 100644 index b625a0b0..00000000 Binary files a/pokemodr/images/overlays/water.png and /dev/null differ diff --git a/pokemodr/images/overlays/wilds.png b/pokemodr/images/overlays/wilds.png deleted file mode 100644 index 45dcda5f..00000000 Binary files a/pokemodr/images/overlays/wilds.png and /dev/null differ diff --git a/pokemodr/overlays/effect.png b/pokemodr/overlays/effect.png new file mode 100644 index 00000000..6d4c38a1 Binary files /dev/null and b/pokemodr/overlays/effect.png differ diff --git a/pokemodr/overlays/no-walk.png b/pokemodr/overlays/no-walk.png new file mode 100644 index 00000000..11b15e81 Binary files /dev/null and b/pokemodr/overlays/no-walk.png differ diff --git a/pokemodr/overlays/overlays.qrc b/pokemodr/overlays/overlays.qrc new file mode 100644 index 00000000..dbee4543 --- /dev/null +++ b/pokemodr/overlays/overlays.qrc @@ -0,0 +1,11 @@ + + + effect.png + no-walk.png + trainer.png + walk.png + warp.png + water.png + wilds.png + + diff --git a/pokemodr/overlays/trainer.png b/pokemodr/overlays/trainer.png new file mode 100644 index 00000000..e0d23cae Binary files /dev/null and b/pokemodr/overlays/trainer.png differ diff --git a/pokemodr/overlays/walk.png b/pokemodr/overlays/walk.png new file mode 100644 index 00000000..f4e69557 Binary files /dev/null and b/pokemodr/overlays/walk.png differ diff --git a/pokemodr/overlays/warp.png b/pokemodr/overlays/warp.png new file mode 100644 index 00000000..20baeb10 Binary files /dev/null and b/pokemodr/overlays/warp.png differ diff --git a/pokemodr/overlays/water.png b/pokemodr/overlays/water.png new file mode 100644 index 00000000..b625a0b0 Binary files /dev/null and b/pokemodr/overlays/water.png differ diff --git a/pokemodr/overlays/wilds.png b/pokemodr/overlays/wilds.png new file mode 100644 index 00000000..45dcda5f Binary files /dev/null and b/pokemodr/overlays/wilds.png differ diff --git a/pokemodr/pokemodr.desktop b/pokemodr/pokemodr.desktop index 97854ee2..a87c55f4 100644 --- a/pokemodr/pokemodr.desktop +++ b/pokemodr/pokemodr.desktop @@ -1,9 +1,10 @@ [Desktop Entry] -Version=0.0.1 +Encoding=UTF-8 Type=Application Name=PokéModr Comment=Program to edit PokéMods -TryExec=pokemodr -Exec=pokemodr %U +GenericName=Program to edit PokéMods +Exec=/usr/bin/pokemodr %U Icon=pokemodr -MimeType=text/x-pokemod+xml +Categories=Qt;KDE;Game; +MimeType=application/x-pokemod+xml; diff --git a/pokemodr/pokemodr.pro b/pokemodr/pokemodr.pro index 1b9be0fc..2c649d20 100644 --- a/pokemodr/pokemodr.pro +++ b/pokemodr/pokemodr.pro @@ -2,8 +2,8 @@ TEMPLATE = app OBJECTS_DIR = .obj UI_DIR = .ui MOC_DIR = .moc -DESTDIR = ../../bin -LIBS += -L../../bin \ +DESTDIR = ../bin +LIBS += -L../bin \ -lgeneral \ -lpokemod \ -lphonon \ @@ -19,7 +19,7 @@ QT += xml CONFIG += debug } -RESOURCES += images/overlays.qrc +RESOURCES += overlays/overlays.qrc win32 { TARGETDEPS += $${DESTDIR}/pokemod.dll $${DESTDIR}/general.dll @@ -265,7 +265,14 @@ FORMS += gui/ability.ui \ gui/trainer.ui \ gui/type.ui -INSTALLS += target +doc.target = doc +doc.commands = pdflatex pokemodr.tex && \ + pdflatex pokemodr.tex && \ + rm pokemodr.aux pokemodr.log pokemodr.out pokemodr.toc && \ + mv pokemodr.pdf ../doc/pokemodr.pdf + +QMAKE_EXTRA_UNIX_TARGETS += doc + isEmpty(PREFIX) { PREFIX = $$(PREFIX) } @@ -273,5 +280,16 @@ isEmpty(PREFIX) { PREFIX = /usr } target.path = $$PREFIX/bin - -DISTFILES += TODO +resources.path = $$PREFIX/share/pokegen/overlays +resources.files = overlays/overlays.qrc \ + overlays/effect.png \ + overlays/no-walk.png \ + overlays/trainer.png \ + overlays/walk.png \ + overlays/warp.png \ + overlays/water.png \ + overlays/wilds.png +documentation.path = $$PREFIX/share/doc/pokegen-$${VERSION} +documentation.files = ../doc/pokemodr.pdf +documentation.extra = make doc +INSTALLS += target resources documentation -- cgit