Tray icon support only for the Desktop version
We have to re-implement a proper tray icon for Maemo that works better than what we currently have.
This commit is contained in:
parent
7a10f123e1
commit
320ee901ed
4 changed files with 9 additions and 21 deletions
|
@ -50,17 +50,6 @@
|
|||
<property name="x_options">fill</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkCheckButton" id="check_show_status_icon">
|
||||
<property name="label" translatable="yes">Show icon in status area</property>
|
||||
<property name="visible">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="bottom_attach">3</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkCheckButton" id="check_ask_on_quit">
|
||||
<property name="is_focus">True</property>
|
||||
|
|
|
@ -39,7 +39,6 @@ class gPodderPreferences(BuilderWidget):
|
|||
]
|
||||
|
||||
def new(self):
|
||||
self._config.connect_gtk_togglebutton('display_tray_icon', self.check_show_status_icon)
|
||||
self._config.connect_gtk_togglebutton('on_quit_ask', self.check_ask_on_quit)
|
||||
self._config.connect_gtk_togglebutton('maemo_enable_gestures', self.check_enable_gestures)
|
||||
self._config.connect_gtk_togglebutton('disable_fingerscroll', self.check_disable_fingerscroll)
|
||||
|
|
|
@ -73,14 +73,6 @@ from gpodder.liblogger import log
|
|||
|
||||
_ = gpodder.gettext
|
||||
|
||||
try:
|
||||
from gpodder import trayicon
|
||||
have_trayicon = True
|
||||
except Exception, exc:
|
||||
log('Warning: Could not import gpodder.trayicon.', traceback=True)
|
||||
log('Warning: This probably means your PyGTK installation is too old!')
|
||||
have_trayicon = False
|
||||
|
||||
from gpodder.model import PodcastChannel
|
||||
from gpodder.dbsqlite import Database
|
||||
|
||||
|
@ -104,9 +96,17 @@ if gpodder.interface == gpodder.GUI:
|
|||
|
||||
from gpodder.gtkui.desktop.preferences import gPodderPreferences
|
||||
from gpodder.gtkui.desktop.shownotes import gPodderShownotes
|
||||
try:
|
||||
from gpodder.gtkui.desktop.trayicon import GPodderStatusIcon
|
||||
have_trayicon = True
|
||||
except Exception, exc:
|
||||
log('Warning: Could not import gpodder.trayicon.', traceback=True)
|
||||
log('Warning: This probably means your PyGTK installation is too old!')
|
||||
have_trayicon = False
|
||||
else:
|
||||
from gpodder.gtkui.maemo.preferences import gPodderPreferences
|
||||
from gpodder.gtkui.maemo.shownotes import gPodderShownotes
|
||||
have_trayicon = False
|
||||
|
||||
from gpodder.gtkui.interface.podcastdirectory import gPodderPodcastDirectory
|
||||
from gpodder.gtkui.interface.episodeselector import gPodderEpisodeSelector
|
||||
|
@ -2591,7 +2591,7 @@ class gPodder(BuilderWidget, dbus.service.Object):
|
|||
|
||||
def show_hide_tray_icon(self):
|
||||
if self.config.display_tray_icon and have_trayicon and self.tray_icon is None:
|
||||
self.tray_icon = trayicon.GPodderStatusIcon(self, gpodder.icon_file, self.config)
|
||||
self.tray_icon = GPodderStatusIcon(self, gpodder.icon_file, self.config)
|
||||
elif not self.config.display_tray_icon and self.tray_icon is not None:
|
||||
self.tray_icon.set_visible(False)
|
||||
del self.tray_icon
|
||||
|
|
Loading…
Reference in a new issue