Translation update, debian package version push, iPod mountpoint configurable, error message when iPod access is not possible.

git-svn-id: svn://svn.berlios.de/gpodder@80 b0d088ad-0a06-0410-aad2-9ed5178a7e87
This commit is contained in:
Thomas Perl 2006-04-07 18:11:31 +00:00
parent 7ec8455a13
commit 2a95b15c2e
12 changed files with 216 additions and 88 deletions

View file

@ -1,3 +1,10 @@
Fri, 07 Apr 2006 20:06:29 +0200 <thp@perli.net>
* Make iPod mountpoint configurable (gPodderLib, glade GUI)
* Display error message when iPod cannot be found/accessed
* Updated gpodder.desktop file
* Updated german translation
* Updated deb package source for upload to Ubuntu's REVU
Fri, 07 Apr 2006 04:59:01 +0200 <thp@perli.net>
* Added "Suggests" to the Debian control file
* Updated Debian changelog, pushed version of debian package

View file

@ -1,10 +1,11 @@
[Desktop Entry]
Name=gPodder
Comment=Media Agregator
Comment=a media aggregator / podcast catcher
Comment[de]=Medien-Aggregator und Podcast-Client
Exec=gpodder
Icon=/usr/share/gpodder/images/gpodder.png
Miniicon=/usr/share/gpodder/images/gpodder.png
GenericName=Media Agregator
GenericName=Media aggregator
Terminal=false
Type=Application
Categories=AudioVideo;Audio

View file

