mirror/mpdevil
1
0
Fork 0
mirror of https://github.com/SoongNoonien/mpdevil.git synced 2023-08-10 21:12:44 +03:00
Code Issues Projects Releases Wiki Activity

unified some arguments

Browse Source
This commit is contained in:
Martin Wagner 2021-07-19 22:33:54 +02:00
parent dd04775148
commit a01972691e
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/mpdevil
View File

@ -3756,15 +3756,15 @@ class ConnectionNotify(Gtk.Revealer):
self._client.reconnect() self._client.reconnect()
class MainWindow(Gtk.ApplicationWindow): class MainWindow(Gtk.ApplicationWindow):
def __init__(self, app, client, settings): def __init__(self, client, settings, notify, **kwargs):
super().__init__(title=("mpdevil"), icon_name="org.mpdevil.mpdevil", application=app) super().__init__(title=("mpdevil"), icon_name="org.mpdevil.mpdevil", **kwargs)
self.set_default_icon_name("org.mpdevil.mpdevil") self.set_default_icon_name("org.mpdevil.mpdevil")
self.set_default_size(settings.get_int("width"), settings.get_int("height")) self.set_default_size(settings.get_int("width"), settings.get_int("height"))
if settings.get_boolean("maximize"): if settings.get_boolean("maximize"):
self.maximize() # request maximize self.maximize() # request maximize
self._notify=app.notify
self._client=client self._client=client
self._settings=settings self._settings=settings
self._notify=notify
self._use_csd=self._settings.get_boolean("use-csd") self._use_csd=self._settings.get_boolean("use-csd")
self._size=None # needed for window size saving self._size=None # needed for window size saving
@ -4044,20 +4044,18 @@ class MainWindow(Gtk.ApplicationWindow):
################### ###################
class mpdevil(Gtk.Application): class mpdevil(Gtk.Application):
def __init__(self, *args, **kwargs): def __init__(self):
super().__init__(*args, application_id="org.mpdevil.mpdevil", flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE, **kwargs) super().__init__(application_id="org.mpdevil.mpdevil", flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE)
self.add_main_option("debug",ord("d"),GLib.OptionFlags.NONE,GLib.OptionArg.NONE,_("Debug mode"),None) self.add_main_option("debug", ord("d"), GLib.OptionFlags.NONE, GLib.OptionArg.NONE, _("Debug mode"), None)
self._settings=Settings() self._settings=Settings()
self._client=Client(self._settings) self._client=Client(self._settings)
self._window=None
# notifications
Notify.init("mpdevil") Notify.init("mpdevil")
self.notify=Notify.Notification.new("") self._notify=Notify.Notification.new("")
self._window=None
def do_activate(self): def do_activate(self):
if not self._window: # allow just one instance if not self._window: # allow just one instance
self._window=MainWindow(self, self._client, self._settings) self._window=MainWindow(self._client, self._settings, self._notify, application=self)
self._window.connect("delete-event", self._on_quit) self._window.connect("delete-event", self._on_quit)
self._window.insert_action_group("mpd", MPDActionGroup(self._client)) self._window.insert_action_group("mpd", MPDActionGroup(self._client))
# accelerators # accelerators
@ -4105,7 +4103,7 @@ class mpdevil(Gtk.Application):
def _on_quit(self, *args): def _on_quit(self, *args):
if self._settings.get_boolean("stop-on-quit") and self._client.connected(): if self._settings.get_boolean("stop-on-quit") and self._client.connected():
self._client.stop() self._client.stop()
self.notify.close() self._notify.close()
Notify.uninit() Notify.uninit()
self.quit() self.quit()