From: Vlad Date: Thu, 12 Aug 2010 12:53:59 +0000 (+0300) Subject: began for category X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=d59595014d241454327b8b4743c0bc9a7db8bcca;p=livewp began for category --- diff --git a/applet/data/external_themes/xsnow2.xml b/applet/data/external_themes/xsnow2.xml index 12b5d9e..6b18d48 100644 --- a/applet/data/external_themes/xsnow2.xml +++ b/applet/data/external_themes/xsnow2.xml @@ -1,4 +1,5 @@ XsnowMaemo /usr/bin/xsnow + Unknown diff --git a/applet/po/es_ES.po b/applet/po/es_ES.po index d8f046e..177cf1a 100644 --- a/applet/po/es_ES.po +++ b/applet/po/es_ES.po @@ -2,14 +2,14 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-05 14:23+0300\n" +"POT-Creation-Date: 2010-08-06 13:51+0300\n" "PO-Revision-Date: \n" "Last-Translator: Alejandro López \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" #: src/livewp-settings.c:33 src/livewp-settings.c:267 msgid "About" diff --git a/applet/po/es_MX.po b/applet/po/es_MX.po index d8f046e..177cf1a 100644 --- a/applet/po/es_MX.po +++ b/applet/po/es_MX.po @@ -2,14 +2,14 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-05 14:23+0300\n" +"POT-Creation-Date: 2010-08-06 13:51+0300\n" "PO-Revision-Date: \n" "Last-Translator: Alejandro López \n" "Language-Team: \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" #: src/livewp-settings.c:33 src/livewp-settings.c:267 msgid "About" diff --git a/applet/po/fi_FI.po b/applet/po/fi_FI.po index 6400d63..c336a2e 100644 --- a/applet/po/fi_FI.po +++ b/applet/po/fi_FI.po @@ -7,32 +7,27 @@ msgid "" msgstr "" "Project-Id-Version: 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-05 14:23+0300\n" +"POT-Creation-Date: 2010-08-06 13:51+0300\n" "PO-Revision-Date: 2010-08-06 11:08+0200\n" "Last-Translator: Marko Vertainen \n" "Language-Team: fi_FI \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" -#: src/livewp-settings.c:33 -#: src/livewp-settings.c:267 +#: src/livewp-settings.c:33 src/livewp-settings.c:267 msgid "About" msgstr "Tietoja" -#: src/livewp-settings.c:65 -#: src/livewp-settings.c:149 -#: src/livewp-settings.c:186 -#: src/livewp-settings.c:398 +#: src/livewp-settings.c:65 src/livewp-settings.c:149 +#: src/livewp-settings.c:186 src/livewp-settings.c:398 #: src/livewp-settings.c:439 msgid "Accel" msgstr "Kiihtyvyys" -#: src/livewp-settings.c:62 -#: src/livewp-settings.c:136 -#: src/livewp-settings.c:174 -#: src/livewp-settings.c:396 +#: src/livewp-settings.c:62 src/livewp-settings.c:136 +#: src/livewp-settings.c:174 src/livewp-settings.c:396 #: src/livewp-settings.c:433 msgid "Berlin" msgstr "Berliini" @@ -41,9 +36,7 @@ msgstr "Berliini" msgid "Enable" msgstr "Ota käyttöön" -#: src/livewp-config.c:34 -#: src/livewp-config.c:53 -#: src/livewp-config.c:105 +#: src/livewp-config.c:34 src/livewp-config.c:53 src/livewp-config.c:105 #, c-format msgid "Failed to initialize GConf. Quitting.\n" msgstr "GConf asetus epäonnistui. Lopetetaan.\n" @@ -58,7 +51,8 @@ msgid "" " Copyright(c) 2010\n" " Tanya Makova\n" " Vlad Vasiliev\n" -" Copyright(c) 2010 for design themes Berlin, Modern and Accel Vasya Bobrikov\n" +" Copyright(c) 2010 for design themes Berlin, Modern and Accel Vasya " +"Bobrikov\n" " Copyright(c) 2010 for design theme Matrix Andrew Zhilin\n" " Translators:\n" " Finnish - Marko Vertainen\n" @@ -82,24 +76,19 @@ msgstr "" msgid "Loop" msgstr "Uudelleen toisto" -#: src/livewp-settings.c:64 -#: src/livewp-settings.c:142 -#: src/livewp-settings.c:182 -#: src/livewp-settings.c:397 +#: src/livewp-settings.c:64 src/livewp-settings.c:142 +#: src/livewp-settings.c:182 src/livewp-settings.c:397 #: src/livewp-settings.c:437 msgid "Matrix" msgstr "Matrix" -#: src/livewp-settings.c:63 -#: src/livewp-settings.c:139 -#: src/livewp-settings.c:178 -#: src/livewp-settings.c:400 +#: src/livewp-settings.c:63 src/livewp-settings.c:139 +#: src/livewp-settings.c:178 src/livewp-settings.c:400 #: src/livewp-settings.c:435 msgid "Modern" msgstr "Moderni" -#: src/livewp-settings.c:343 -#: src/livewp-settings.c:346 +#: src/livewp-settings.c:343 src/livewp-settings.c:346 msgid "Play file" msgstr "Valitse videoleike" @@ -115,10 +104,8 @@ msgstr "Tallenna" msgid "Theme" msgstr "Teema" -#: src/livewp-settings.c:66 -#: src/livewp-settings.c:152 -#: src/livewp-settings.c:190 -#: src/livewp-settings.c:404 +#: src/livewp-settings.c:66 src/livewp-settings.c:152 +#: src/livewp-settings.c:190 src/livewp-settings.c:404 #: src/livewp-settings.c:443 msgid "Video" msgstr "Video" @@ -127,16 +114,15 @@ msgstr "Video" msgid "View Settings" msgstr "Näkymän asetukset" -#: src/livewp-settings.c:67 -#: src/livewp-settings.c:145 -#: src/livewp-settings.c:194 -#: src/livewp-settings.c:399 -#: src/livewp-settings.c:421 -#: src/livewp-settings.c:441 +#: src/livewp-settings.c:67 src/livewp-settings.c:145 +#: src/livewp-settings.c:194 src/livewp-settings.c:399 +#: src/livewp-settings.c:421 src/livewp-settings.c:441 msgid "Xsnow" msgstr "Xsnow" #: src/livewp-settings.c:424 -msgid "You haven't got the installed package Xsnow. Please install it via using Application Manager" -msgstr "Et ole asentanut Xsnow pakettia. Voit asentaa sen Sovellusten hallinnalla." - +msgid "" +"You haven't got the installed package Xsnow. Please install it via using " +"Application Manager" +msgstr "" +"Et ole asentanut Xsnow pakettia. Voit asentaa sen Sovellusten hallinnalla." diff --git a/applet/po/pl_PL.po b/applet/po/pl_PL.po index a26f7c2..1990807 100644 --- a/applet/po/pl_PL.po +++ b/applet/po/pl_PL.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-05 14:23+0300\n" +"POT-Creation-Date: 2010-08-06 13:51+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" #: src/livewp-settings.c:33 src/livewp-settings.c:267 msgid "About" diff --git a/applet/po/ru_RU.po b/applet/po/ru_RU.po index 3141453..57abb4b 100644 --- a/applet/po/ru_RU.po +++ b/applet/po/ru_RU.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-05 14:23+0300\n" +"POT-Creation-Date: 2010-08-06 13:51+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Vlad Vasiliev \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" #: src/livewp-settings.c:33 src/livewp-settings.c:267 msgid "About" diff --git a/applet/src/livewp-exthemes.c b/applet/src/livewp-exthemes.c index 7be9cee..f80c148 100644 --- a/applet/src/livewp-exthemes.c +++ b/applet/src/livewp-exthemes.c @@ -43,6 +43,8 @@ parse_theme(gchar *file){ g_hash_table_insert(hash, g_strdup(node->name), g_strdup(xmlNodeGetContent(node))); } } + if (!(g_hash_table_lookup(hash, "category"))) + g_hash_table_insert(hash, g_strdup("category"), g_strdup("Unknown")); xmlFreeDoc(doc); xmlCleanupParser(); return hash; diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c index 1f9dc5a..49b00e9 100644 --- a/applet/src/livewp-settings.c +++ b/applet/src/livewp-settings.c @@ -54,6 +54,34 @@ Russian - Tanya Makova \n \ } /*******************************************************************************/ GtkWidget * +create_category_selector (Animation_WallpaperPrivate *priv){ + GtkWidget *selector; + GSList *store = priv->extheme_list; + GList *category_list; + GHashTable *result_table = NULL; + GtkListStore *list = NULL; + HildonTouchSelectorColumn *column = NULL; + + result_table = g_hash_table_new(g_str_hash, g_str_equal); + while (store){ + if (!g_hash_table_lookup(result_table, g_hash_table_lookup(store->data, "category"))) + g_hash_table_insert(result_table, g_hash_table_lookup(store->data, "category"), 1); + store = g_slist_next(store); + } + + category_list = g_hash_table_get_keys (result_table); + selector = hildon_touch_selector_new_text(); + + while (category_list){ + hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector),category_list->data ); + category_list = g_list_next(category_list); + } + + return selector; +} + +/*******************************************************************************/ +GtkWidget * create_theme_selector (Animation_WallpaperPrivate *priv){ GtkWidget *selector; GSList *store = priv->extheme_list; @@ -158,7 +186,18 @@ changed_value_theme_cb (HildonPickerButton *picker, Animation_WallpaperPrivate * } gtk_widget_show(vbox); } - +/********************************************************************************/ +void +changed_value_category_cb (HildonPickerButton *picker, Animation_WallpaperPrivate *priv) +{ + const gchar *choice = hildon_button_get_value(HILDON_BUTTON (picker)); + GtkWidget *vbox = NULL; + + vbox = g_object_get_data(G_OBJECT(priv->window), "custom_vbox"); + if (vbox) + gtk_widget_destroy(vbox); + vbox = gtk_vbox_new (FALSE, 5); +} /********************************************************************************/ GtkWidget * create_themes_button (Animation_WallpaperPrivate *priv){ @@ -209,6 +248,57 @@ create_themes_button (Animation_WallpaperPrivate *priv){ return button; } +/********************************************************************************/ +GtkWidget * +create_categories_button (Animation_WallpaperPrivate *priv){ + + GtkWidget *button; + GtkWidget *selector; + gchar *theme = priv->theme; + gint num=0; + + selector = create_category_selector(priv); + button = hildon_picker_button_new (HILDON_SIZE_AUTO, HILDON_BUTTON_ARRANGEMENT_VERTICAL); + hildon_button_set_title (HILDON_BUTTON (button), _("Category")); + hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (button), + HILDON_TOUCH_SELECTOR (selector)); +/* + if (theme) { + if (!strcmp(theme, "Berlin")){ + hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 0); + hildon_button_set_value(HILDON_BUTTON(button), _("Berlin")); + } + if (!strcmp(theme, "Modern")){ + hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 1); + hildon_button_set_value(HILDON_BUTTON(button), _("Modern")); + } + if (!strcmp(theme, "Matrix")){ + hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 2); + hildon_button_set_value(HILDON_BUTTON(button), _("Matrix")); + } + if (!strcmp(theme, "Accel")){ + hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 3); + hildon_button_set_value(HILDON_BUTTON(button), _("Accel")); + } + if (!strcmp(theme, "Video")){ + hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, 4); + hildon_button_set_value(HILDON_BUTTON(button), _("Video")); + } + num = 5; + GSList *store = priv->extheme_list; + while (store){ + if (!strcmp(theme, g_hash_table_lookup(store->data, "name"))){ + hildon_touch_selector_set_active (HILDON_TOUCH_SELECTOR (selector), 0, num); + hildon_button_set_value(HILDON_BUTTON(button), _(g_hash_table_lookup(store->data, "name"))); + break; + } + num++; + store = g_slist_next(store); + } + } +*/ + return button; +} /*******************************************************************************/ GtkWidget * @@ -378,6 +468,7 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) { GtkWidget *window = NULL; GtkWidget *save_button; GtkWidget *theme_button; + GtkWidget *category_button; GtkWidget *enable_button; GtkWidget *vbox; GtkWidget *button1 = NULL; @@ -394,6 +485,12 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) { enable_button = create_enable_button(check_applet_state(view)); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox), enable_button, TRUE, TRUE, 5); + /* Create Category button */ + category_button = create_categories_button(priv); + g_signal_connect (G_OBJECT (category_button), "value-changed", G_CALLBACK (changed_value_category_cb), priv); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox), + category_button, TRUE, TRUE, 5); + /* Create Theme button */ theme_button = create_themes_button(priv); g_signal_connect (G_OBJECT (theme_button), "value-changed", G_CALLBACK (changed_value_theme_cb), priv); @@ -417,6 +514,7 @@ lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv) { } gtk_widget_show (enable_button); + gtk_widget_show (category_button); gtk_widget_show (theme_button); gtk_widget_show (vbox); gtk_widget_show (window);