diff options
| author | Stefan Knorr (astron) <heinzlesspam@gmail.com> | 2012-01-15 12:56:17 +0100 |
|---|---|---|
| committer | Stefan Knorr (astron) <heinzlesspam@gmail.com> | 2012-01-15 12:57:51 +0100 |
| commit | 1c7c480e7465a077b1ede8be39329b14d31ba847 (patch) | |
| tree | 8a49b7a5fd22b27f07ffc1dea6868a9236e2b338 /solenv | |
| parent | b327c8355cd6e4e6d0a4b1bda0591c4d3964bff8 (diff) | |
Galaxy (default) icon theme is now in icon-themes/galaxy
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/doc/gbuild/solenv/gbuild/alllangres.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/templates/AllLangResTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/solenv/doc/gbuild/solenv/gbuild/alllangres.mk b/solenv/doc/gbuild/solenv/gbuild/alllangres.mk index 8d5034e881dd..ae9d5130c2da 100644 --- a/solenv/doc/gbuild/solenv/gbuild/alllangres.mk +++ b/solenv/doc/gbuild/solenv/gbuild/alllangres.mk @@ -74,10 +74,10 @@ namespace gb { public: AllLangResTarget(String name); - /// Sets the location where resources are to be found. reslocation is a path relative to the default_images directory. + /// Sets the location where resources are to be found. reslocation is a path relative to the icon-themes/galaxy directory. /// Resources will be found in reslocation itself and in the subdirectories res/ and imglst/ of it and again in subdirectories /// of those named as the language of the processed resource. In addition, resources are found in the res/ directory directly - /// below default_images and the subdirectory of it named as the language of the processed resource. + /// below icon-themes/galaxy and the subdirectory of it named as the language of the processed resource. void set_reslocation(Path reslocation); private: /// Sets the languages for which to create resources. diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 1329f2aa5f25..21570c7bc305 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -311,7 +311,7 @@ endef gb_ResTarget_RSCTARGET := $(gb_SrsPartTarget_RSCTARGET) gb_ResTarget_RSCCOMMAND := $(gb_SrsPartTarget_RSCCOMMAND) -gb_ResTarget_DEFIMAGESLOCATION := $(realpath $(SRCDIR)/default_images)/ +gb_ResTarget_DEFIMAGESLOCATION := $(realpath $(SRCDIR)/icon-themes/galaxy)/ $(call gb_ResTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),RES,2) diff --git a/solenv/gbuild/templates/AllLangResTarget.mk b/solenv/gbuild/templates/AllLangResTarget.mk index 3f8d1237938d..4c04f00e1df6 100644 --- a/solenv/gbuild/templates/AllLangResTarget.mk +++ b/solenv/gbuild/templates/AllLangResTarget.mk @@ -30,7 +30,7 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,RES)) -# declaration of images folder (e.g. default_images/MODULE/res) +# declaration of images folder (e.g. icon-themes/(name of theme)/MODULE/res) $(eval $(call gb_AllLangResTarget_set_reslocation,RES,MODULE)) # declaration of a resource intermediate file (srs) diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 6dddac6799b8..a8bd275ebbd7 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -898,7 +898,7 @@ RSCUPDVERDEF=-DUPDVER="$(RSCUPDVER)" RSCFLAGS=-s RSCDEFS=-D$(GUI) -D$(COM) $(JAVADEF) -RSCDEFIMG*=default_images +RSCDEFIMG*=icon-themes/galaxy RSCEXTINC=. |