@ -1636,7 +1636,7 @@
<widget class="GtkTable" id="table2">
<property name="border_width">10</property>
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">5</property>
@ -1733,6 +1733,55 @@
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label34">
<property name="visible">True</property>
<property name="label" translatable="yes">iPod mountpoint:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="iPodMountpoint">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
<property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
</widget>
<packing>
<property name="tab_expand">False</property>

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gPodder 0.7svn\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-04-07 03:43+0200\n"
"POT-Creation-Date: 2006-04-07 16:05+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -92,7 +92,7 @@ msgid ""
"Maybe the URL is wrong?"
msgstr ""
#: src/gpodder/gpodder.py:304 src/gpodder/gpodder.py:429
#: src/gpodder/gpodder.py:304 src/gpodder/gpodder.py:439
msgid "Fetching channel index..."
msgstr ""
@ -102,7 +102,14 @@ msgid ""
"Only <b>http://</b> and <b>ftp://</b> URLs supported at the moment."
msgstr ""
#: src/gpodder/gpodder.py:361
#: src/gpodder/gpodder.py:328 src/gpodder/gpodder.py:341
#, python-format
msgid ""
"Cannot access iPod at %s.\n"
"Make sure your iPod is connected and mounted."
msgstr ""
#: src/gpodder/gpodder.py:371
msgid ""
"<big><b>Updating feed cache</b></big>\n"
"\n"
@ -110,14 +117,14 @@ msgid ""
"updating the feed cache..."
msgstr ""
#: src/gpodder/gpodder.py:422
#: src/gpodder/gpodder.py:432
msgid ""
"Cannot edit this channel.\n"
"\n"
"No channel found."
msgstr ""
#: src/gpodder/gpodder.py:451
#: src/gpodder/gpodder.py:461
#, python-format
msgid ""
"Do you really want to remove this channel?\n"
@ -125,35 +132,35 @@ msgid ""
" %s"
msgstr ""
#: src/gpodder/gpodder.py:458
#: src/gpodder/gpodder.py:468
msgid ""
"Could not delete channel.\n"
"Probably no channel is selected."
msgstr ""
#: src/gpodder/gpodder.py:466
#: src/gpodder/gpodder.py:476
msgid "Your channel list is empty. Nothing to export."
msgstr ""
#: src/gpodder/gpodder.py:468
#: src/gpodder/gpodder.py:478
msgid "Export to OPML"
msgstr ""
#: src/gpodder/gpodder.py:497
#: src/gpodder/gpodder.py:507
msgid "translator-credits"
msgstr ""
#: src/gpodder/gpodder.py:537
#: src/gpodder/gpodder.py:547
msgid "You have not selected an episode to download."
msgstr ""
#: src/gpodder/gpodder.py:552
#: src/gpodder/gpodder.py:562
msgid ""
"You have already downloaded this episode\n"
"or you are currently downloading it."
msgstr ""
#: src/gpodder/gpodder.py:577
#: src/gpodder/gpodder.py:587
#, python-format
msgid ""
"Do you really want to cancel this download?\n"
@ -161,11 +168,11 @@ msgid ""
"%s"
msgstr ""
#: src/gpodder/gpodder.py:580 src/gpodder/gpodder.py:617
#: src/gpodder/gpodder.py:590 src/gpodder/gpodder.py:627
msgid "No episode selected."
msgstr ""
#: src/gpodder/gpodder.py:643
#: src/gpodder/gpodder.py:653
#, python-format
msgid ""
"Do you really want to remove this episode?\n"
@ -173,42 +180,42 @@ msgid ""
"%s"
msgstr ""
#: src/gpodder/gpodder.py:653
#: src/gpodder/gpodder.py:663
msgid "Could not delete downloaded podcast."
msgstr ""
#: src/gpodder/gpodder.py:691 src/gpodder/gpodder.py:692
#: src/gpodder/gpodder.py:701 src/gpodder/gpodder.py:702
#: data/gpodder.glade.h:1
msgid "(unknown)"
msgstr ""
#: src/gpodder/gpodder.py:907
#: src/gpodder/gpodder.py:919
#, python-format
msgid "%d of %d"
msgstr ""
#: src/gpodder/gpodder.py:950
#: src/gpodder/gpodder.py:962
msgid ""
"Please do not call gpodder.py directly. Instead, call the gpodder binary."
msgstr ""
#: src/gpodder/libgpodder.py:77
#: src/gpodder/libgpodder.py:78
msgid "gPodder downloads"
msgstr ""
#: src/gpodder/libgpodder.py:222
#: src/gpodder/libgpodder.py:226
msgid "Downloading channel cover..."
msgstr ""
#: src/gpodder/libgpodder.py:273
#: src/gpodder/libgpodder.py:277
msgid "gPodder channel list"
msgstr ""
#: src/gpodder/libipodsync.py:76
#: src/gpodder/libipodsync.py:78
msgid "Saving iPod database..."
msgstr ""
#: src/gpodder/libipodsync.py:157
#: src/gpodder/libipodsync.py:160
#, python-format
msgid "Complete: %s"
msgstr ""
@ -444,6 +451,10 @@ msgid "gPodder properties"
msgstr ""
#: data/gpodder.glade.h:55
msgid "iPod mountpoint:"
msgstr ""
#: data/gpodder.glade.h:56
msgid "iPod:"
msgstr ""

