fix deprecations

slgobinath · Jan 2, 2024 · f53d86c · f53d86c
1 parent 3e89aa4
commit f53d86c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/safeeyes/plugins/trayicon/plugin.py b/safeeyes/plugins/trayicon/plugin.py
@@ -76,10 +76,10 @@ def __init__(self, context, plugin_config):
         self.menu = Gtk.Menu()
 
         # Next break info menu item
-        self.item_info = Gtk.ImageMenuItem()
-        img_timer = Gtk.Image()
-        img_timer.set_from_icon_name("io.github.slgobinath.SafeEyes-timer", 16)
-        self.item_info.set_image(img_timer)
+        self.item_info = Gtk.MenuItem()
+        #img_timer = Gtk.Image()
+        #img_timer.set_from_icon_name("io.github.slgobinath.SafeEyes-timer", 16)
+        #self.item_info.set_image(img_timer)
 
         self.item_separator = Gtk.SeparatorMenuItem()
 
@@ -207,18 +207,18 @@ def set_labels(self):
             if self.active:
                 if self.date_time:
                     self.__set_next_break_info()
-                self.indicator.set_icon("io.github.slgobinath.SafeEyes-enabled")
+                self.indicator.set_icon_full("io.github.slgobinath.SafeEyes-enabled", "Running timer")
             else:
                 if self.wakeup_time:
                     self.item_info.set_label(_('Disabled until %s') % utility.format_time(self.wakeup_time))
                 else:
                     self.item_info.set_label(_('Disabled until restart'))
                 self.indicator.set_label('', '')
-                self.indicator.set_icon("io.github.slgobinath.SafeEyes-disabled")
+                self.indicator.set_icon_full("io.github.slgobinath.SafeEyes-disabled", "Paused timer")
         else:
             self.item_info.set_label(_('No breaks available'))
             self.indicator.set_label('', '')
-            self.indicator.set_icon("io.github.slgobinath.SafeEyes-disabled")
+            self.indicator.set_icon_full("io.github.slgobinath.SafeEyes-disabled", "Paused timer")
         self.item_info.set_sensitive(breaks_found and self.active)
         self.item_enable.set_sensitive(breaks_found and not self.active)
         self.item_disable.set_sensitive(breaks_found and self.active)
@@ -373,7 +373,7 @@ def disable_ui(self):
         if self.active:
             logging.info('Disable Safe Eyes')
             self.active = False
-            self.indicator.set_icon("io.github.slgobinath.SafeEyes-disabled")
+            self.indicator.set_icon_full("io.github.slgobinath.SafeEyes-disabled", "Paused timer")
             self.item_info.set_label(_('Disabled until restart'))
             self.indicator.set_label('', '')
             self.item_info.set_sensitive(False)
@@ -388,7 +388,7 @@ def enable_ui(self):
         if not self.active:
             logging.info('Enable Safe Eyes')
             self.active = True
-            self.indicator.set_icon("io.github.slgobinath.SafeEyes-enabled")
+            self.indicator.set_icon_full("io.github.slgobinath.SafeEyes-enabled", "Running timer")
             self.item_info.set_sensitive(True)
             self.item_enable.set_sensitive(False)
             self.item_disable.set_sensitive(True)
@@ -409,9 +409,9 @@ def __schedule_resume(self, time_minutes):
     def start_animation(self):
         if not self.active or not self.animate:
             return
-        utility.execute_main_thread(lambda: self.indicator.set_icon("io.github.slgobinath.SafeEyes-disabled"))
+        utility.execute_main_thread(lambda: self.indicator.set_icon_full("io.github.slgobinath.SafeEyes-disabled", "Paused timer"))
         time.sleep(0.5)
-        utility.execute_main_thread(lambda: self.indicator.set_icon("io.github.slgobinath.SafeEyes-enabled"))
+        utility.execute_main_thread(lambda: self.indicator.set_icon_full("io.github.slgobinath.SafeEyes-enabled", "Running timer"))
         if self.animate and self.active:
             time.sleep(0.5)
             if self.animate and self.active:
@@ -420,9 +420,9 @@ def start_animation(self):
     def stop_animation(self):
         self.animate = False
         if self.active:
-            utility.execute_main_thread(lambda: self.indicator.set_icon("io.github.slgobinath.SafeEyes-enabled"))
+            utility.execute_main_thread(lambda: self.indicator.set_icon_full("io.github.slgobinath.SafeEyes-enabled", "Running timer"))
         else:
-            utility.execute_main_thread(lambda: self.indicator.set_icon("io.github.slgobinath.SafeEyes-disabled"))
+            utility.execute_main_thread(lambda: self.indicator.set_icon_full("io.github.slgobinath.SafeEyes-disabled", "Paused timer"))
 
 def init(ctx, safeeyes_cfg, plugin_config):
     """

diff --git a/safeeyes/ui/break_screen.py b/safeeyes/ui/break_screen.py
@@ -151,12 +151,14 @@ def __show_break_screen(self, message, image_path, widget, tray_actions):
         # Lock the keyboard
         utility.start_thread(self.__lock_keyboard)
 
-        screen = Gtk.Window().get_screen()
-        no_of_monitors = screen.get_n_monitors()
+        display = Gdk.Display.get_default()
+        screen = display.get_default_screen()
+        no_of_monitors = display.get_n_monitors()
         logging.info("Show break screens in %d display(s)", no_of_monitors)
 
-        for monitor in range(no_of_monitors):
-            monitor_gemoetry = screen.get_monitor_geometry(monitor)
+        for monitor_num in range(no_of_monitors):
+            monitor = display.get_monitor(monitor_num)
+            monitor_gemoetry = monitor.get_geometry()
             x = monitor_gemoetry.x
             y = monitor_gemoetry.y
 
@@ -165,7 +167,7 @@ def __show_break_screen(self, message, image_path, widget, tray_actions):
             builder.connect_signals(self)
 
             window = builder.get_object("window_main")
-            window.set_title("SafeEyes-" + str(monitor))
+            window.set_title("SafeEyes-" + str(monitor_num))
             lbl_message = builder.get_object("lbl_message")
             lbl_count = builder.get_object("lbl_count")
             lbl_widget = builder.get_object("lbl_widget")
@@ -188,15 +190,15 @@ def __show_break_screen(self, message, image_path, widget, tray_actions):
             # Add the buttons
             if self.enable_postpone:
                 # Add postpone button
-                btn_postpone = Gtk.Button(_('Postpone'))
+                btn_postpone = Gtk.Button.new_with_label(_('Postpone'))
                 btn_postpone.get_style_context().add_class('btn_postpone')
                 btn_postpone.connect('clicked', self.on_postpone_clicked)
                 btn_postpone.set_visible(True)
                 box_buttons.pack_start(btn_postpone, True, True, 0)
 
             if not self.strict_break:
                 # Add the skip button
-                btn_skip = Gtk.Button(_('Skip'))
+                btn_skip = Gtk.Button.new_with_label(_('Skip'))
                 btn_skip.get_style_context().add_class('btn_skip')
                 btn_skip.connect('clicked', self.on_skip_clicked)
                 btn_skip.set_visible(True)
@@ -222,7 +224,7 @@ def __show_break_screen(self, message, image_path, widget, tray_actions):
             window.resize(monitor_gemoetry.width, monitor_gemoetry.height)
             window.stick()
             window.set_keep_above(True)
-            window.fullscreen()
+            window.fullscreen_on_monitor(screen, monitor_num)
             window.present()
             # In other desktop environments, move the window after present
             window.move(x, y)