Merged queue view fix from 5th; merged Spanish language support; Updated SIS 0.90(4).
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/PodcastClient_spanish.rls Thu Jul 15 22:43:10 2010 +0100
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2007-2010 Sebastian Brannstrom, Lars Persson, EmbedDev AB
+ *
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * EmbedDev AB - initial contribution.
+ *
+ * Contributors:
+ * Victor Tuson Palau
+ *
+ * Description:
+ *
+ */
+
+// Menu items
+
+rls_string STRING_r_settings_cmd "Config"
+rls_string STRING_r_view_mark_all_played_cmd "Marcar leido"
+rls_string STRING_r_exit_cmd "Salir"
+rls_string STRING_r_view_help "Ayuda"
+rls_string STRING_r_view_about_cmd "A cerca"
+rls_string STRING_r_view_import_export_feeds_cmd "Importa/exporta fuentes"
+rls_string STRING_r_view_import_feeds_cmd "Importa fuentes"
+rls_string STRING_r_view_export_feeds_cmd "Exporta fuentes"
+
+// CBA buttons
+rls_string STRING_r_cba_options "Opciones"
+rls_string STRING_r_cba_hide "Occultar"
+rls_string STRING_r_cba_cancel "Cancelar"
+
+// Tab titles
+rls_string STRING_r_tabgroup_feeds "Fuentes"
+rls_string STRING_r_tabgroup_queue "Cola"
+rls_string STRING_r_tabgroup_queue_counter "Cola (%d)"
+
+// Question dialogs
+rls_string STRING_r_add_feed_prompt "Introduzca términos de búsqueda o dirección de la fuente"
+rls_string STRING_r_edit_feed_prompt "Dirección de la fuente"
+rls_string STRING_r_add_feed_title_prompt "Título de la fuente"
+rls_string STRING_r_remove_feed_prompt "¿Borrar fuente '%S'?"
+rls_string STRING_r_enable_downloads_prompt "Hay capítulos en la cola de descarga. ¿Quieres descargarlos ahora?"
+rls_string STRING_r_update_new_feed_prompt "¿Quieres actualizar la fuente ahora?"
+rls_string STRING_r_delete_show_prompt "¿Borrar el capítulo '%S'?"
+rls_string STRING_r_podcast_connection_error "Fallo de conexión. Compruebe que la configuración de red es correcta."
+rls_string STRING_r_exit_shows_downloading "Hay capítulos descargando. ¿Quiere salir?"
+
+// Settings view
+rls_string STRING_r_podcast_settings_title "Configuración"
+rls_string STRING_r_podcast_setting_showdir "Carpeta de Podcast"
+rls_string STRING_r_podcast_setting_autoupdate "Actualización automática"
+rls_string STRING_r_podcast_setting_autodownload "Descarga automática"
+rls_string STRING_r_podcast_setting_connection "Conexión"
+rls_string STRING_r_podcast_setting_default "Usar predeterminada"
+rls_string STRING_r_podcast_setting_alwaysask "Preguntar siempre"
+rls_string STRING_r_podcast_setting_useiap "Seleccion el punto de acceso"
+rls_string STRING_r_podcast_setting_iaplist "Puntos de acceso"
+rls_string STRING_r_podcast_select_folder "Selecciona carpeta"
+//enable and disable automatic connections
+rls_string STRING_r_on "Activar"
+rls_string STRING_r_off "Desactivar"
+rls_string STRING_r_podcast_setting_reset_db "Reiniciar libreria"
+rls_string STRING_r_podcast_setting_reset_db_query "¿Reiniciar Libreria? Toda la información será borrada!"
+
+
+
+// Choicelist for autodownload
+rls_string STRING_podcast_autoupdate_option1 "Desactivado"
+rls_string STRING_podcast_autoupdate_option2 "Cada hora"
+rls_string STRING_podcast_autoupdate_option3 "Cuatro veces al día"
+rls_string STRING_podcast_autoupdate_option4 "Dos veces al día"
+rls_string STRING_podcast_autoupdate_option5 "Cada día"
+
+// Feed import/export
+rls_string STRING_r_view_import_feeds_title "Seleccione el fichero OPML"
+rls_string STRING_r_enter_filename "Nombre de Fichero"
+rls_string STRING_r_view_export_feeds_title "Seleccione carpeta"
+rls_string STRING_r_view_export_feeds_softkey "Seleccionar"
+rls_string STRING_import_feed_success "%d fuentes importadas. ¿Quiere actualizar todas las fuentes ahora?"
+rls_string STRING_import_feed_failure "Improtación de fuente fallida"
+rls_string STRING_export_feed_success "%d fuentes exportadas"
+rls_string STRING_export_feed_failure "Exportación de fuente fallida"
+rls_string STRING_r_importing "Importando..."
+rls_string STRING_r_exporting "Exportando..."
+
+// Listbox empty strings
+rls_string STRING_r_podcast_empty_queue "(cola vacia)"
+rls_string STRING_r_podcast_empty_list "(no hay capítulos)"
+rls_string STRING_r_podcast_no_feeds "(no hay fuentes)"
+rls_string STRING_r_podcast_empty_search "(no hay resultados)"
+rls_string STRING_r_podcast_empty_list_updating "(actualizando...)"
+
+// Feed view
+
+rls_string STRING_r_add_feed_title "Añadir fuente"
+rls_string STRING_r_edit_feed_title "Editar fuente"
+rls_string STRING_r_cancel_update_all_feeds_cmd "Cancelar actualización"
+rls_string STRING_r_cancel_update_all_feeds_short_cmd "Cancelar"
+rls_string STRING_r_podcast_feeds_status_format "%d nuevo(s)"
+rls_string STRING_r_podcast_shows_never_updated "Nunca fue actualizado"
+rls_string STRING_r_view_add_feed_cmd "Añadir fuente"
+rls_string STRING_r_view_add_feed_cmd_short "Añadir"
+rls_string STRING_r_view_edit_feed_cmd "Editar fuente"
+rls_string STRING_r_view_edit_feed_cmd_short "Editar"
+rls_string STRING_r_view_delete_feed_cmd "Borrar fuente"
+rls_string STRING_r_view_delete_feed_cmd_short "Borrar"
+rls_string STRING_r_update_feed_cmd "Borrar fuente"
+rls_string STRING_r_update_feed_short_cmd "Actualizar"
+rls_string STRING_r_update_all_feeds_cmd "Actualizar todos"
+rls_string STRING_r_update_all_feeds_short_cmd "Actualizar"
+rls_string STRING_r_podcast_feeds_is_updating "Actualizando..."
+
+// Add/edit feed
+rls_string STRING_add_feed_query "¿Añadir fuente '%S'?"
+rls_string STRING_add_feed_success "Fuente añadida. Actualizar ahora?"
+rls_string STRING_add_feed_error "No pude añadir fuente"
+rls_string STRING_r_add_feed_replace "Todos los capítulos disponibles seran borrados! ¿Desea continuar?" // shown when changing an existing feed URL
+rls_string STRING_r_add_feed_exists "La dirección propuesta esta usada por otra fuente" // shown when adding or changing a feed to a URL that already exists
+
+// Feed searching
+
+rls_string STRING_r_search_noresults "No hay resultados"
+rls_string STRING_r_searching "Buscando..."
+rls_string STRING_r_search_results "Resulstados de la búsqueda"
+
+// Show view
+
+rls_string STRING_r_view_mark_as_played_cmd_short "Marcar leido"
+rls_string STRING_r_view_mark_as_unplayed_cmd_short "Marcar nuevo"
+rls_string STRING_r_view_download_show_cmd "Descargar"
+rls_string STRING_r_view_delete_show_cmd "Borrar"
+rls_string STRING_r_view_show_info_cmd "Información"
+rls_string STRING_r_error_playback_failed "No se pudo reproducir el capítulo"
+
+// Download queue operations
+rls_string STRING_r_suspend_download_cmd "Suspender"
+rls_string STRING_r_view_resume_short_dls_cmd "Continuar"
+rls_string STRING_r_view_stop_downloads_cmd "Suspender la descarga"
+rls_string STRING_r_view_resume_downloads_cmd "Continuar la descarga"
+rls_string STRING_r_view_remove_all_downloads_cmd_short "Borrar"
+rls_string STRING_r_view_remove_all_downloads_cmd "Borrar la cola de descarga"
+rls_string STRING_r_clear_query "¿Quiere borrar la cola?"
+rls_string STRING_r_view_remove_download_short_cmd "Borrar"
+rls_string STRING_r_view_remove_download_cmd "Borrar descarga"
+
+rls_string STRING_r_error_notfound "Error: Servidor no fue hallado"
+rls_string STRING_r_error_invalid_address "Error: La conexión fallo"
+rls_string STRING_r_error_general "Error: Error general %d"
+rls_string STRING_r_error_http "Error: error HTTP %d"
+rls_string STRING_r_error_disk_full "Error: No espacio en el disco"
+
+
--- a/application/data/languages.rss Wed Jul 14 14:53:21 2010 +0100
+++ b/application/data/languages.rss Thu Jul 15 22:43:10 2010 +0100
@@ -18,6 +18,8 @@
#include "PodcastClient_common.rls" // strings common between languages
-//#ifdef LANGUAGE_01
+#ifdef LANGUAGE_01
#include "PodcastClient_english.rls"
-//#endif
+#elif defined LANGUAGE_04
+ #include "PodcastClient_spanish.rls"
+#endif
--- a/application/group/Podcast.mmp Wed Jul 14 14:53:21 2010 +0100
+++ b/application/group/Podcast.mmp Thu Jul 15 22:43:10 2010 +0100
@@ -52,7 +52,7 @@
START RESOURCE Podcast.rss
HEADER
TARGETPATH resource\apps
- LANG SC
+ LANG 01 04
END
START RESOURCE Podcast_reg.rss
--- a/application/inc/PodcastQueueView.h Wed Jul 14 14:53:21 2010 +0100
+++ b/application/inc/PodcastQueueView.h Thu Jul 15 22:43:10 2010 +0100
@@ -75,6 +75,10 @@
void HandleCommandL(TInt aCommand);
TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent,TEventCode aType);
void DynInitMenuPaneL(TInt aResourceId,CEikMenuPane* aMenuPane);
+
+private:
+ TBool iDontUpdateList;
+
};
#endif
--- a/application/inc/buildno.h Wed Jul 14 14:53:21 2010 +0100
+++ b/application/inc/buildno.h Thu Jul 15 22:43:10 2010 +0100
@@ -1,2 +1,2 @@
// Build number generated by increment_buildno.py, do not edit manually
-#define BUILD_NO 3
\ No newline at end of file
+#define BUILD_NO 4
\ No newline at end of file
--- a/application/sis/buildno.txt Wed Jul 14 14:53:21 2010 +0100
+++ b/application/sis/buildno.txt Thu Jul 15 22:43:10 2010 +0100
@@ -1,1 +1,1 @@
-3
\ No newline at end of file
+4
\ No newline at end of file
--- a/application/sis/podcatcher_udeb.pkg Wed Jul 14 14:53:21 2010 +0100
+++ b/application/sis/podcatcher_udeb.pkg Thu Jul 15 22:43:10 2010 +0100
@@ -1,16 +1,18 @@
-&EN
+&EN,SP
:"Symbian Foundation"
-%{"Podcatcher"}
-#{"Podcatcher"},(0xA0009D00), 0, 90, 3, TYPE=SA
+%{"Podcatcher","Podcatcher"}
+#{"Podcatcher","Podcatcher"},(0xA0009D00), 0, 90, 4, TYPE=SA
;Supports S60 3rd edition
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;Supports Symbian^1
-[0x1028315F], 0, 0, 0, {"Series60ProductID"}
+[0x101F7961], 0, 0, 0, {"Series60ProductID","Series60ProductID"}
; resources
-"\epoc32\data\z\resource\apps\Podcast.RSC"-"!:\resource\apps\Podcast.rsc"
+{
+"\epoc32\data\z\resource\apps\Podcast.r01"
+"\epoc32\data\z\resource\apps\Podcast.r04"
+}
+-"!:\resource\apps\Podcast.rsc"
+
"\epoc32\data\z\resource\apps\Podcast.mif"-"!:\resource\apps\Podcast.mif"
"\epoc32\data\z\private\10003a3f\import\apps\Podcast_reg.rsc"-"!:\private\10003a3f\import\apps\Podcast_reg.rsc"
"..\help\podcatcher.hlp"-"!:\resource\help\podcatcher.hlp"
@@ -22,8 +24,5 @@
; backup
"./backup_registration.xml" - "c:\private\A0009D00\backup_registration.xml"
-; app DLL
-;"\epoc32\release\gcce\udeb\podcastengine.dll"-"!:\sys\bin\podcastengine.dll"
-
; application UI - note that FR,RI does not work when SIS is self signed
"\epoc32\release\gcce\udeb\Podcast.exe"-"!:\sys\bin\Podcast.exe",FR,RI
Binary file application/sis/podcatcher_udeb.sis has changed
Binary file application/sis/podcatcher_udeb_signed.sis has changed
--- a/application/sis/podcatcher_udeb_template.pkg Wed Jul 14 14:53:21 2010 +0100
+++ b/application/sis/podcatcher_udeb_template.pkg Thu Jul 15 22:43:10 2010 +0100
@@ -1,16 +1,18 @@
-&EN
+&EN,SP
:"Symbian Foundation"
-%{"Podcatcher"}
-#{"Podcatcher"},(0xA0009D00), 0, 90, BUILDNO, TYPE=SA
+%{"Podcatcher","Podcatcher"}
+#{"Podcatcher","Podcatcher"},(0xA0009D00), 0, 90, BUILDNO, TYPE=SA
;Supports S60 3rd edition
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;Supports Symbian^1
-[0x1028315F], 0, 0, 0, {"Series60ProductID"}
+[0x101F7961], 0, 0, 0, {"Series60ProductID","Series60ProductID"}
; resources
-"\epoc32\data\z\resource\apps\Podcast.RSC"-"!:\resource\apps\Podcast.rsc"
+{
+"\epoc32\data\z\resource\apps\Podcast.r01"
+"\epoc32\data\z\resource\apps\Podcast.r04"
+}
+-"!:\resource\apps\Podcast.rsc"
+
"\epoc32\data\z\resource\apps\Podcast.mif"-"!:\resource\apps\Podcast.mif"
"\epoc32\data\z\private\10003a3f\import\apps\Podcast_reg.rsc"-"!:\private\10003a3f\import\apps\Podcast_reg.rsc"
"..\help\podcatcher.hlp"-"!:\resource\help\podcatcher.hlp"
@@ -22,8 +24,5 @@
; backup
"./backup_registration.xml" - "c:\private\A0009D00\backup_registration.xml"
-; app DLL
-;"\epoc32\release\gcce\udeb\podcastengine.dll"-"!:\sys\bin\podcastengine.dll"
-
; application UI - note that FR,RI does not work when SIS is self signed
"\epoc32\release\gcce\udeb\Podcast.exe"-"!:\sys\bin\Podcast.exe",FR,RI
--- a/application/sis/podcatcher_urel.pkg Wed Jul 14 14:53:21 2010 +0100
+++ b/application/sis/podcatcher_urel.pkg Thu Jul 15 22:43:10 2010 +0100
@@ -1,7 +1,7 @@
&EN
:"Symbian Foundation"
%{"Podcatcher"}
-#{"Podcatcher"},(0xA0009D00), 1, 00, 3, TYPE=SA
+#{"Podcatcher"},(0xA0009D00), 1, 00, 4, TYPE=SA
;Supports S60 3rd edition
[0x101F7961], 0, 0, 0, {"Series60ProductID"}
--- a/application/src/PodcastQueueView.cpp Wed Jul 14 14:53:21 2010 +0100
+++ b/application/src/PodcastQueueView.cpp Thu Jul 15 22:43:10 2010 +0100
@@ -142,7 +142,7 @@
void CPodcastQueueView::UpdateListboxItemsL()
{
- if (iListContainer->IsVisible())
+ if (iListContainer->IsVisible() && !iDontUpdateList)
{
TListItemProperties itemProps;
TInt len = 0;
@@ -236,7 +236,17 @@
TInt index = iListContainer->Listbox()->CurrentItemIndex();
if (index >= 0 && index < iPodcastModel.ActiveShowList().Count())
{
+ // this is an ugly hack to prevent UpdateListboxItemsL from being
+ // triggered from the show engine, which causes focus to jump
+ // around in an ugly fashion
+ iDontUpdateList = ETrue;
TRAP_IGNORE(iPodcastModel.ShowEngine().RemoveDownloadL(iPodcastModel.ActiveShowList()[index]->Uid()));
+ iDontUpdateList = EFalse;
+ }
+ UpdateListboxItemsL();
+ if (index > 0)
+ {
+ iListContainer->Listbox()->SetCurrentItemIndex(index - 1);
}
}
break;