From: vlad Date: Tue, 27 Jul 2010 20:46:17 +0000 (+0300) Subject: rename theme Mplayer to Video X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=d6e0a0f494e88e48b0f1747e96e64479737cf5c5;p=livewp rename theme Mplayer to Video --- diff --git a/applet/data/Makefile.am b/applet/data/Makefile.am index 1f6a3cc..149bf36 100644 --- a/applet/data/Makefile.am +++ b/applet/data/Makefile.am @@ -28,8 +28,8 @@ moderntheme_DATA = theme/Modern/* matrixthemedir = $(datadir)/livewp/theme/Matrix matrixtheme_DATA = theme/Matrix/* -mplayerthemedir = $(datadir)/livewp/theme/Mplayer -mplayertheme_DATA = theme/Mplayer/* +videothemedir = $(datadir)/livewp/theme/Video +videotheme_DATA = theme/Video/* dbus_servicedir = $(datadir)/dbus-1/services dbus_service_DATA = org.maemo.livewp.service @@ -62,7 +62,7 @@ uninstall-local: EXTRA_DIST = $(berlintheme_DATA) \ $(moderntheme_DATA) \ $(matrixtheme_DATA) \ - $(mplayertheme_DATA) \ + $(videotheme_DATA) \ $(dbus_service_DATA) diff --git a/applet/data/Makefile.in b/applet/data/Makefile.in index c9709e6..e9e1774 100644 --- a/applet/data/Makefile.in +++ b/applet/data/Makefile.in @@ -67,15 +67,15 @@ CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__installdirs = "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(mplayerthemedir)" +am__installdirs = "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(videothemedir)" berlinthemeDATA_INSTALL = $(INSTALL_DATA) dbus_serviceDATA_INSTALL = $(INSTALL_DATA) desktoppanelDATA_INSTALL = $(INSTALL_DATA) matrixthemeDATA_INSTALL = $(INSTALL_DATA) modernthemeDATA_INSTALL = $(INSTALL_DATA) -mplayerthemeDATA_INSTALL = $(INSTALL_DATA) +videothemeDATA_INSTALL = $(INSTALL_DATA) DATA = $(berlintheme_DATA) $(dbus_service_DATA) $(desktoppanel_DATA) \ - $(matrixtheme_DATA) $(moderntheme_DATA) $(mplayertheme_DATA) + $(matrixtheme_DATA) $(moderntheme_DATA) $(videotheme_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -239,8 +239,8 @@ modernthemedir = $(datadir)/livewp/theme/Modern moderntheme_DATA = theme/Modern/* matrixthemedir = $(datadir)/livewp/theme/Matrix matrixtheme_DATA = theme/Matrix/* -mplayerthemedir = $(datadir)/livewp/theme/Mplayer -mplayertheme_DATA = theme/Mplayer/* +videothemedir = $(datadir)/livewp/theme/Video +videotheme_DATA = theme/Video/* dbus_servicedir = $(datadir)/dbus-1/services dbus_service_DATA = org.maemo.livewp.service desktoppaneldir = $(datadir)/applications/hildon-control-panel @@ -252,7 +252,7 @@ icondir = $(datadir)/icons/hicolor EXTRA_DIST = $(berlintheme_DATA) \ $(moderntheme_DATA) \ $(matrixtheme_DATA) \ - $(mplayertheme_DATA) \ + $(videotheme_DATA) \ $(dbus_service_DATA) all: all-am @@ -382,22 +382,22 @@ uninstall-modernthemeDATA: echo " rm -f '$(DESTDIR)$(modernthemedir)/$$f'"; \ rm -f "$(DESTDIR)$(modernthemedir)/$$f"; \ done -install-mplayerthemeDATA: $(mplayertheme_DATA) +install-videothemeDATA: $(videotheme_DATA) @$(NORMAL_INSTALL) - test -z "$(mplayerthemedir)" || $(mkdir_p) "$(DESTDIR)$(mplayerthemedir)" - @list='$(mplayertheme_DATA)'; for p in $$list; do \ + test -z "$(videothemedir)" || $(mkdir_p) "$(DESTDIR)$(videothemedir)" + @list='$(videotheme_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(mplayerthemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mplayerthemedir)/$$f'"; \ - $(mplayerthemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mplayerthemedir)/$$f"; \ + echo " $(videothemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(videothemedir)/$$f'"; \ + $(videothemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(videothemedir)/$$f"; \ done -uninstall-mplayerthemeDATA: +uninstall-videothemeDATA: @$(NORMAL_UNINSTALL) - @list='$(mplayertheme_DATA)'; for p in $$list; do \ + @list='$(videotheme_DATA)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f '$(DESTDIR)$(mplayerthemedir)/$$f'"; \ - rm -f "$(DESTDIR)$(mplayerthemedir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(videothemedir)/$$f'"; \ + rm -f "$(DESTDIR)$(videothemedir)/$$f"; \ done tags: TAGS TAGS: @@ -407,7 +407,7 @@ CTAGS: distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/theme/Berlin $(distdir)/theme/Matrix $(distdir)/theme/Modern $(distdir)/theme/Mplayer + $(mkdir_p) $(distdir)/theme/Berlin $(distdir)/theme/Matrix $(distdir)/theme/Modern $(distdir)/theme/Video @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -438,7 +438,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(mplayerthemedir)"; do \ + for dir in "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(videothemedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -486,7 +486,7 @@ info-am: install-data-am: install-berlinthemeDATA install-data-local \ install-dbus_serviceDATA install-desktoppanelDATA \ install-matrixthemeDATA install-modernthemeDATA \ - install-mplayerthemeDATA + install-videothemeDATA install-exec-am: @@ -515,7 +515,7 @@ ps-am: uninstall-am: uninstall-berlinthemeDATA uninstall-dbus_serviceDATA \ uninstall-desktoppanelDATA uninstall-info-am uninstall-local \ uninstall-matrixthemeDATA uninstall-modernthemeDATA \ - uninstall-mplayerthemeDATA + uninstall-videothemeDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ @@ -524,15 +524,14 @@ uninstall-am: uninstall-berlinthemeDATA uninstall-dbus_serviceDATA \ install-data-local install-dbus_serviceDATA \ install-desktoppanelDATA install-exec install-exec-am \ install-info install-info-am install-man \ - install-matrixthemeDATA install-modernthemeDATA \ - install-mplayerthemeDATA 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-berlinthemeDATA uninstall-dbus_serviceDATA \ - uninstall-desktoppanelDATA uninstall-info-am uninstall-local \ - uninstall-matrixthemeDATA uninstall-modernthemeDATA \ - uninstall-mplayerthemeDATA + install-matrixthemeDATA install-modernthemeDATA install-strip \ + install-videothemeDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-berlinthemeDATA \ + uninstall-dbus_serviceDATA uninstall-desktoppanelDATA \ + uninstall-info-am uninstall-local uninstall-matrixthemeDATA \ + uninstall-modernthemeDATA uninstall-videothemeDATA install-data-local: diff --git a/applet/data/theme/Mplayer/icon.png b/applet/data/theme/Mplayer/icon.png deleted file mode 100644 index 2f1f063..0000000 Binary files a/applet/data/theme/Mplayer/icon.png and /dev/null differ diff --git a/applet/data/theme/Mplayer/icond.png b/applet/data/theme/Mplayer/icond.png deleted file mode 100644 index 9eb00b3..0000000 Binary files a/applet/data/theme/Mplayer/icond.png and /dev/null differ diff --git a/applet/data/theme/Video/icon.png b/applet/data/theme/Video/icon.png new file mode 100644 index 0000000..2f1f063 Binary files /dev/null and b/applet/data/theme/Video/icon.png differ diff --git a/applet/data/theme/Video/icond.png b/applet/data/theme/Video/icond.png new file mode 100644 index 0000000..9eb00b3 Binary files /dev/null and b/applet/data/theme/Video/icond.png differ diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c index 8080134..70da63e 100644 --- a/applet/src/livewp-home-widget.c +++ b/applet/src/livewp-home-widget.c @@ -531,7 +531,7 @@ animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin) g_hash_table_insert(priv->hash_scene_func, g_strdup("Berlin"), (gpointer)&init_scene_Berlin); g_hash_table_insert(priv->hash_scene_func, g_strdup("Modern"), (gpointer)&init_scene_Modern); g_hash_table_insert(priv->hash_scene_func, g_strdup("Matrix"), (gpointer)&init_scene_Matrix); - g_hash_table_insert(priv->hash_scene_func, g_strdup("Mplayer"), (gpointer)&init_scene_Mplayer); + g_hash_table_insert(priv->hash_scene_func, g_strdup("Video"), (gpointer)&init_scene_Video); //#endif //priv->theme = g_strdup("Modern"); desktop_plugin->priv->main_widget = gtk_fixed_new(); diff --git a/applet/src/livewp-main.c b/applet/src/livewp-main.c index 7b8e216..15eb491 100644 --- a/applet/src/livewp-main.c +++ b/applet/src/livewp-main.c @@ -186,7 +186,7 @@ main(int argc, char *argv[]) g_hash_table_insert(priv->hash_scene_func, g_strdup("Berlin"), (gpointer)&init_scene_Berlin); g_hash_table_insert(priv->hash_scene_func, g_strdup("Modern"), (gpointer)&init_scene_Modern); g_hash_table_insert(priv->hash_scene_func, g_strdup("Matrix"), (gpointer)&init_scene_Matrix); - g_hash_table_insert(priv->hash_scene_func, g_strdup("Mplayer"), (gpointer)&init_scene_Mplayer); + g_hash_table_insert(priv->hash_scene_func, g_strdup("Video"), (gpointer)&init_scene_Video); priv->scene = NULL; priv->window = main_widget; diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c index 35bf499..d88128e 100644 --- a/applet/src/livewp-scene.c +++ b/applet/src/livewp-scene.c @@ -67,7 +67,7 @@ parsestring(char *line, char **argv) void -init_scene_Mplayer(AWallpaperPlugin *desktop_plugin) +init_scene_Video(AWallpaperPlugin *desktop_plugin) { GstElement *pipeline; GstElement *bin; diff --git a/applet/src/livewp-scene.h b/applet/src/livewp-scene.h index 7a0e58d..c1c9034 100644 --- a/applet/src/livewp-scene.h +++ b/applet/src/livewp-scene.h @@ -43,7 +43,7 @@ void reload_scene(AWallpaperPlugin *desktop_plugin); void init_scene_Modern(AWallpaperPlugin *desktop_plugin); void init_scene_Berlin(AWallpaperPlugin *desktop_plugin); void init_scene_Matrix(AWallpaperPlugin *desktop_plugin); -void init_scene_Mplayer(AWallpaperPlugin *desktop_plugin); +void init_scene_Video(AWallpaperPlugin *desktop_plugin); void init_scene_theme(AWallpaperPlugin *desktop_plugin); #endif diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c index 3fca25f..4dd85e9 100644 --- a/applet/src/livewp-settings.c +++ b/applet/src/livewp-settings.c @@ -62,7 +62,7 @@ create_theme_selector (void){ hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Berlin")); hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Modern")); hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Matrix")); - hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Mplayer")); + hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector), _("Video")); return selector; } /*******************************************************************************/ @@ -142,9 +142,9 @@ create_themes_button (gchar *theme){ hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 2); hildon_button_set_value(HILDON_BUTTON(button), _("Matrix")); } - if (!strcmp(theme, "Mplayer")){ + if (!strcmp(theme, "Video")){ hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 3); - hildon_button_set_value(HILDON_BUTTON(button), _("Mplayer")); + hildon_button_set_value(HILDON_BUTTON(button), _("Video")); } } @@ -284,8 +284,8 @@ lw_theme_settings(Animation_WallpaperPrivate *priv, GtkWidget *button){ priv->theme = g_strdup("Modern"); if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Matrix"))) priv->theme = g_strdup("Matrix"); - if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Mplayer"))){ - priv->theme = g_strdup("Mplayer"); + if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Video"))){ + priv->theme = g_strdup("Video"); priv->theme_string_parametr1 = g_strdup("/home/user/MyDocs/.videos/9.mp4"); }