View file

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gPodder 0.7-svn\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-04-07 03:38+0200\n"
"PO-Revision-Date: 2006-04-07 03:39+0100\n"
"POT-Creation-Date: 2006-04-07 16:03+0200\n"
"PO-Revision-Date: 2006-04-07 16:05+0100\n"
"Last-Translator: Thomas Perl <thp@perli.net>\n"
"Language-Team: gPodder Team <thp@perli.net>\n"
"MIME-Version: 1.0\n"
@ -100,7 +100,7 @@ msgstr ""
"Vielleicht ist die URL falsch?"
#: src/gpodder/gpodder.py:304
#: src/gpodder/gpodder.py:429
#: src/gpodder/gpodder.py:439
msgid "Fetching channel index..."
msgstr "Channel-Index wird heruntergeladen..."
@ -112,7 +112,17 @@ msgstr ""
"Konnte neuen Channel nicht abbonieren.\n"
"Derzeit werden nur <b>http://</b> und <b>ftp://</b>-URLs unterstützt."
#: src/gpodder/gpodder.py:361
#: src/gpodder/gpodder.py:328
#: src/gpodder/gpodder.py:341
#, python-format
msgid ""
"Cannot access iPod at %s.\n"
"Make sure your iPod is connected and mounted."
msgstr ""
"Kann auf den iPod in %s nicht zugreifen.\n"
"Bitte sicherstellen, dass der iPod angesteckt und eingebunden ist."
#: src/gpodder/gpodder.py:371
msgid ""
"<big><b>Updating feed cache</b></big>\n"
"\n"
@ -124,7 +134,7 @@ msgstr ""
"Bitte warten Sie, während gPodder Ihre\n"
"Channel-Abonnements aktualisiert..."
#: src/gpodder/gpodder.py:422
#: src/gpodder/gpodder.py:432
msgid ""
"Cannot edit this channel.\n"
"\n"
@ -134,7 +144,7 @@ msgstr ""
"\n"
"Kein Channel gefunden."
#: src/gpodder/gpodder.py:451
#: src/gpodder/gpodder.py:461
#, python-format
msgid ""
"Do you really want to remove this channel?\n"
@ -145,7 +155,7 @@ msgstr ""
"\n"
"%s"
#: src/gpodder/gpodder.py:458
#: src/gpodder/gpodder.py:468
msgid ""
"Could not delete channel.\n"
"Probably no channel is selected."
@ -153,23 +163,23 @@ msgstr ""
"Konnte Channel nicht entfernen.\n"
"Wahrscheinlich ist keiner ausgewählt."
#: src/gpodder/gpodder.py:466
#: src/gpodder/gpodder.py:476
msgid "Your channel list is empty. Nothing to export."
msgstr "Nichts zu exportieren: Sie haben keine Abonnements."
#: src/gpodder/gpodder.py:468
#: src/gpodder/gpodder.py:478
msgid "Export to OPML"
msgstr "Als OPML-Datei exportieren"
#: src/gpodder/gpodder.py:497
#: src/gpodder/gpodder.py:507
msgid "translator-credits"
msgstr "Thomas Perl <thp@perli.net>"
#: src/gpodder/gpodder.py:537
#: src/gpodder/gpodder.py:547
msgid "You have not selected an episode to download."
msgstr "Sie haben keine Episode für den Download ausgewählt."
#: src/gpodder/gpodder.py:552
#: src/gpodder/gpodder.py:562
msgid ""
"You have already downloaded this episode\n"
"or you are currently downloading it."
@ -177,7 +187,7 @@ msgstr ""
"Sie haben diese Episode bereits heruntergeladen\n"
"oder Sie laden sie jetzt gerade herunter."
#: src/gpodder/gpodder.py:577
#: src/gpodder/gpodder.py:587
#, python-format
msgid ""
"Do you really want to cancel this download?\n"
@ -188,12 +198,12 @@ msgstr ""
"\n"
"%s"
#: src/gpodder/gpodder.py:580
#: src/gpodder/gpodder.py:617
#: src/gpodder/gpodder.py:590
#: src/gpodder/gpodder.py:627
msgid "No episode selected."
msgstr "Keine Episode ausgewählt."
#: src/gpodder/gpodder.py:643
#: src/gpodder/gpodder.py:653
#, python-format
msgid ""
"Do you really want to remove this episode?\n"
@ -204,42 +214,42 @@ msgstr ""
"\n"
"%s"
#: src/gpodder/gpodder.py:653
#: src/gpodder/gpodder.py:663
msgid "Could not delete downloaded podcast."
msgstr "Konnte den ausgewählten Podcast nicht entfernen."
#: src/gpodder/gpodder.py:691
#: src/gpodder/gpodder.py:692
#: src/gpodder/gpodder.py:701
#: src/gpodder/gpodder.py:702
#: data/gpodder.glade.h:1
msgid "(unknown)"
msgstr "(unbekannt)"
#: src/gpodder/gpodder.py:907
#: src/gpodder/gpodder.py:919
#, python-format
msgid "%d of %d"
msgstr "%d von %d"
#: src/gpodder/gpodder.py:950
#: src/gpodder/gpodder.py:962
msgid "Please do not call gpodder.py directly. Instead, call the gpodder binary."
msgstr "Bitte starten Sie gPodder nie direkt über gpodder.py. Rufen Sie stattdessen das \"gpodder\" Programm auf."
#: src/gpodder/libgpodder.py:77
#: src/gpodder/libgpodder.py:78
msgid "gPodder downloads"
msgstr "gPodder Downloads"
#: src/gpodder/libgpodder.py:222
#: src/gpodder/libgpodder.py:226
msgid "Downloading channel cover..."
msgstr "Bild wird heruntergeladen..."
#: src/gpodder/libgpodder.py:273
#: src/gpodder/libgpodder.py:277
msgid "gPodder channel list"
msgstr "gPodder Channel-Editor"
#: src/gpodder/libipodsync.py:76
#: src/gpodder/libipodsync.py:78
msgid "Saving iPod database..."
msgstr "Speichere iPod-Datenbank..."
#: src/gpodder/libipodsync.py:157
#: src/gpodder/libipodsync.py:160
#, python-format
msgid "Complete: %s"
msgstr "Fertig: %s"
@ -480,6 +490,10 @@ msgid "gPodder properties"
msgstr "gPodder Einstellungen"
#: data/gpodder.glade.h:55
msgid "iPod mountpoint:"
msgstr "iPod Einhängepunkt:"
#: data/gpodder.glade.h:56
msgid "iPod:"
msgstr "iPod:"

