tobias/cinnamon-dynamic-wallpaper
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

Bugfixes, Smaller UI for displays with reduced resolution

Browse Source
This commit is contained in:
Tobias Zoghaib
2024-01-23 18:11:13 +01:00
parent f9a84b18e8
commit 8a58e66c20
5 changed files with 331 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@@ -1,4 +1,8 @@
# Version 2.0 (upcoming) # Version 2.1
- Bugfixes
- Smaller UI for displays with reduced resolution (< 1000px height)
# Version 2.0
- New App icon - New App icon
- Preferences window redesign - All settings are now in one window accessable! - Preferences window redesign - All settings are now in one window accessable!
- Graphic visualizing of the time periods of a day with a bar chart - Graphic visualizing of the time periods of a day with a bar chart

26
cinnamon-dynamic-wallpaper@TobiZog/5.4/preferences.glade
View File

@@ -107,8 +107,8 @@
<object class="GtkWindow" id="window_main"> <object class="GtkWindow" id="window_main">
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="window-position">center</property> <property name="window-position">center</property>
<property name="default-width">1024</property> <property name="default-width">800</property>
<property name="default-height">400</property> <property name="default-height">600</property>
<property name="icon">../icon.svg</property> <property name="icon">../icon.svg</property>
<property name="gravity">center</property> <property name="gravity">center</property>
<signal name="destroy" handler="on_destroy" swapped="no"/> <signal name="destroy" handler="on_destroy" swapped="no"/>
@@ -167,7 +167,7 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">4</property> <property name="spacing">4</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage" id="img_tb_image_set">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">applications-graphics</property> <property name="icon-name">applications-graphics</property>
@@ -217,7 +217,7 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">4</property> <property name="spacing">4</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage" id="img_tb_heic_file">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">preferences-desktop-wallpaper</property> <property name="icon-name">preferences-desktop-wallpaper</property>
@@ -267,7 +267,7 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">4</property> <property name="spacing">4</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage" id="img_tb_source_folder">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">folder-open</property> <property name="icon-name">folder-open</property>
@@ -585,7 +585,6 @@
</child> </child>
<child> <child>
<object class="GtkImage" id="img_period_0"> <object class="GtkImage" id="img_period_0">
<property name="width-request">200</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
@@ -598,7 +597,6 @@
</child> </child>
<child> <child>
<object class="GtkImage" id="img_period_2"> <object class="GtkImage" id="img_period_2">
<property name="width-request">200</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
@@ -611,7 +609,6 @@
</child> </child>
<child> <child>
<object class="GtkImage" id="img_period_4"> <object class="GtkImage" id="img_period_4">
<property name="width-request">200</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
@@ -624,7 +621,6 @@
</child> </child>
<child> <child>
<object class="GtkImage" id="img_period_6"> <object class="GtkImage" id="img_period_6">
<property name="width-request">200</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
@@ -637,7 +633,6 @@
</child> </child>
<child> <child>
<object class="GtkImage" id="img_period_8"> <object class="GtkImage" id="img_period_8">
<property name="width-request">200</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
@@ -732,7 +727,6 @@
<property name="column-homogeneous">True</property> <property name="column-homogeneous">True</property>
<child> <child>
<object class="GtkImage" id="img_period_1"> <object class="GtkImage" id="img_period_1">
<property name="width-request">200</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
@@ -745,7 +739,6 @@
</child> </child>
<child> <child>
<object class="GtkImage" id="img_period_9"> <object class="GtkImage" id="img_period_9">
<property name="width-request">200</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
@@ -758,7 +751,6 @@
</child> </child>
<child> <child>
<object class="GtkImage" id="img_period_7"> <object class="GtkImage" id="img_period_7">
<property name="width-request">200</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
@@ -771,7 +763,6 @@
</child> </child>
<child> <child>
<object class="GtkImage" id="img_period_5"> <object class="GtkImage" id="img_period_5">
<property name="width-request">200</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
@@ -784,7 +775,6 @@
</child> </child>
<child> <child>
<object class="GtkImage" id="img_period_3"> <object class="GtkImage" id="img_period_3">
<property name="width-request">200</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
@@ -992,7 +982,7 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">4</property> <property name="spacing">4</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage" id="img_tb_network_location">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">network-wireless</property> <property name="icon-name">network-wireless</property>
@@ -1042,7 +1032,7 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">4</property> <property name="spacing">4</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage" id="img_tb_custom_location">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">preferences-desktop-keyboard</property> <property name="icon-name">preferences-desktop-keyboard</property>
@@ -1094,7 +1084,7 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">4</property> <property name="spacing">4</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage" id="img_tb_time_periods">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">document-open-recent</property> <property name="icon-name">document-open-recent</property>

379
cinnamon-dynamic-wallpaper@TobiZog/5.4/preferences.py
View File

