Actually get an interface

This commit is contained in:
Jaime Thomas 2008-08-05 03:12:24 +00:00
parent cc5eeed0a2
commit 38e7a407d0
7 changed files with 113 additions and 124 deletions

View File

@ -49,9 +49,9 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(themedir)"
themeDATA_INSTALL = $(INSTALL_DATA)
DATA = $(theme_DATA)
am__installdirs = "$(DESTDIR)$(defaultdir)"
defaultDATA_INSTALL = $(INSTALL_DATA)
DATA = $(default_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /home/jaime/ecdb/trunk/missing --run aclocal-1.10
AMTAR = ${SHELL} /home/jaime/ecdb/trunk/missing --run tar
@ -167,24 +167,19 @@ target_alias =
top_build_prefix = ../../../
top_builddir = ../../..
top_srcdir = ../../..
THEME = default
EDC = $(THEME).edc
EET = $(EDC:%.edc=%.edj)
SUFFIXES = .edc .edj
CLEANFILES = $(EET)
themedir = $(pkgdatadir)/themes
theme_DATA = $(EET)
EXTRA_DIST = \
$(EDC) \
Makefile \
img \
macros \
groups
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = default.edc
EDJE_CC = edje_cc
EDJE_FLAGS = \
-v \
-id $(top_srcdir)/data/themes/default/images \
-fd $(top_srcdir)/data/themes/default/fonts
defaultdir = $(pkgdatadir)/themes
default_DATA = default.edj
all: all-am
.SUFFIXES:
.SUFFIXES: .edc .edj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@ -220,22 +215,22 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
install-themeDATA: $(theme_DATA)
install-defaultDATA: $(default_DATA)
@$(NORMAL_INSTALL)
test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)"
@list='$(theme_DATA)'; for p in $$list; do \
test -z "$(defaultdir)" || $(MKDIR_P) "$(DESTDIR)$(defaultdir)"
@list='$(default_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(themeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedir)/$$f'"; \
$(themeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedir)/$$f"; \
echo " $(defaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultdir)/$$f'"; \
$(defaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultdir)/$$f"; \
done
uninstall-themeDATA:
uninstall-defaultDATA:
@$(NORMAL_UNINSTALL)
@list='$(theme_DATA)'; for p in $$list; do \
@list='$(default_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(themedir)/$$f'"; \
rm -f "$(DESTDIR)$(themedir)/$$f"; \
echo " rm -f '$(DESTDIR)$(defaultdir)/$$f'"; \
rm -f "$(DESTDIR)$(defaultdir)/$$f"; \
done
tags: TAGS
TAGS:
@ -274,7 +269,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(themedir)"; do \
for dir in "$(DESTDIR)$(defaultdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@ -294,7 +289,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@ -302,9 +296,10 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-generic clean-libtool mostlyclean-am
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
distclean: distclean-am
-rm -f Makefile
@ -320,7 +315,7 @@ info: info-am
info-am:
install-data-am: install-themeDATA
install-data-am: install-defaultDATA
install-dvi: install-dvi-am
@ -354,30 +349,30 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-themeDATA
uninstall-am: uninstall-defaultDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
install-themeDATA installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-themeDATA
clean-local distclean distclean-generic distclean-libtool \
distdir dvi dvi-am html html-am info info-am install \
install-am install-data install-data-am install-defaultDATA \
install-dvi install-dvi-am install-exec install-exec-am \
install-html install-html-am install-info install-info-am \
install-man install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am uninstall uninstall-am uninstall-defaultDATA
all: $(EDC)
default.edj: Makefile default.edc
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/themes/default/default.edc \
$(top_builddir)/data/themes/default/default.edj
.edc.edj:
edje_cc -v -id $(top_srcdir)/data/themes/$(THEME)/img -fd $(top_srcdir)/data/themes/$(THEME)/fonts $< $@
preview: $(EET)
edje $(EET)
clean-local:
rm -f *.edj
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,25 +1,19 @@
THEME = default
EDC = $(THEME).edc
EET = $(EDC:%.edc=%.edj)
SUFFIXES = .edc .edj
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = default.edc
CLEANFILES = $(EET)
EDJE_CC = edje_cc
EDJE_FLAGS = \
-v \
-id $(top_srcdir)/data/themes/default/images \
-fd $(top_srcdir)/data/themes/default/fonts
themedir = $(pkgdatadir)/themes
theme_DATA = $(EET)
defaultdir = $(pkgdatadir)/themes
default_DATA = default.edj
all: $(EDC)
.edc.edj:
edje_cc -v -id $(top_srcdir)/data/themes/$(THEME)/img -fd $(top_srcdir)/data/themes/$(THEME)/fonts $< $@
preview: $(EET)
edje $(EET)
EXTRA_DIST = \
$(EDC) \
Makefile \
img \
macros \
groups
default.edj: Makefile default.edc
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/themes/default/default.edc \
$(top_builddir)/data/themes/default/default.edj
clean-local:
rm -f *.edj

View File

@ -49,9 +49,9 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(themedir)"
themeDATA_INSTALL = $(INSTALL_DATA)
DATA = $(theme_DATA)
am__installdirs = "$(DESTDIR)$(defaultdir)"
defaultDATA_INSTALL = $(INSTALL_DATA)
DATA = $(default_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@ -167,24 +167,19 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
THEME = default
EDC = $(THEME).edc
EET = $(EDC:%.edc=%.edj)
SUFFIXES = .edc .edj
CLEANFILES = $(EET)
themedir = $(pkgdatadir)/themes
theme_DATA = $(EET)
EXTRA_DIST = \
$(EDC) \
Makefile \
img \
macros \
groups
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = default.edc
EDJE_CC = edje_cc
EDJE_FLAGS = \
-v \
-id $(top_srcdir)/data/themes/default/images \
-fd $(top_srcdir)/data/themes/default/fonts
defaultdir = $(pkgdatadir)/themes
default_DATA = default.edj
all: all-am
.SUFFIXES:
.SUFFIXES: .edc .edj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@ -220,22 +215,22 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
install-themeDATA: $(theme_DATA)
install-defaultDATA: $(default_DATA)
@$(NORMAL_INSTALL)
test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)"
@list='$(theme_DATA)'; for p in $$list; do \
test -z "$(defaultdir)" || $(MKDIR_P) "$(DESTDIR)$(defaultdir)"
@list='$(default_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(themeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedir)/$$f'"; \
$(themeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedir)/$$f"; \
echo " $(defaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(defaultdir)/$$f'"; \
$(defaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(defaultdir)/$$f"; \
done
uninstall-themeDATA:
uninstall-defaultDATA:
@$(NORMAL_UNINSTALL)
@list='$(theme_DATA)'; for p in $$list; do \
@list='$(default_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(themedir)/$$f'"; \
rm -f "$(DESTDIR)$(themedir)/$$f"; \
echo " rm -f '$(DESTDIR)$(defaultdir)/$$f'"; \
rm -f "$(DESTDIR)$(defaultdir)/$$f"; \
done
tags: TAGS
TAGS:
@ -274,7 +269,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(themedir)"; do \
for dir in "$(DESTDIR)$(defaultdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@ -294,7 +289,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@ -302,9 +296,10 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-generic clean-libtool mostlyclean-am
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
distclean: distclean-am
-rm -f Makefile
@ -320,7 +315,7 @@ info: info-am
info-am:
install-data-am: install-themeDATA
install-data-am: install-defaultDATA
install-dvi: install-dvi-am
@ -354,30 +349,30 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-themeDATA
uninstall-am: uninstall-defaultDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
install-themeDATA installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-themeDATA
clean-local distclean distclean-generic distclean-libtool \
distdir dvi dvi-am html html-am info info-am install \
install-am install-data install-data-am install-defaultDATA \
install-dvi install-dvi-am install-exec install-exec-am \
install-html install-html-am install-info install-info-am \
install-man install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am uninstall uninstall-am uninstall-defaultDATA
all: $(EDC)
default.edj: Makefile default.edc
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/themes/default/default.edc \
$(top_builddir)/data/themes/default/default.edj
.edc.edj:
edje_cc -v -id $(top_srcdir)/data/themes/$(THEME)/img -fd $(top_srcdir)/data/themes/$(THEME)/fonts $< $@
preview: $(EET)
edje $(EET)
clean-local:
rm -f *.edj
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,7 +1,4 @@
images
{
image: "background.png" COMP;
}
#include "images/images.edc"
collections {
#include "groups/window.edc"

View File

@ -7,7 +7,7 @@ group {
description {
state: "default" 0.0;
min: 255 255;
max: 999999 999999
max: 999999 999999;
rel1 {
relative: 0.0 0.0;
@ -20,7 +20,7 @@ group {
}
image {
normal: "window.png";
normal: "background.png";
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 199 B

View File

@ -30,6 +30,8 @@ ecdb_cb_resize(Ecore_Evas *ee)
int
ecdb_create_main_gui(void)
{
Evas_Object *gui;
em->main_win_ee = ecore_evas_software_x11_new(0, 0, 0, 0, 255, 255);
if (!em->main_win_ee)
@ -52,6 +54,11 @@ ecdb_create_main_gui(void)
edje_frametime_set(1.0 / 60.0);
ecore_evas_show(em->main_win_ee);
gui = edje_object_add(ecore_evas_get(em->main_win_ee));
evas_object_name_set(gui, "gui");
evas_object_move(gui, 0, 0);
evas_object_show(gui);
ecdb_set_main_theme(NULL, "ecdb/window");
return TRUE;
@ -81,10 +88,11 @@ ecdb_set_main_theme(const char *theme_name, const char *group)
if (!theme_name)
{
if (!edje_object_file_set(gui, PACKAGE_DATA_DIR"/default.edj",
group))
if (!edje_object_file_set(gui, PACKAGE_DATA_DIR
"/themes/default.edj", group))
{
printf("Error setting default theme\n");
printf("Error setting default theme: %s\n",
PACKAGE_DATA_DIR"/themes/default/edj");
return;
}
}