View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gPodder 0.7-svn\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-04-07 03:38+0200\n"
"POT-Creation-Date: 2006-04-07 16:03+0200\n"
"PO-Revision-Date: 2006-04-06 15:37+0100\n"
"Last-Translator: Thomas Perl <thp@perli.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -101,7 +101,7 @@ msgstr ""
"L'ajout du flux a echoué.\n"
"L'URL est sans doute erronée?"
#: src/gpodder/gpodder.py:304 src/gpodder/gpodder.py:429
#: src/gpodder/gpodder.py:304 src/gpodder/gpodder.py:439
msgid "Fetching channel index..."
msgstr "Récupération de l'index du flux RSS"
@ -114,7 +114,14 @@ msgstr ""
"Seules les URL <b>http://</b> et <b>ftp://</b> sont supportées pour le "
"moment."
#: src/gpodder/gpodder.py:361
#: src/gpodder/gpodder.py:328 src/gpodder/gpodder.py:341
#, python-format
msgid ""
"Cannot access iPod at %s.\n"
"Make sure your iPod is connected and mounted."
msgstr ""
#: src/gpodder/gpodder.py:371
msgid ""
"<big><b>Updating feed cache</b></big>\n"
"\n"
@ -126,7 +133,7 @@ msgstr ""
"Merci de patienter pendant que gpodder met\n"
"à jour le cache des flux RSS..."
#: src/gpodder/gpodder.py:422
#: src/gpodder/gpodder.py:432
msgid ""
"Cannot edit this channel.\n"
"\n"
@ -136,7 +143,7 @@ msgstr ""
"\n"
"Flux RSS introuvable."
#: src/gpodder/gpodder.py:451
#: src/gpodder/gpodder.py:461
#, python-format
msgid ""
"Do you really want to remove this channel?\n"
@ -147,7 +154,7 @@ msgstr ""
"\n"
"%s"
#: src/gpodder/gpodder.py:458
#: src/gpodder/gpodder.py:468
msgid ""
"Could not delete channel.\n"
"Probably no channel is selected."
@ -155,23 +162,23 @@ msgstr ""
"Impossible de supprimer ce flux.\n"
"Il n'y a sans doute pas de flux selectionné."
#: src/gpodder/gpodder.py:466
#: src/gpodder/gpodder.py:476
msgid "Your channel list is empty. Nothing to export."
msgstr "Votre liste de flux est vide. Il n'y a rien à exporter."
#: src/gpodder/gpodder.py:468
#: src/gpodder/gpodder.py:478
msgid "Export to OPML"
msgstr "Exporter au format OPML"
#: src/gpodder/gpodder.py:497
#: src/gpodder/gpodder.py:507
msgid "translator-credits"
msgstr "Alain Tauch <contrib@maisondubonheur.com>"
#: src/gpodder/gpodder.py:537
#: src/gpodder/gpodder.py:547
msgid "You have not selected an episode to download."
msgstr "Vous n'avez pas selectionné d'émission à télécharger."
#: src/gpodder/gpodder.py:552
#: src/gpodder/gpodder.py:562
msgid ""
"You have already downloaded this episode\n"
"or you are currently downloading it."
@ -179,7 +186,7 @@ msgstr ""
"Vous avez déjà téléchargé cette émission\n"
"ou elle est en cours de téléchargement."
#: src/gpodder/gpodder.py:577
#: src/gpodder/gpodder.py:587
#, python-format
msgid ""
"Do you really want to cancel this download?\n"
@ -190,11 +197,11 @@ msgstr ""
"\n"
"%s"
#: src/gpodder/gpodder.py:580 src/gpodder/gpodder.py:617
#: src/gpodder/gpodder.py:590 src/gpodder/gpodder.py:627
msgid "No episode selected."
msgstr "Aucune émission sélectionnée."
#: src/gpodder/gpodder.py:643
#: src/gpodder/gpodder.py:653
#, python-format
msgid ""
"Do you really want to remove this episode?\n"
@ -205,44 +212,44 @@ msgstr ""
"\n"
"%s"
#: src/gpodder/gpodder.py:653
#: src/gpodder/gpodder.py:663
msgid "Could not delete downloaded podcast."
msgstr "La suppression du podcast a échouée"
#: src/gpodder/gpodder.py:691 src/gpodder/gpodder.py:692
#: src/gpodder/gpodder.py:701 src/gpodder/gpodder.py:702
#: data/gpodder.glade.h:1
msgid "(unknown)"
msgstr "(inconnu(e))"
#: src/gpodder/gpodder.py:907
#: src/gpodder/gpodder.py:919
#, python-format
msgid "%d of %d"
msgstr ""
#: src/gpodder/gpodder.py:950
#: src/gpodder/gpodder.py:962
msgid ""
"Please do not call gpodder.py directly. Instead, call the gpodder binary."
msgstr ""
"Merci de ne pas lancer gpodder.py directement. Utilisez plutôt le binaire "
"gpodder."
#: src/gpodder/libgpodder.py:77
#: src/gpodder/libgpodder.py:78
msgid "gPodder downloads"
msgstr "Téléchargements gPodder"
#: src/gpodder/libgpodder.py:222
#: src/gpodder/libgpodder.py:226
msgid "Downloading channel cover..."
msgstr "Téléchargement du logo"
#: src/gpodder/libgpodder.py:273
#: src/gpodder/libgpodder.py:277
msgid "gPodder channel list"
msgstr "Liste des flux RSS gPodder"
#: src/gpodder/libipodsync.py:76
#: src/gpodder/libipodsync.py:78
msgid "Saving iPod database..."
msgstr ""
#: src/gpodder/libipodsync.py:157
#: src/gpodder/libipodsync.py:160
#, python-format
msgid "Complete: %s"
msgstr ""
@ -484,6 +491,10 @@ msgid "gPodder properties"
msgstr "Préférences gPodder"
#: data/gpodder.glade.h:55
msgid "iPod mountpoint:"
msgstr ""
#: data/gpodder.glade.h:56
msgid "iPod:"
msgstr ""

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
gpodder (0.7+svn20060407-2) unstable; urgency=low
* New upstream updates (see ChangeLog)
-- Thomas Perl <thp@perli.net> Fri, 7 Apr 2006 20:09:21 +0200
gpodder (0.7+svn20060407-1) unstable; urgency=low
* New upstream update

