diff --git a/promoe.1 b/data/promoe.1 similarity index 100% rename from promoe.1 rename to data/promoe.1 diff --git a/promoe.desktop b/data/promoe.desktop similarity index 94% rename from promoe.desktop rename to data/promoe.desktop index d73d4f0..d506dab 100644 --- a/promoe.desktop +++ b/data/promoe.desktop @@ -5,7 +5,7 @@ Name=Promoe GenericName=XMMS2 Client Categories=Qt;Application;AudioVideo;Audio; Exec=promoe -Icon=xmms2 +Icon=promoe Terminal=false Type=Application diff --git a/data/Almond-blue.qrc b/data/skins/Almond-blue.qrc similarity index 100% rename from data/Almond-blue.qrc rename to data/skins/Almond-blue.qrc diff --git a/data/Almond-blue/Balance.bmp b/data/skins/Almond-blue/Balance.bmp similarity index 100% rename from data/Almond-blue/Balance.bmp rename to data/skins/Almond-blue/Balance.bmp diff --git a/data/Almond-blue/Cbuttons.bmp b/data/skins/Almond-blue/Cbuttons.bmp similarity index 100% rename from data/Almond-blue/Cbuttons.bmp rename to data/skins/Almond-blue/Cbuttons.bmp diff --git a/data/Almond-blue/EqMain.bmp b/data/skins/Almond-blue/EqMain.bmp similarity index 100% rename from data/Almond-blue/EqMain.bmp rename to data/skins/Almond-blue/EqMain.bmp diff --git a/data/Almond-blue/Eq_Ex.bmp b/data/skins/Almond-blue/Eq_Ex.bmp similarity index 100% rename from data/Almond-blue/Eq_Ex.bmp rename to data/skins/Almond-blue/Eq_Ex.bmp diff --git a/data/Almond-blue/Main.bmp b/data/skins/Almond-blue/Main.bmp similarity index 100% rename from data/Almond-blue/Main.bmp rename to data/skins/Almond-blue/Main.bmp diff --git a/data/Almond-blue/MonoSter.bmp b/data/skins/Almond-blue/MonoSter.bmp similarity index 100% rename from data/Almond-blue/MonoSter.bmp rename to data/skins/Almond-blue/MonoSter.bmp diff --git a/data/Almond-blue/Numbers.bmp b/data/skins/Almond-blue/Numbers.bmp similarity index 100% rename from data/Almond-blue/Numbers.bmp rename to data/skins/Almond-blue/Numbers.bmp diff --git a/data/Almond-blue/PlEdit.bmp b/data/skins/Almond-blue/PlEdit.bmp similarity index 100% rename from data/Almond-blue/PlEdit.bmp rename to data/skins/Almond-blue/PlEdit.bmp diff --git a/data/Almond-blue/PlEdit.txt b/data/skins/Almond-blue/PlEdit.txt similarity index 100% rename from data/Almond-blue/PlEdit.txt rename to data/skins/Almond-blue/PlEdit.txt diff --git a/data/Almond-blue/PlayPaus.bmp b/data/skins/Almond-blue/PlayPaus.bmp similarity index 100% rename from data/Almond-blue/PlayPaus.bmp rename to data/skins/Almond-blue/PlayPaus.bmp diff --git a/data/Almond-blue/PosBar.bmp b/data/skins/Almond-blue/PosBar.bmp similarity index 100% rename from data/Almond-blue/PosBar.bmp rename to data/skins/Almond-blue/PosBar.bmp diff --git a/data/Almond-blue/Readme.txt b/data/skins/Almond-blue/Readme.txt similarity index 100% rename from data/Almond-blue/Readme.txt rename to data/skins/Almond-blue/Readme.txt diff --git a/data/Almond-blue/ShufRep.bmp b/data/skins/Almond-blue/ShufRep.bmp similarity index 100% rename from data/Almond-blue/ShufRep.bmp rename to data/skins/Almond-blue/ShufRep.bmp diff --git a/data/Almond-blue/Text.bmp b/data/skins/Almond-blue/Text.bmp similarity index 100% rename from data/Almond-blue/Text.bmp rename to data/skins/Almond-blue/Text.bmp diff --git a/data/Almond-blue/Titlebar.bmp b/data/skins/Almond-blue/Titlebar.bmp similarity index 100% rename from data/Almond-blue/Titlebar.bmp rename to data/skins/Almond-blue/Titlebar.bmp diff --git a/data/Almond-blue/VisColor.txt b/data/skins/Almond-blue/VisColor.txt similarity index 100% rename from data/Almond-blue/VisColor.txt rename to data/skins/Almond-blue/VisColor.txt diff --git a/data/Almond-blue/Volume.bmp b/data/skins/Almond-blue/Volume.bmp similarity index 100% rename from data/Almond-blue/Volume.bmp rename to data/skins/Almond-blue/Volume.bmp diff --git a/data/CleanAMP.qrc b/data/skins/CleanAMP.qrc similarity index 100% rename from data/CleanAMP.qrc rename to data/skins/CleanAMP.qrc diff --git a/data/CleanAMP/Eq_ex.png b/data/skins/CleanAMP/Eq_ex.png similarity index 100% rename from data/CleanAMP/Eq_ex.png rename to data/skins/CleanAMP/Eq_ex.png diff --git a/data/CleanAMP/GENEX.png b/data/skins/CleanAMP/GENEX.png similarity index 100% rename from data/CleanAMP/GENEX.png rename to data/skins/CleanAMP/GENEX.png diff --git a/data/CleanAMP/Gen.png b/data/skins/CleanAMP/Gen.png similarity index 100% rename from data/CleanAMP/Gen.png rename to data/skins/CleanAMP/Gen.png diff --git a/data/CleanAMP/PLEDIT.TXT b/data/skins/CleanAMP/PLEDIT.TXT similarity index 100% rename from data/CleanAMP/PLEDIT.TXT rename to data/skins/CleanAMP/PLEDIT.TXT diff --git a/data/CleanAMP/ReadMe.txt b/data/skins/CleanAMP/ReadMe.txt similarity index 100% rename from data/CleanAMP/ReadMe.txt rename to data/skins/CleanAMP/ReadMe.txt diff --git a/data/CleanAMP/VIDEO.png b/data/skins/CleanAMP/VIDEO.png similarity index 100% rename from data/CleanAMP/VIDEO.png rename to data/skins/CleanAMP/VIDEO.png diff --git a/data/CleanAMP/Volume.png b/data/skins/CleanAMP/Volume.png similarity index 100% rename from data/CleanAMP/Volume.png rename to data/skins/CleanAMP/Volume.png diff --git a/data/CleanAMP/balance.png b/data/skins/CleanAMP/balance.png similarity index 100% rename from data/CleanAMP/balance.png rename to data/skins/CleanAMP/balance.png diff --git a/data/CleanAMP/cbuttons.png b/data/skins/CleanAMP/cbuttons.png similarity index 100% rename from data/CleanAMP/cbuttons.png rename to data/skins/CleanAMP/cbuttons.png diff --git a/data/CleanAMP/eqmain.png b/data/skins/CleanAMP/eqmain.png similarity index 100% rename from data/CleanAMP/eqmain.png rename to data/skins/CleanAMP/eqmain.png diff --git a/data/CleanAMP/main.png b/data/skins/CleanAMP/main.png similarity index 100% rename from data/CleanAMP/main.png rename to data/skins/CleanAMP/main.png diff --git a/data/CleanAMP/mb.png b/data/skins/CleanAMP/mb.png similarity index 100% rename from data/CleanAMP/mb.png rename to data/skins/CleanAMP/mb.png diff --git a/data/CleanAMP/monoster.png b/data/skins/CleanAMP/monoster.png similarity index 100% rename from data/CleanAMP/monoster.png rename to data/skins/CleanAMP/monoster.png diff --git a/data/CleanAMP/numbers.png b/data/skins/CleanAMP/numbers.png similarity index 100% rename from data/CleanAMP/numbers.png rename to data/skins/CleanAMP/numbers.png diff --git a/data/CleanAMP/playpaus.png b/data/skins/CleanAMP/playpaus.png similarity index 100% rename from data/CleanAMP/playpaus.png rename to data/skins/CleanAMP/playpaus.png diff --git a/data/CleanAMP/pledit.png b/data/skins/CleanAMP/pledit.png similarity index 100% rename from data/CleanAMP/pledit.png rename to data/skins/CleanAMP/pledit.png diff --git a/data/CleanAMP/posbar.png b/data/skins/CleanAMP/posbar.png similarity index 100% rename from data/CleanAMP/posbar.png rename to data/skins/CleanAMP/posbar.png diff --git a/data/CleanAMP/shufrep.png b/data/skins/CleanAMP/shufrep.png similarity index 100% rename from data/CleanAMP/shufrep.png rename to data/skins/CleanAMP/shufrep.png diff --git a/data/CleanAMP/text.png b/data/skins/CleanAMP/text.png similarity index 100% rename from data/CleanAMP/text.png rename to data/skins/CleanAMP/text.png diff --git a/data/CleanAMP/titlebar.png b/data/skins/CleanAMP/titlebar.png similarity index 100% rename from data/CleanAMP/titlebar.png rename to data/skins/CleanAMP/titlebar.png diff --git a/data/CleanAMP/viscolor.txt b/data/skins/CleanAMP/viscolor.txt similarity index 100% rename from data/CleanAMP/viscolor.txt rename to data/skins/CleanAMP/viscolor.txt diff --git a/data/Debian/README b/data/skins/Debian/README similarity index 100% rename from data/Debian/README rename to data/skins/Debian/README diff --git a/data/Debian/balance.bmp b/data/skins/Debian/balance.bmp similarity index 100% rename from data/Debian/balance.bmp rename to data/skins/Debian/balance.bmp diff --git a/data/Debian/cbuttons.bmp b/data/skins/Debian/cbuttons.bmp similarity index 100% rename from data/Debian/cbuttons.bmp rename to data/skins/Debian/cbuttons.bmp diff --git a/data/Debian/eq_ex.bmp b/data/skins/Debian/eq_ex.bmp similarity index 100% rename from data/Debian/eq_ex.bmp rename to data/skins/Debian/eq_ex.bmp diff --git a/data/Debian/eqmain.bmp b/data/skins/Debian/eqmain.bmp similarity index 100% rename from data/Debian/eqmain.bmp rename to data/skins/Debian/eqmain.bmp diff --git a/data/Debian/kjell-fatal.png b/data/skins/Debian/kjell-fatal.png similarity index 100% rename from data/Debian/kjell-fatal.png rename to data/skins/Debian/kjell-fatal.png diff --git a/data/Debian/kjell-fatal2.png b/data/skins/Debian/kjell-fatal2.png similarity index 100% rename from data/Debian/kjell-fatal2.png rename to data/skins/Debian/kjell-fatal2.png diff --git a/data/Debian/kjell-fatal3.png b/data/skins/Debian/kjell-fatal3.png similarity index 100% rename from data/Debian/kjell-fatal3.png rename to data/skins/Debian/kjell-fatal3.png diff --git a/data/Debian/main.bmp b/data/skins/Debian/main.bmp similarity index 100% rename from data/Debian/main.bmp rename to data/skins/Debian/main.bmp diff --git a/data/Debian/monoster.bmp b/data/skins/Debian/monoster.bmp similarity index 100% rename from data/Debian/monoster.bmp rename to data/skins/Debian/monoster.bmp diff --git a/data/Debian/nums_ex.bmp b/data/skins/Debian/nums_ex.bmp similarity index 100% rename from data/Debian/nums_ex.bmp rename to data/skins/Debian/nums_ex.bmp diff --git a/data/Debian/playpaus.bmp b/data/skins/Debian/playpaus.bmp similarity index 100% rename from data/Debian/playpaus.bmp rename to data/skins/Debian/playpaus.bmp diff --git a/data/Debian/pledit.bmp b/data/skins/Debian/pledit.bmp similarity index 100% rename from data/Debian/pledit.bmp rename to data/skins/Debian/pledit.bmp diff --git a/data/Debian/pledit.txt b/data/skins/Debian/pledit.txt similarity index 100% rename from data/Debian/pledit.txt rename to data/skins/Debian/pledit.txt diff --git a/data/Debian/posbar.bmp b/data/skins/Debian/posbar.bmp similarity index 100% rename from data/Debian/posbar.bmp rename to data/skins/Debian/posbar.bmp diff --git a/data/Debian/shufrep.bmp b/data/skins/Debian/shufrep.bmp similarity index 100% rename from data/Debian/shufrep.bmp rename to data/skins/Debian/shufrep.bmp diff --git a/data/Debian/text.bmp b/data/skins/Debian/text.bmp similarity index 100% rename from data/Debian/text.bmp rename to data/skins/Debian/text.bmp diff --git a/data/Debian/titlebar.bmp b/data/skins/Debian/titlebar.bmp similarity index 100% rename from data/Debian/titlebar.bmp rename to data/skins/Debian/titlebar.bmp diff --git a/data/Debian/viscolor.txt b/data/skins/Debian/viscolor.txt similarity index 100% rename from data/Debian/viscolor.txt rename to data/skins/Debian/viscolor.txt diff --git a/data/Debian/volume.bmp b/data/skins/Debian/volume.bmp similarity index 100% rename from data/Debian/volume.bmp rename to data/skins/Debian/volume.bmp diff --git a/data/wscript b/data/wscript index 8206123..7ea1d8e 100644 --- a/data/wscript +++ b/data/wscript @@ -38,10 +38,10 @@ def set_options(opt): def configure(conf): pass def build(bld): - obj = bld.new_task_gen('qt4', 'staticlib', 'cxx') + obj = bld.new_task_gen('qt4', 'cxx') obj.target = 'promoe_data' obj.install_path = 0 # Don't install - obj.source = 'Almond-blue.qrc' + obj.source = 'skins/Almond-blue.qrc' obj.uselib = 'QTCORE' pass diff --git a/lib/wscript b/lib/wscript index 0de9f9a..0a3ccbe 100644 --- a/lib/wscript +++ b/lib/wscript @@ -49,7 +49,7 @@ def set_options(opt): def configure(conf): pass def build(bld): - obj = bld.new_task_gen('qt4', 'staticlib', 'cxx') + obj = bld.new_task_gen('qt4', 'cstaticlib', 'cxx') obj.target = 'promoe_lib' obj.install_path = 0 # Don't install obj.includes = '.' diff --git a/src/wscript b/src/wscript index f1c0825..8983f8e 100644 --- a/src/wscript +++ b/src/wscript @@ -91,16 +91,15 @@ def build(bld): if bld.env['HAVE_SERVERBROWSER']: sources.append('ServerBrowser.cpp') - sources.append("../data/Almond-blue.qrc") - incdirs = bld_subdirs incdirs.append('.') - obj = bld.new_task_gen('qt4', 'program', 'cxx') + obj = bld.new_task_gen('qt4', 'cprogram', 'cxx') obj.target = 'promoe' obj.includes = incdirs obj.source = sources obj.uselib_local = 'promoe_lib' + obj.add_objects = 'promoe_data' obj.uselib = 'QTCORE QTGUI AVAHI-CLIENT AVAHI-QT4' pass diff --git a/wscript b/wscript index f4808e5..7aec136 100644 --- a/wscript +++ b/wscript @@ -46,6 +46,7 @@ def set_options(opt): opt.tool_options('qt4') opt.sub_options('lib') + opt.sub_options('data') opt.sub_options('src') @@ -65,7 +66,7 @@ def configure(conf): os.path.join(conf.env['PROMOE_DATADIR'], 'Skins')) conf.sub_config('lib') -# conf.sub_config('data') + conf.sub_config('data') conf.sub_config('src') conf.write_config_header('promoe_config.h') @@ -75,9 +76,10 @@ def configure(conf): def build(bld): bld.add_subdirs('lib') -# bld.add_subdirs('data') + bld.add_subdirs('data') bld.add_subdirs('src') - bld.install_files('${MANDIR}/man1', 'promoe.1') - bld.install_files('${DATADIR}/applications', 'promoe.desktop') + bld.install_files('${MANDIR}/man1', 'data/promoe.1') + bld.install_files('${DATADIR}/applications', 'data/promoe.desktop') + bld.install_files('${DATADIR}/icons', 'data/icons/ashton-flame1/promoe.svg')