From 51af42fd254a523928171ed30cf5122f38a9d1ef Mon Sep 17 00:00:00 2001
From: Thomas Perl <thp@perli.net>
Date: Fri, 2 May 2008 15:45:45 +0000
Subject: [PATCH] Fri, 02 May 2008 17:42:54 +0200 <thp@perli.net> Maemo-related
 changes; allow custom player on Maemo (optional)

	* data/gpodder.glade: gPodder maemo preferences window should be
	modal; Add "Ask before closing gPodder" checkbox to Maemo preferences
	* src/gpodder/config.py: Add option "maemo_allow_custom_player" that
	allows setting the "player" and "videoplayer" variables to a command
	that will be called, like on the Desktop version (instead of always
	opening Nokia's Media Player with all files)
	* src/gpodder/gui.py: Maemo-specific UI tweaks
	* src/gpodder/libgpodder.py: Only call Nokia's Mediaplayer when we are
	on Maemo and when "maemo_allow_custom_player" is set to False



git-svn-id: svn://svn.berlios.de/gpodder/trunk@701 b0d088ad-0a06-0410-aad2-9ed5178a7e87
---
 ChangeLog                 | 13 +++++++++++++
 data/gpodder.glade        | 25 +++++++++++++++++++++++--
 src/gpodder/config.py     |  1 +
 src/gpodder/gui.py        |  4 +++-
 src/gpodder/libgpodder.py |  2 +-
 5 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 64e2b0e5..6fe299bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Fri, 02 May 2008 17:42:54 +0200 <thp@perli.net>
+Maemo-related changes; allow custom player on Maemo (optional)
+
+	* data/gpodder.glade: gPodder maemo preferences window should be
+	modal; Add "Ask before closing gPodder" checkbox to Maemo preferences
+	* src/gpodder/config.py: Add option "maemo_allow_custom_player" that
+	allows setting the "player" and "videoplayer" variables to a command
+	that will be called, like on the Desktop version (instead of always
+	opening Nokia's Media Player with all files)
+	* src/gpodder/gui.py: Maemo-specific UI tweaks
+	* src/gpodder/libgpodder.py: Only call Nokia's Mediaplayer when we are
+	on Maemo and when "maemo_allow_custom_player" is set to False
+
 Fri, 02 May 2008 17:28:22 +0200 <thp@perli.net>
 Change "Channel" to "Podcast"; new main menu; URL entry updated; +niceties
 
diff --git a/data/gpodder.glade b/data/gpodder.glade
index ed102df2..d1484be6 100644
--- a/data/gpodder.glade
+++ b/data/gpodder.glade
@@ -6886,7 +6886,7 @@ Filesystem-based MP3 player</property>
   <property name="title" translatable="yes">Preferences</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-  <property name="modal">False</property>
+  <property name="modal">True</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
@@ -6917,7 +6917,7 @@ Filesystem-based MP3 player</property>
 	    <widget class="GtkTable" id="table16">
 	      <property name="border_width">5</property>
 	      <property name="visible">True</property>
-	      <property name="n_rows">1</property>
+	      <property name="n_rows">2</property>
 	      <property name="n_columns">1</property>
 	      <property name="homogeneous">False</property>
 	      <property name="row_spacing">5</property>
@@ -6944,6 +6944,27 @@ Filesystem-based MP3 player</property>
 		  <property name="y_options">expand</property>
 		</packing>
 	      </child>
+	      <child>
+		<widget class="GtkCheckButton" id="on_quit_ask">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Ask before closing gPodder</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <property name="active">False</property>
+		  <property name="inconsistent">False</property>
+		  <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">0</property>
+		  <property name="right_attach">1</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options">expand</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="tab_expand">False</property>
diff --git a/src/gpodder/config.py b/src/gpodder/config.py
index 9094fd11..b31fe893 100644
--- a/src/gpodder/config.py
+++ b/src/gpodder/config.py
@@ -107,6 +107,7 @@ gPodderSettings = {
     'max_episodes_per_feed': (int, 200),
     'mp3_player_use_scrobbler_log': (bool, False),
     'show_podcast_url_entry': (bool, True),
+    'maemo_allow_custom_player': (bool, False),
 
     # Window and paned positions
     'main_window_x': ( int, 100 ),
diff --git a/src/gpodder/gui.py b/src/gpodder/gui.py
index 79489333..40f3b50b 100644
--- a/src/gpodder/gui.py
+++ b/src/gpodder/gui.py
@@ -282,7 +282,6 @@ class gPodder(GladeWidget):
             for child in self.mainMenu.get_children():
                 child.reparent(menu)
             self.itemQuit.reparent(menu)
-            self.trennlinie3.parent.remove(self.trennlinie3)
             self.window.set_menu(menu)
          
             self.mainMenu.destroy()
@@ -292,6 +291,7 @@ class gPodder(GladeWidget):
             self.toolbar.remove(self.toolTransfer)
             self.itemTransferSelected.hide_all()
             self.item_show_url_entry.hide_all()
+            self.item_email_subscriptions.hide_all()
 
             # Feed cache update button
             self.label120.set_text(_('Update'))
@@ -2107,6 +2107,7 @@ class gPodderMaemoPreferences(GladeWidget):
         gl.config.connect_gtk_togglebutton('update_on_startup', self.update_on_startup)
         gl.config.connect_gtk_togglebutton('display_tray_icon', self.show_tray_icon)
         gl.config.connect_gtk_togglebutton('enable_notifications', self.show_notifications)
+        gl.config.connect_gtk_togglebutton('on_quit_ask', self.on_quit_ask)
 
         self.restart_required = False
         self.show_tray_icon.connect('clicked', self.on_restart_required)
@@ -2622,6 +2623,7 @@ class gPodderOpmlLister(GladeWidget):
         togglecolumn = gtk.TreeViewColumn( '', togglecell, active=0)
         
         titlecell = gtk.CellRendererText()
+        titlecell.set_property('ellipsize', pango.ELLIPSIZE_END)
         titlecolumn = gtk.TreeViewColumn(_('Podcast'), titlecell, markup=1)
 
         for itemcolumn in ( togglecolumn, titlecolumn ):
diff --git a/src/gpodder/libgpodder.py b/src/gpodder/libgpodder.py
index 024dd95f..266baa9b 100644
--- a/src/gpodder/libgpodder.py
+++ b/src/gpodder/libgpodder.py
@@ -213,7 +213,7 @@ class gPodderLib(object):
         self.history_mark_played( episode.url)
         filename = episode.local_filename()
 
-        if gpodder.interface == gpodder.MAEMO:
+        if gpodder.interface == gpodder.MAEMO and not self.config.maemo_allow_custom_player:
             # Use the built-in Nokia Mediaplayer here
             filename = filename.encode('utf-8')
             osso_rpc = osso.Rpc(self.osso_c)
-- 
2.11.4.GIT