View file

@ -10,6 +10,12 @@
*) copy "data/messages.pot" to "data/po/XX.po",
with "XX" being your iso lang code (example: "de")
*) edit the "data/po/XX.po" file (translate the strings)
*) edit "data/gpodder.desktop" and translate the Comment line,
so if you're adding the "XX" translation, add a line like this:
Comment[XX]=a media aggregator / podcast catcher
(of course, with the comment translated into the XX language)
*) run "make generators" again
*) run "make test" to see if it works
*) add your language to the languages list in setup.py
@ -20,5 +26,6 @@
-- thp <thp@perli.net>, Thu, 30 Mar 2006 23:16:20 +0200
Updated: Fri, 31 Mar 2006 18:11:41 +0200
Updated: Wed, 05 Apr 2006 20:13:07 +0200
Updated: Fri, 07 Apr 2006 15:28:33 +0200

View file

@ -2,7 +2,7 @@
# Python module src/gpodder/gpodder.py
# Autogenerated from gpodder.glade
# Generated on Fri Apr 7 04:52:49 2006
# Generated on Fri Apr 7 16:05:16 2006
# Warning: Do not modify any context comment such as #--
# They are required to keep user's code
@ -321,16 +321,26 @@ class Gpodder(SimpleGladeApp):
return self.comboDownloaded.get_model().get_value( iter, 0)
def sync_to_ipod_proc( self, sync_win):
sync = gPodder_iPodSync( callback_status = sync_win.set_status, callback_progress = sync_win.set_progress, callback_done = sync_win.close)
sync.open()
gpl = gPodderLib()
gpl.loadConfig()
sync = gPodder_iPodSync( ipod_mount = gpl.ipod_mount, callback_status = sync_win.set_status, callback_progress = sync_win.set_progress, callback_done = sync_win.close)
if not sync.open():
gobject.idle_add( self.showMessage, _('Cannot access iPod at %s.\nMake sure your iPod is connected and mounted.') % gpl.ipod_mount)
sync.close()
return False
for channel in self.downloaded_channels:
channel.set_metadata_from_localdb()
sync.copy_channel_to_ipod( channel)
sync.close()
def ipod_cleanup_proc( self, sync_win):
sync = gPodder_iPodSync( callback_status = sync_win.set_status, callback_progress = sync_win.set_progress, callback_done = sync_win.close)
sync.open()
gpl = gPodderLib()
gpl.loadConfig()
sync = gPodder_iPodSync( ipod_mount = gpl.ipod_mount, callback_status = sync_win.set_status, callback_progress = sync_win.set_progress, callback_done = sync_win.close)
if not sync.open():
gobject.idle_add( self.showMessage, _('Cannot access iPod at %s.\nMake sure your iPod is connected and mounted.') % gpl.ipod_mount)
sync.close()
return False
sync.clean_playlist()
sync.close()
#-- Gpodder custom methods }
@ -755,6 +765,7 @@ class Gpodderproperties(SimpleGladeApp):
self.httpProxy.set_text( gl.http_proxy)
self.ftpProxy.set_text( gl.ftp_proxy)
self.openApp.set_text( gl.open_app)
self.iPodMountpoint.set_text( gl.ipod_mount)
# the use proxy env vars check box
self.cbEnvironmentVariables.set_active( gl.proxy_use_environment)
# if the symlink exists, set the checkbox active
@ -836,6 +847,7 @@ class Gpodderproperties(SimpleGladeApp):
gl.ftp_proxy = self.ftpProxy.get_text()
gl.open_app = self.openApp.get_text()
gl.proxy_use_environment = self.cbEnvironmentVariables.get_active()
gl.ipod_mount = self.iPodMountpoint.get_text()
gl.propertiesChanged()
# create or remove symlink to download dir on desktop
if self.cbDesktopSymlink.get_active():