@@ -1,17 +1,18 @@
#!/usr/bin/python3 #!/usr/bin/python3
# Imports ############################################################
# Imports #
############################################################
# Packages
import gi, os, subprocess, time import gi, os, subprocess, time
from datetime import timedelta from datetime import timedelta
from scripts.time_bar_chart import Time_Bar_Chart
from scripts.cinnamon_pref_handler import * # Local scripts
from scripts.suntimes import * from scripts import cinnamon_pref_handler, dialogs, display, images, location, suntimes, time_bar_chart, ui
from scripts.location import * from loop import *
from scripts.images import *
from scripts.dialogs import *
from enums.ImageSourceEnum import ImageSourceEnum from enums.ImageSourceEnum import ImageSourceEnum
from enums.PeriodSourceEnum import PeriodSourceEnum from enums.PeriodSourceEnum import PeriodSourceEnum
from loop import *
gi.require_version("Gtk", "3.0") gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, GdkPixbuf from gi.repository import Gtk, GdkPixbuf
@@ -32,113 +33,24 @@ class Preferences:
def __init__(self) -> None: def __init__(self) -> None:
# Objects from external scripts # Objects from external scripts
self.time_bar_chart = Time_Bar_Chart() self.prefs = cinnamon_pref_handler.Cinnamon_Pref_Handler()
self.prefs = Cinnamon_Pref_Handler() self.dialogs = dialogs.Dialogs()
self.suntimes = Suntimes() self.display = display.Display()
self.images = Images() self.images = images.Images()
self.location = Location() self.location = location.Location()
self.dialogs = Dialogs() self.suntimes = suntimes.Suntimes()
self.time_bar_chart = time_bar_chart.Time_Bar_Chart()
# Glade # Glade
self.builder = Gtk.Builder() self.builder = Gtk.Builder()
self.builder.add_from_file(GLADE_URI) self.builder.add_from_file(GLADE_URI)
self.builder.connect_signals(self) self.builder.connect_signals(self)
########## UI objects ########## self.ui = ui.UI(self.builder)
#### Page 1: Image Configuration
self.tb_image_set: Gtk.ToggleButton = self.builder.get_object("tb_image_set")
self.tb_heic_file: Gtk.ToggleButton = self.builder.get_object("tb_heic_file")
self.tb_source_folder: Gtk.ToggleButton = self.builder.get_object("tb_source_folder")
# Image set
self.lbr_image_set: Gtk.ListBoxRow = self.builder.get_object("lbr_image_set")
self.cb_image_set: Gtk.ComboBox = self.builder.get_object("cb_image_set")
# HEIC file
self.lbr_heic_file: Gtk.ListBoxRow = self.builder.get_object("lbr_heic_file")
# Source folder
self.lbr_source_folder: Gtk.ListBoxRow = self.builder.get_object("lbr_source_folder")
self.btn_source_folder: Gtk.Button = self.builder.get_object("btn_source_folder")
self.lbl_source_folder: Gtk.Label = self.builder.get_object("lbl_source_folder")
# Time bar chart
self.img_bar_images: Gtk.Image = self.builder.get_object("img_bar_images")
self.etr_periods: list[Gtk.Entry] = [
self.builder.get_object("etr_period_1"), self.builder.get_object("etr_period_2"),
self.builder.get_object("etr_period_3"), self.builder.get_object("etr_period_4"),
self.builder.get_object("etr_period_5"), self.builder.get_object("etr_period_6"),
self.builder.get_object("etr_period_7"), self.builder.get_object("etr_period_8"),
self.builder.get_object("etr_period_9"), self.builder.get_object("etr_period_10"),
]
self.img_periods: list[Gtk.Image] = [
self.builder.get_object("img_period_0"), self.builder.get_object("img_period_1"),
self.builder.get_object("img_period_2"), self.builder.get_object("img_period_3"),
self.builder.get_object("img_period_4"), self.builder.get_object("img_period_5"),
self.builder.get_object("img_period_6"), self.builder.get_object("img_period_7"),
self.builder.get_object("img_period_8"), self.builder.get_object("img_period_9"),
]
self.cb_periods: list[Gtk.ComboBox] = [
self.builder.get_object("cb_period_0"), self.builder.get_object("cb_period_1"),
self.builder.get_object("cb_period_2"), self.builder.get_object("cb_period_3"),
self.builder.get_object("cb_period_4"), self.builder.get_object("cb_period_5"),
self.builder.get_object("cb_period_6"), self.builder.get_object("cb_period_7"),
self.builder.get_object("cb_period_8"), self.builder.get_object("cb_period_9"),
]
# Local Config
#### Page 2: Location & Times self.smaller_ui_height = 1000
self.tb_network_location: Gtk.ToggleButton = self.builder.get_object("tb_network_location")
self.lb_current_location: Gtk.Label = self.builder.get_object("lb_current_location")
self.lbr_current_location: Gtk.ListBoxRow = self.builder.get_object("lbr_current_location")
self.tb_custom_location: Gtk.ToggleButton = self.builder.get_object("tb_custom_location")
self.tb_time_periods: Gtk.ToggleButton = self.builder.get_object("tb_time_periods")
self.lbr_network_location: Gtk.ListBoxRow = self.builder.get_object("lbr_network_location")
self.spb_network_location_refresh_time: Gtk.SpinButton = self.builder.get_object("spb_network_location_refresh_time")
self.lbr_custom_location_longitude: Gtk.ListBoxRow = self.builder.get_object("lbr_custom_location_longitude")
self.lbr_custom_location_latitude: Gtk.ListBoxRow = self.builder.get_object("lbr_custom_location_latitude")
self.lbr_time_periods: Gtk.ListBoxRow = self.builder.get_object("lbr_time_periods")
self.etr_longitude: Gtk.Entry = self.builder.get_object("etr_longitude")
self.etr_latitude: Gtk.Entry = self.builder.get_object("etr_latitude")
self.img_bar_times: Gtk.Image = self.builder.get_object("img_bar_times")
self.spb_periods_hour: list[Gtk.SpinButton] = [
self.builder.get_object("spb_period_1_hour"),
self.builder.get_object("spb_period_2_hour"),
self.builder.get_object("spb_period_3_hour"),
self.builder.get_object("spb_period_4_hour"),
self.builder.get_object("spb_period_5_hour"),
self.builder.get_object("spb_period_6_hour"),
self.builder.get_object("spb_period_7_hour"),
self.builder.get_object("spb_period_8_hour"),
self.builder.get_object("spb_period_9_hour"),
]
self.spb_periods_minute: list[Gtk.SpinButton] = [
self.builder.get_object("spb_period_1_minute"),
self.builder.get_object("spb_period_2_minute"),
self.builder.get_object("spb_period_3_minute"),
self.builder.get_object("spb_period_4_minute"),
self.builder.get_object("spb_period_5_minute"),
self.builder.get_object("spb_period_6_minute"),
self.builder.get_object("spb_period_7_minute"),
self.builder.get_object("spb_period_8_minute"),
self.builder.get_object("spb_period_9_minute")
]
self.lb_period_end: list[Gtk.Label] = [
self.builder.get_object("lb_period_0_end"), self.builder.get_object("lb_period_1_end"),
self.builder.get_object("lb_period_2_end"), self.builder.get_object("lb_period_3_end"),
self.builder.get_object("lb_period_4_end"), self.builder.get_object("lb_period_5_end"),
self.builder.get_object("lb_period_6_end"), self.builder.get_object("lb_period_7_end"),
self.builder.get_object("lb_period_8_end"), self.builder.get_object("lb_period_9_end"),
]
# Page 3: Behaviour
self.cb_picture_aspect: Gtk.ComboBox = self.builder.get_object("cb_picture_aspect")
self.sw_dynamic_background_color: Gtk.Switch = self.builder.get_object("sw_dynamic_background_color")
def show(self): def show(self):
@@ -149,26 +61,36 @@ class Preferences:
# Load from preferences # Load from preferences
if self.prefs.image_source == ImageSourceEnum.IMAGESET: if self.prefs.image_source == ImageSourceEnum.IMAGESET:
self.tb_image_set.set_active(True) self.ui.tb_image_set.set_active(True)
elif self.prefs.image_source == ImageSourceEnum.HEICFILE: elif self.prefs.image_source == ImageSourceEnum.HEICFILE:
self.tb_heic_file.set_active(True) self.ui.tb_heic_file.set_active(True)
elif self.prefs.image_source == ImageSourceEnum.SOURCEFOLDER: elif self.prefs.image_source == ImageSourceEnum.SOURCEFOLDER:
self.tb_source_folder.set_active(True) self.ui.tb_source_folder.set_active(True)
# Remove icons in the ToggleButtons if the screen height resolution < 1000 px
if self.display.get_screen_height() < self.smaller_ui_height:
self.ui.img_tb_image_set.clear()
self.ui.img_tb_heic_file.clear()
self.ui.img_tb_source_folder.clear()
self.ui.img_tb_network_location.clear()
self.ui.img_tb_custom_location.clear()
self.ui.img_tb_time_periods.clear()
picture_aspects = ["centered", "scaled", "stretched", "zoom", "spanned"] picture_aspects = ["centered", "scaled", "stretched", "zoom", "spanned"]
self.add_items_to_combo_box(self.cb_picture_aspect, picture_aspects) self.ui.add_items_to_combo_box(self.ui.cb_picture_aspect, picture_aspects)
self.set_active_combobox_item(self.cb_picture_aspect, self.prefs.picture_aspect) self.ui.set_active_combobox_item(self.ui.cb_picture_aspect, self.prefs.picture_aspect)
self.sw_dynamic_background_color.set_active(self.prefs.dynamic_background_color) self.ui.sw_dynamic_background_color.set_active(self.prefs.dynamic_background_color)
if self.prefs.period_source == PeriodSourceEnum.NETWORKLOCATION: if self.prefs.period_source == PeriodSourceEnum.NETWORKLOCATION:
self.tb_network_location.set_active(True) self.ui.tb_network_location.set_active(True)
elif self.prefs.period_source == PeriodSourceEnum.CUSTOMLOCATION: elif self.prefs.period_source == PeriodSourceEnum.CUSTOMLOCATION:
self.tb_custom_location.set_active(True) self.ui.tb_custom_location.set_active(True)
elif self.prefs.period_source == PeriodSourceEnum.CUSTOMTIMEPERIODS: elif self.prefs.period_source == PeriodSourceEnum.CUSTOMTIMEPERIODS:
self.tb_time_periods.set_active(True) self.ui.tb_time_periods.set_active(True)
# Time diagram # Time diagram
@@ -207,7 +129,7 @@ class Preferences:
if self.prefs.period_source == PeriodSourceEnum.NETWORKLOCATION: if self.prefs.period_source == PeriodSourceEnum.NETWORKLOCATION:
self.suntimes.calc_suntimes(float(self.prefs.latitude_auto), float(self.prefs.longitude_auto)) self.suntimes.calc_suntimes(float(self.prefs.latitude_auto), float(self.prefs.longitude_auto))
else: else:
self.suntimes.calc_suntimes(float(self.etr_latitude.get_text()), float(self.etr_longitude.get_text())) self.suntimes.calc_suntimes(float(self.ui.etr_latitude.get_text()), float(self.ui.etr_longitude.get_text()))
# Get all time periods. Store the minutes to the list and print the values to the text views # Get all time periods. Store the minutes to the list and print the values to the text views
@@ -219,22 +141,30 @@ class Preferences:
else: else:
time_range_next = time(hour=23, minute=59) time_range_next = time(hour=23, minute=59)
self.etr_periods[i].set_text( self.ui.etr_periods[i].set_text(
str(time_range_now.hour).rjust(2, '0') + ":" + str(time_range_now.minute).rjust(2, '0') + \ str(time_range_now.hour).rjust(2, '0') + ":" + str(time_range_now.minute).rjust(2, '0') + \
" - " + str(time_range_next.hour).rjust(2, '0') + ":" + str(time_range_next.minute).rjust(2, '0')) " - " + str(time_range_next.hour).rjust(2, '0') + ":" + str(time_range_next.minute).rjust(2, '0'))
time_periods_min.append(time_range_now.hour * 60 + time_range_now.minute) time_periods_min.append(time_range_now.hour * 60 + time_range_now.minute)
# Create time bar # Create time bar
self.time_bar_chart.create_bar_chart_with_polylines(PREFERENCES_URI, 1300, 150, time_periods_min) # Reduce size for small displays
self.time_bar_chart.create_bar_chart(PREFERENCES_URI, 1300, 150, time_periods_min) if self.display.get_screen_height() < self.smaller_ui_height:
bar_width = 1150
bar_height = 110
else:
bar_width = 1300
bar_height = 150
self.time_bar_chart.create_bar_chart_with_polylines(PREFERENCES_URI, bar_width, bar_height, time_periods_min)
self.time_bar_chart.create_bar_chart(PREFERENCES_URI, bar_width, bar_height, time_periods_min)
# Load to the views # Load to the views
pixbuf = GdkPixbuf.Pixbuf.new_from_file(PREFERENCES_URI + "/time_bar_polylines.svg") pixbuf = GdkPixbuf.Pixbuf.new_from_file(PREFERENCES_URI + "/time_bar_polylines.svg")
self.img_bar_images.set_from_pixbuf(pixbuf) self.ui.img_bar_images.set_from_pixbuf(pixbuf)
pixbuf2 = GdkPixbuf.Pixbuf.new_from_file(PREFERENCES_URI + "/time_bar.svg") pixbuf2 = GdkPixbuf.Pixbuf.new_from_file(PREFERENCES_URI + "/time_bar.svg")
self.img_bar_times.set_from_pixbuf(pixbuf2) self.ui.img_bar_times.set_from_pixbuf(pixbuf2)
def load_image_options_to_combo_boxes(self, options: list): def load_image_options_to_combo_boxes(self, options: list):
@@ -245,8 +175,8 @@ class Preferences:
""" """
options.insert(0, "") options.insert(0, "")
for combobox in self.cb_periods: for combobox in self.ui.cb_periods:
self.add_items_to_combo_box(combobox, options) self.ui.add_items_to_combo_box(combobox, options)
def load_image_to_preview(self, image_preview: Gtk.Image, image_src: str): def load_image_to_preview(self, image_preview: Gtk.Image, image_src: str):
@@ -258,6 +188,13 @@ class Preferences:
""" """
try: try:
pixbuf = GdkPixbuf.Pixbuf.new_from_file(image_src) pixbuf = GdkPixbuf.Pixbuf.new_from_file(image_src)
screen_height = self.display.get_screen_height()
# Scaling the images smaller for screens
if screen_height < self.smaller_ui_height:
pixbuf = pixbuf.scale_simple(221, 128, GdkPixbuf.InterpType.BILINEAR)
else:
pixbuf = pixbuf.scale_simple(260, 150, GdkPixbuf.InterpType.BILINEAR) pixbuf = pixbuf.scale_simple(260, 150, GdkPixbuf.InterpType.BILINEAR)
image_preview.set_from_pixbuf(pixbuf) image_preview.set_from_pixbuf(pixbuf)
@@ -265,47 +202,6 @@ class Preferences:
pass pass
############################################################
# UI helper methods #
############################################################
def set_active_combobox_item(self, combobox: Gtk.ComboBoxText, active_item: str):
""" Change active item in combobox by String value
Args:
combobox (Gtk.ComboBoxText): ComboBox to set active
active_item (str): String item to set active
"""
list_store = combobox.get_model()
for i in range(0, len(list_store)):
row = list_store[i]
if row[0] == active_item:
combobox.set_active(i)
def add_items_to_combo_box(self, combobox: Gtk.ComboBox, items: list):
""" Add items to a combo box
Args:
combobox (Gtk.ComboBox): ComboBox where to add the options
items (list): Possible options
"""
model = combobox.get_model()
store = Gtk.ListStore(str)
for image_set in items:
store.append([image_set])
combobox.set_model(store)
if model == None:
renderer_text = Gtk.CellRendererText()
combobox.pack_start(renderer_text, True)
combobox.add_attribute(renderer_text, "text", 0)
############################################################ ############################################################
# Callbacks # # Callbacks #
############################################################ ############################################################
@@ -324,24 +220,30 @@ class Preferences:
""" """
if button.get_active(): if button.get_active():
self.prefs.image_source = ImageSourceEnum.IMAGESET self.prefs.image_source = ImageSourceEnum.IMAGESET
self.tb_heic_file.set_active(False) self.ui.tb_heic_file.set_active(False)
self.tb_source_folder.set_active(False) self.ui.tb_source_folder.set_active(False)
self.lbr_image_set.set_visible(True) self.ui.lbr_image_set.set_visible(True)
self.lbr_heic_file.set_visible(False) self.ui.lbr_heic_file.set_visible(False)
self.lbr_source_folder.set_visible(False) self.ui.lbr_source_folder.set_visible(False)
image_set_choices = ["aurora", "beach", "bitday", "cliffs", "earth", "gradient", "lakeside", "mountains", "sahara"] image_set_choices = [
self.add_items_to_combo_box(self.cb_image_set, image_set_choices) "aurora", "beach",
"bitday", "cliffs",
"earth", "gradient",
"lakeside", "mountains",
"sahara"
]
self.ui.add_items_to_combo_box(self.ui.cb_image_set, image_set_choices)
self.set_active_combobox_item(self.cb_image_set, self.prefs.selected_image_set) self.ui.set_active_combobox_item(self.ui.cb_image_set, self.prefs.selected_image_set)
for i, combobox in enumerate(self.cb_periods): for i, combobox in enumerate(self.ui.cb_periods):
selected_image_name = self.prefs.period_images[i] selected_image_name = self.prefs.period_images[i]
self.set_active_combobox_item(combobox, selected_image_name) self.ui.set_active_combobox_item(combobox, selected_image_name)
# Make the comboboxes invisible # Make the comboboxes invisible
for combobox in self.cb_periods: for combobox in self.ui.cb_periods:
combobox.set_visible(False) combobox.set_visible(False)
@@ -353,15 +255,15 @@ class Preferences:
""" """
if button.get_active(): if button.get_active():
self.prefs.image_source = ImageSourceEnum.HEICFILE self.prefs.image_source = ImageSourceEnum.HEICFILE
self.tb_image_set.set_active(False) self.ui.tb_image_set.set_active(False)
self.tb_source_folder.set_active(False) self.ui.tb_source_folder.set_active(False)
self.lbr_image_set.set_visible(False) self.ui.lbr_image_set.set_visible(False)
self.lbr_heic_file.set_visible(True) self.ui.lbr_heic_file.set_visible(True)
self.lbr_source_folder.set_visible(False) self.ui.lbr_source_folder.set_visible(False)
# Make the comboboxes visible # Make the comboboxes visible
for combobox in self.cb_periods: for combobox in self.ui.cb_periods:
combobox.set_visible(True) combobox.set_visible(True)
# Load images from source folder # Load images from source folder
@@ -372,7 +274,7 @@ class Preferences:
# Load the values for the images from the preferences # Load the values for the images from the preferences
for i in range(0, 10): for i in range(0, 10):
self.set_active_combobox_item(self.cb_periods[i], self.prefs.period_images[i]) self.ui.set_active_combobox_item(self.ui.cb_periods[i], self.prefs.period_images[i])
else: else:
print("No image files!") print("No image files!")
@@ -385,20 +287,20 @@ class Preferences:
""" """
if button.get_active(): if button.get_active():
self.prefs.image_source = ImageSourceEnum.SOURCEFOLDER self.prefs.image_source = ImageSourceEnum.SOURCEFOLDER
self.tb_image_set.set_active(False) self.ui.tb_image_set.set_active(False)
self.tb_heic_file.set_active(False) self.ui.tb_heic_file.set_active(False)
self.lbr_image_set.set_visible(False) self.ui.lbr_image_set.set_visible(False)
self.lbr_heic_file.set_visible(False) self.ui.lbr_heic_file.set_visible(False)
self.lbr_source_folder.set_visible(True) self.ui.lbr_source_folder.set_visible(True)
# Make the comboboxes visible # Make the comboboxes visible
for combobox in self.cb_periods: for combobox in self.ui.cb_periods:
combobox.set_visible(True) combobox.set_visible(True)
# Load the source folder to the view # Load the source folder to the view
# This will update the comboboxes in the preview to contain the right items # This will update the comboboxes in the preview to contain the right items
self.lbl_source_folder.set_label(self.prefs.source_folder) self.ui.lbl_source_folder.set_label(self.prefs.source_folder)
# Load files from saved source folder # Load files from saved source folder
files = self.images.get_images_from_folder(self.prefs.source_folder) files = self.images.get_images_from_folder(self.prefs.source_folder)
@@ -408,7 +310,7 @@ class Preferences:
# Load the values for the images from the preferences # Load the values for the images from the preferences
for i in range(0, 10): for i in range(0, 10):
self.set_active_combobox_item(self.cb_periods[i], self.prefs.period_images[i]) self.ui.set_active_combobox_item(self.ui.cb_periods[i], self.prefs.period_images[i])
else: else:
print("No image files!") print("No image files!")
@@ -446,7 +348,7 @@ class Preferences:
# 2.jpg = Period 2 # 2.jpg = Period 2
# and so on.... # and so on....
for i in range(0, 10): for i in range(0, 10):
self.cb_periods[i].set_active(i + 1) self.ui.cb_periods[i].set_active(i + 1)
# +----------------------------------------------+ # +----------------------------------------------+
@@ -497,15 +399,14 @@ class Preferences:
self.prefs.source_folder = folder + "/" self.prefs.source_folder = folder + "/"
# Update the label # Update the label
self.lbl_source_folder.set_label(folder) self.ui.lbl_source_folder.set_label(folder)
# Update the image comboboxes # Update the image comboboxes
self.load_image_options_to_combo_boxes(files) self.load_image_options_to_combo_boxes(files)
# Load the values for the images from the preferences # Load the values for the images from the preferences
for i in range(0, 10): for i in range(0, 10):
self.cb_periods[i].set_active(0) self.ui.cb_periods[i].set_active(0)
#self.set_active_combobox_item(self.cb_periods[i], "") #self.prefs.period_images[i])
if len(files) == 1: if len(files) == 1:
self.dialogs.message_dialog("No image files found!") self.dialogs.message_dialog("No image files found!")
@@ -533,29 +434,34 @@ class Preferences:
# Build up image path # Build up image path
image_path = self.prefs.source_folder + image_file_name image_path = self.prefs.source_folder + image_file_name
self.load_image_to_preview(self.img_periods[period_index], image_path) self.load_image_to_preview(self.ui.img_periods[period_index], image_path)
## Location & Times ## Location & Times
def on_toggle_button_network_location_clicked(self, button: Gtk.Button): def on_toggle_button_network_location_clicked(self, button: Gtk.ToggleButton):
""" User clicks on the ToggleButton for the network location
Args:
button (Gtk.ToggleButton): Clicked ToggleButton
"""
if button.get_active(): if button.get_active():
self.prefs.period_source = PeriodSourceEnum.NETWORKLOCATION self.prefs.period_source = PeriodSourceEnum.NETWORKLOCATION
self.tb_custom_location.set_active(False) self.ui.tb_custom_location.set_active(False)
self.tb_time_periods.set_active(False) self.ui.tb_time_periods.set_active(False)
self.lbr_network_location.set_visible(True) self.ui.lbr_network_location.set_visible(True)
self.lbr_current_location.set_visible(True) self.ui.lbr_current_location.set_visible(True)
self.lbr_custom_location_longitude.set_visible(False) self.ui.lbr_custom_location_longitude.set_visible(False)
self.lbr_custom_location_latitude.set_visible(False) self.ui.lbr_custom_location_latitude.set_visible(False)
self.lbr_time_periods.set_visible(False) self.ui.lbr_time_periods.set_visible(False)
self.spb_network_location_refresh_time.set_value(self.prefs.location_refresh_intervals) self.ui.spb_network_location_refresh_time.set_value(self.prefs.location_refresh_intervals)
# Display the location in the UI # Display the location in the UI
current_location = self.location.get_location() current_location = self.location.get_location()
self.lb_current_location.set_text("Latitude: " + current_location["latitude"] + \ self.ui.lb_current_location.set_text("Latitude: " + current_location["latitude"] + \
", Longitude: " + current_location["longitude"]) ", Longitude: " + current_location["longitude"])
# Store the location to the preferences # Store the location to the preferences
@@ -565,41 +471,41 @@ class Preferences:
self.refresh_chart() self.refresh_chart()
def on_toggle_button_custom_location_clicked(self, button: Gtk.Button): def on_toggle_button_custom_location_clicked(self, button: Gtk.ToggleButton):
if button.get_active(): if button.get_active():
self.prefs.period_source = PeriodSourceEnum.CUSTOMLOCATION self.prefs.period_source = PeriodSourceEnum.CUSTOMLOCATION
self.tb_network_location.set_active(False) self.ui.tb_network_location.set_active(False)
self.tb_time_periods.set_active(False) self.ui.tb_time_periods.set_active(False)
self.lbr_network_location.set_visible(False) self.ui.lbr_network_location.set_visible(False)
self.lbr_current_location.set_visible(False) self.ui.lbr_current_location.set_visible(False)
self.lbr_custom_location_longitude.set_visible(True) self.ui.lbr_custom_location_longitude.set_visible(True)
self.lbr_custom_location_latitude.set_visible(True) self.ui.lbr_custom_location_latitude.set_visible(True)
self.lbr_time_periods.set_visible(False) self.ui.lbr_time_periods.set_visible(False)
self.etr_latitude.set_text(str(self.prefs.latitude_custom)) self.ui.etr_latitude.set_text(str(self.prefs.latitude_custom))
self.etr_longitude.set_text(str(self.prefs.longitude_custom)) self.ui.etr_longitude.set_text(str(self.prefs.longitude_custom))
def on_toggle_button_time_periods_clicked(self, button: Gtk.Button): def on_toggle_button_time_periods_clicked(self, button: Gtk.ToggleButton):
if button.get_active(): if button.get_active():
self.prefs.period_source = PeriodSourceEnum.CUSTOMTIMEPERIODS self.prefs.period_source = PeriodSourceEnum.CUSTOMTIMEPERIODS
self.tb_network_location.set_active(False) self.ui.tb_network_location.set_active(False)
self.tb_custom_location.set_active(False) self.ui.tb_custom_location.set_active(False)
self.lbr_network_location.set_visible(False) self.ui.lbr_network_location.set_visible(False)
self.lbr_current_location.set_visible(False) self.ui.lbr_current_location.set_visible(False)
self.lbr_custom_location_longitude.set_visible(False) self.ui.lbr_custom_location_longitude.set_visible(False)
self.lbr_custom_location_latitude.set_visible(False) self.ui.lbr_custom_location_latitude.set_visible(False)
self.lbr_time_periods.set_visible(True) self.ui.lbr_time_periods.set_visible(True)
for i in range(0, 9): for i in range(0, 9):
pref_value = self.prefs.period_custom_start_time[i + 1] pref_value = self.prefs.period_custom_start_time[i + 1]
time_parts = [int(pref_value[0:pref_value.find(":")]), int(pref_value[pref_value.find(":") + 1:])] time_parts = [int(pref_value[0:pref_value.find(":")]), int(pref_value[pref_value.find(":") + 1:])]
self.spb_periods_hour[i].set_value(time_parts[0]) self.ui.spb_periods_hour[i].set_value(time_parts[0])
self.spb_periods_minute[i].set_value(time_parts[1]) self.ui.spb_periods_minute[i].set_value(time_parts[1])
@@ -619,14 +525,14 @@ class Preferences:
index = int(spin_button_name[11:12]) - 1 index = int(spin_button_name[11:12]) - 1
# Determe time string and store to prefs # Determe time string and store to prefs
time_current_start = datetime(2024,1,1, int(self.spb_periods_hour[index].get_value()), int(self.spb_periods_minute[index].get_value())) time_current_start = datetime(2024,1,1, int(self.ui.spb_periods_hour[index].get_value()), int(self.ui.spb_periods_minute[index].get_value()))
time_current_start_str = str(time_current_start.hour).rjust(2, '0') + ":" + str(time_current_start.minute).rjust(2, '0') time_current_start_str = str(time_current_start.hour).rjust(2, '0') + ":" + str(time_current_start.minute).rjust(2, '0')
self.prefs.period_custom_start_time[index + 1] = time_current_start_str self.prefs.period_custom_start_time[index + 1] = time_current_start_str
time_previous_end = time_current_start - timedelta(minutes=1) time_previous_end = time_current_start - timedelta(minutes=1)
self.lb_period_end[index].set_text(str(time_previous_end.hour).rjust(2, '0') + ":" + str(time_previous_end.minute).rjust(2, '0')) self.ui.lb_period_end[index].set_text(str(time_previous_end.hour).rjust(2, '0') + ":" + str(time_previous_end.minute).rjust(2, '0'))
self.refresh_chart() self.refresh_chart()
@@ -641,7 +547,12 @@ class Preferences:
self.prefs.location_refresh_intervals = spin_button.get_value() self.prefs.location_refresh_intervals = spin_button.get_value()
def on_etr_longitude_changed(self, entry): def on_etr_longitude_changed(self, entry: Gtk.Entry):
""" User changes the value of the longitude Entry
Args:
entry (Gtk.Entry): The manipulated Entry object
"""
try: try:
self.prefs.longitude_custom = float(entry.get_text()) self.prefs.longitude_custom = float(entry.get_text())
self.refresh_chart() self.refresh_chart()
@@ -649,7 +560,12 @@ class Preferences:
pass pass
def on_etr_latitude_changed(self, entry): def on_etr_latitude_changed(self, entry: Gtk.Entry):
""" User changes the value of the latitude Entry
Args:
entry (Gtk.Entry): The manipulated Entry object
"""
try: try:
self.prefs.latitude_custom = float(entry.get_text()) self.prefs.latitude_custom = float(entry.get_text())
self.refresh_chart() self.refresh_chart()
@@ -702,7 +618,10 @@ class Preferences:
def on_ok(self, *args): def on_ok(self, *args):
""" Callback for the OK button in the top bar """ Callback for the OK button in the top bar
""" """
try:
self.on_apply() self.on_apply()
except:
pass
# Close the window # Close the window
self.on_destroy() self.on_destroy()

