Assorted UI fixes for gPodder on Fremantle

This commit is contained in:
Thomas Perl 2009-09-22 20:53:26 +02:00
parent 97abab0820
commit 627be33765
4 changed files with 24 additions and 12 deletions

View file

@ -7,6 +7,11 @@
<property name="label" translatable="yes">Check for new episodes</property>
<signal handler="on_itemUpdate_activate" name="activate"/>
</object>
<object class="GtkAction" id="itemAbout">
<property name="stock_id">gtk-about</property>
<property name="name">itemAbout</property>
<signal handler="on_itemAbout_activate" name="activate"/>
</object>
<object class="GtkAction" id="itemDownloadAllNew">
<property name="stock_id">gtk-goto-bottom</property>
<property name="name">itemDownloadAllNew</property>

View file

@ -69,12 +69,15 @@ class gPodderDownloads(BuilderWidget):
def on_pause_button_clicked(self, button):
self._for_each_task_set_status(self._selected_tasks, DownloadTask.PAUSED)
self.on_select_none_button_clicked(button)
def on_resume_button_clicked(self, button):
self._for_each_task_set_status(self._selected_tasks, DownloadTask.QUEUED)
self.on_select_none_button_clicked(button)
def on_cancel_button_clicked(self, button):
self._for_each_task_set_status(self._selected_tasks, DownloadTask.CANCELLED)
self.on_select_none_button_clicked(button)
def on_cleanup_button_clicked(self, button):
self.on_btnCleanUpDownloads_clicked(button)

View file

@ -24,6 +24,8 @@ import gpodder
_ = gpodder.gettext
from gpodder import util
from gpodder.gtkui.interface.common import BuilderWidget
from gpodder.gtkui.model import PodcastListModel
@ -43,14 +45,14 @@ class gPodderPodcasts(BuilderWidget):
appmenu.add_filter(button)
appmenu.show_all()
self.main_window.set_app_menu(appmenu)
# Work around Maemo bug #4718
#self.button_subscribe.set_name('HildonButton-finger')
def on_update_feeds_button_clicked(self, button):
self.on_itemUpdate_activate(button)
self.main_window.hide()
util.idle_add(self.on_itemUpdate_activate, button)
def on_subscribe_button_clicked(self, button):
self.on_itemAddChannel_activate(button)
self.main_window.hide()
util.idle_add(self.on_itemAddChannel_activate, button)
def on_podcast_selected(self, treeview, path, column):
model = treeview.get_model()

View file

@ -159,8 +159,9 @@ class gPodder(BuilderWidget, dbus.service.Object):
appmenu = hildon.AppMenu()
for action in (self.itemUpdate, \
self.itemRemoveOldEpisodes, \
self.itemPreferences):
self.itemAddChannel, \
self.itemRemoveOldEpisodes, \
self.itemAbout):
button = gtk.Button()
action.connect_proxy(button)
appmenu.append(button)
@ -1905,7 +1906,7 @@ class gPodder(BuilderWidget, dbus.service.Object):
if self._fremantle_update_banner is not None:
self._fremantle_update_banner.destroy()
hildon.hildon_gtk_window_set_progress_indicator(self.main_window, False)
hildon.hildon_gtk_window_set_progress_indicator(self.podcasts_window.main_window, False)
self.update_podcasts_tab()
if episodes:
self.new_episodes_show(episodes)
else:
@ -1982,10 +1983,7 @@ class gPodder(BuilderWidget, dbus.service.Object):
break
if gpodder.ui.fremantle:
if self._fremantle_update_banner is not None:
progression = _('%d of %d podcasts updated') % (updated, total)
util.idle_add(self._fremantle_update_banner.set_text, progression)
util.idle_add(self._fremantle_update_banner.show)
self.button_podcasts.set_value(_('%d/%d updated') % (updated, total))
continue
# By the time we get here the update may have already been cancelled
@ -2043,7 +2041,6 @@ class gPodder(BuilderWidget, dbus.service.Object):
if gpodder.ui.fremantle:
hildon.hildon_gtk_window_set_progress_indicator(self.main_window, True)
hildon.hildon_gtk_window_set_progress_indicator(self.podcasts_window.main_window, True)
self._fremantle_update_banner = hildon.hildon_banner_show_animation(self.main_window, \
'', _('Updating podcast feeds'))
else:
@ -2778,6 +2775,11 @@ class gPodder(BuilderWidget, dbus.service.Object):
dlg.set_logo(gtk.gdk.pixbuf_new_from_file(gpodder.icon_file))
except:
dlg.set_logo_icon_name('gpodder')
elif gpodder.ui.fremantle:
for parent in dlg.vbox.get_children():
for child in parent.get_children():
if isinstance(child, gtk.Label):
child.set_selectable(False)
dlg.run()