View file

@ -3,7 +3,7 @@
# Python module src/gpodder/gpodder.py
# Autogenerated from gpodder.glade
# Generated on Fri Apr 7 04:52:49 2006
# Generated on Fri Apr 7 16:05:16 2006
# Warning: Do not modify any context comment such as #--
# They are required to keep user's code

View file

@ -74,6 +74,7 @@ class gPodderLibClass( object):
ftp_proxy = ""
proxy_use_environment = False
open_app = ""
ipod_mount = ""
desktop_link = _("gPodder downloads")
gpodderconf_section = 'gpodder-conf-1'
@ -127,6 +128,7 @@ class gPodderLibClass( object):
self.write_to_parser( parser, 'ftp_proxy', self.ftp_proxy)
self.write_to_parser( parser, 'player', self.open_app)
self.write_to_parser( parser, 'proxy_use_env', self.proxy_use_environment)
self.write_to_parser( parser, 'ipod_mount', self.ipod_mount)
fn = self.getConfigFilename()
fp = open( fn, "w")
parser.write( fp)
@ -178,6 +180,7 @@ class gPodderLibClass( object):
ftp = self.get_from_parser( parser, 'ftp_proxy')
app = self.get_from_parser( parser, 'player', 'gnome-open')
self.proxy_use_environment = self.get_boolean_from_parser( parser, 'proxy_use_env', True)
self.ipod_mount = self.get_from_parser( parser, 'ipod_mount', '/media/ipod/')
else:
if isDebugging():
print "config file %s has no section %s" % (fn, gpodderconf_section)
@ -191,6 +194,7 @@ class gPodderLibClass( object):
except:
# TODO: well, well.. (http + ftp?)
self.open_app = 'gnome-open'
self.ipod_mount = '/media/ipod/'
if was_oldstyle:
self.saveConfig()