20
cinnamon-dynamic-wallpaper@TobiZog/5.4/scripts/display.py Normal file
View File

@@ -0,0 +1,20 @@
import gi
gi.require_version("Gtk", "3.0")
from gi.repository import Gdk
class Display:
""" Handling display informations and actions
"""
def __init__(self) -> None:
self.display = Gdk.Display.get_default()
def get_screen_height(self) -> int:
""" Estimate the height resolution of the primary display
Returns:
int: Height in pixel
"""
geometry = self.display.get_monitor(0).get_geometry()
return geometry.height

147
cinnamon-dynamic-wallpaper@TobiZog/5.4/scripts/ui.py Normal file
View File

@@ -0,0 +1,147 @@
import gi
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk
class UI:
""" Class to handle UI components and actions
"""
def __init__(self, builder: Gtk.Builder) -> None:
# Page 1
self.tb_image_set: Gtk.ToggleButton = builder.get_object("tb_image_set")
self.tb_heic_file: Gtk.ToggleButton = builder.get_object("tb_heic_file")
self.tb_source_folder: Gtk.ToggleButton = builder.get_object("tb_source_folder")
self.img_tb_image_set: Gtk.Image = builder.get_object("img_tb_image_set")
self.img_tb_heic_file: Gtk.Image = builder.get_object("img_tb_heic_file")
self.img_tb_source_folder: Gtk.Image = builder.get_object("img_tb_source_folder")
# Image set
self.lbr_image_set: Gtk.ListBoxRow = builder.get_object("lbr_image_set")
self.cb_image_set: Gtk.ComboBox = builder.get_object("cb_image_set")
# HEIC file
self.lbr_heic_file: Gtk.ListBoxRow = builder.get_object("lbr_heic_file")
# Source folder
self.lbr_source_folder: Gtk.ListBoxRow = builder.get_object("lbr_source_folder")
self.btn_source_folder: Gtk.Button = builder.get_object("btn_source_folder")
self.lbl_source_folder: Gtk.Label = builder.get_object("lbl_source_folder")
# Time bar chart
self.img_bar_images: Gtk.Image = builder.get_object("img_bar_images")
self.etr_periods: list[Gtk.Entry] = [
builder.get_object("etr_period_1"), builder.get_object("etr_period_2"),
builder.get_object("etr_period_3"), builder.get_object("etr_period_4"),
builder.get_object("etr_period_5"), builder.get_object("etr_period_6"),
builder.get_object("etr_period_7"), builder.get_object("etr_period_8"),
builder.get_object("etr_period_9"), builder.get_object("etr_period_10"),
]
self.img_periods: list[Gtk.Image] = [
builder.get_object("img_period_0"), builder.get_object("img_period_1"),
builder.get_object("img_period_2"), builder.get_object("img_period_3"),
builder.get_object("img_period_4"), builder.get_object("img_period_5"),
builder.get_object("img_period_6"), builder.get_object("img_period_7"),
builder.get_object("img_period_8"), builder.get_object("img_period_9"),
]
self.cb_periods: list[Gtk.ComboBox] = [
builder.get_object("cb_period_0"), builder.get_object("cb_period_1"),
builder.get_object("cb_period_2"), builder.get_object("cb_period_3"),
builder.get_object("cb_period_4"), builder.get_object("cb_period_5"),
builder.get_object("cb_period_6"), builder.get_object("cb_period_7"),
builder.get_object("cb_period_8"), builder.get_object("cb_period_9"),
]
#### Page 2: Location & Times
self.tb_network_location: Gtk.ToggleButton = builder.get_object("tb_network_location")
self.tb_custom_location: Gtk.ToggleButton = builder.get_object("tb_custom_location")
self.tb_time_periods: Gtk.ToggleButton = builder.get_object("tb_time_periods")
self.img_tb_network_location: Gtk.Image = builder.get_object("img_tb_network_location")
self.img_tb_custom_location: Gtk.Image = builder.get_object("img_tb_custom_location")
self.img_tb_time_periods: Gtk.Image = builder.get_object("img_tb_time_periods")
# Network Location
self.lb_current_location: Gtk.Label = builder.get_object("lb_current_location")
self.lbr_current_location: Gtk.ListBoxRow = builder.get_object("lbr_current_location")
self.lbr_network_location: Gtk.ListBoxRow = builder.get_object("lbr_network_location")
self.spb_network_location_refresh_time: Gtk.SpinButton = builder.get_object("spb_network_location_refresh_time")
# Custom location
self.lbr_custom_location_longitude: Gtk.ListBoxRow = builder.get_object("lbr_custom_location_longitude")
self.lbr_custom_location_latitude: Gtk.ListBoxRow = builder.get_object("lbr_custom_location_latitude")
self.lbr_time_periods: Gtk.ListBoxRow = builder.get_object("lbr_time_periods")
self.etr_longitude: Gtk.Entry = builder.get_object("etr_longitude")
self.etr_latitude: Gtk.Entry = builder.get_object("etr_latitude")
self.img_bar_times: Gtk.Image = builder.get_object("img_bar_times")
self.spb_periods_hour: list[Gtk.SpinButton] = [
builder.get_object("spb_period_1_hour"),
builder.get_object("spb_period_2_hour"),
builder.get_object("spb_period_3_hour"),
builder.get_object("spb_period_4_hour"),
builder.get_object("spb_period_5_hour"),
builder.get_object("spb_period_6_hour"),
builder.get_object("spb_period_7_hour"),
builder.get_object("spb_period_8_hour"),
builder.get_object("spb_period_9_hour"),
]
self.spb_periods_minute: list[Gtk.SpinButton] = [
builder.get_object("spb_period_1_minute"),
builder.get_object("spb_period_2_minute"),
builder.get_object("spb_period_3_minute"),
builder.get_object("spb_period_4_minute"),
builder.get_object("spb_period_5_minute"),
builder.get_object("spb_period_6_minute"),
builder.get_object("spb_period_7_minute"),
builder.get_object("spb_period_8_minute"),
builder.get_object("spb_period_9_minute")
]
self.lb_period_end: list[Gtk.Label] = [
builder.get_object("lb_period_0_end"), builder.get_object("lb_period_1_end"),
builder.get_object("lb_period_2_end"), builder.get_object("lb_period_3_end"),
builder.get_object("lb_period_4_end"), builder.get_object("lb_period_5_end"),
builder.get_object("lb_period_6_end"), builder.get_object("lb_period_7_end"),
builder.get_object("lb_period_8_end"), builder.get_object("lb_period_9_end"),
]
# Page 3: Behaviour
self.cb_picture_aspect: Gtk.ComboBox = builder.get_object("cb_picture_aspect")
self.sw_dynamic_background_color: Gtk.Switch = builder.get_object("sw_dynamic_background_color")
def set_active_combobox_item(self, combobox: Gtk.ComboBoxText, active_item: str):
""" Change active item in combobox by String value
Args:
combobox (Gtk.ComboBoxText): ComboBox to set active
active_item (str): String item to set active
"""
list_store = combobox.get_model()
for i in range(0, len(list_store)):
row = list_store[i]
if row[0] == active_item:
combobox.set_active(i)
def add_items_to_combo_box(self, combobox: Gtk.ComboBox, items: list):
""" Add items to a combo box
Args:
combobox (Gtk.ComboBox): ComboBox where to add the options
items (list): Possible options
"""
model = combobox.get_model()
store = Gtk.ListStore(str)
for image_set in items:
store.append([image_set])
combobox.set_model(store)
if model == None:
renderer_text = Gtk.CellRendererText()
combobox.pack_start(renderer_text, True)
combobox.add_attribute(renderer_text, "text", 0)