View file

@ -41,7 +41,7 @@ def ipod_supported():
class gPodder_iPodSync(object):
itdb = None
ipod_mount = '' # mountpoint for ipod
playlist_name = 'gpodder'
playlist_name = 'gpodder' # name of playlist to sync to
pl_master = None
pl_gpodder = None
callback_progress = None
@ -62,9 +62,13 @@ class gPodder_iPodSync(object):
return False
if self.itdb == None:
self.itdb = gpod.itdb_parse( self.ipod_mount, None)
if not self.itdb:
return False
self.itdb.mountpoint = self.ipod_mount
self.pl_master = gpod.sw_get_playlists( self.itdb)[0]
self.pl_gpodder = self.get_gpodder_playlist()
#self.pl_gpodder = self.get_gpodder_playlist()
self.pl_gpodder = gpod.itdb_playlist_podcasts( self.itdb)
return True
def close( self, write_update = True):
if not ipod_supported():
@ -74,11 +78,13 @@ class gPodder_iPodSync(object):
gobject.idle_add( self.callback_progress, 100, 100)
if self.callback_status != None:
gobject.idle_add( self.callback_status, '...', '...', _('Saving iPod database...'))
gpod.itdb_write( self.itdb, None)
if self.itdb:
gpod.itdb_write( self.itdb, None)
self.itdb = None
if self.callback_done != None:
time.sleep(1)
gobject.idle_add( self.callback_done)
return True
def remove_from_ipod( self, track):
if not ipod_supported():
@ -117,7 +123,7 @@ class gPodder_iPodSync(object):
if not ipod_supported():
return False
for track in gpod.sw_get_playlist_tracks( self.pl_gpodder):
if episode.title == track.title and channel.title == track.artist:
if episode.title == track.title and channel.title == track.album:
if libgpodder.isDebugging():
print '(ipodsync) Already on iPod: %s (from %s)' % (episode.title, track.title)
return True
@ -190,10 +196,10 @@ class gPodder_iPodSync(object):
track = gpod.itdb_track_new()
self.set_podcast_flags( track)
track.title = str(episode.title)
track.artist = str(channel.title)
track.album = 'gPodder podcast'
track.artist = 'gPodder podcasts'
track.album = str(channel.title)
track.tracklen = track_length
track.filetype = 'mp3' # huh?! harcoded?! well, well :)
track.filetype = 'mp3' # huh?! harcoded?! well, well :) FIXME, i'd say
track.description = str(episode.description)
gpod.itdb_track_add( self.itdb, track, -1)