Separate options for plank themes (#45)

Author: hsbasu

src/ThemeManager/DesktopTheme.py

@@ -55,11 +55,12 @@ def set_desktop_theme(self, state, nexttheme):
 			if self.manager.cursor_theme:
 				os.system("gsettings set org.cinnamon.desktop.interface cursor-theme %s" % nexttheme[7])
 
-			# plank theme
-			try:
-				os.system("gsettings set net.launchpad.plank.dock.settings theme %s" % nexttheme[3])
-			except:
-				module_logger.error("Either 'plank' is not installed or the plank theme is not present.")
+			# Plank theme
+			if self.manager.plank_theme:
+				try:
+					os.system("gsettings set net.launchpad.plank.dock.settings theme %s" % nexttheme[8])
+				except:
+					module_logger.error("Either 'plank' is not installed or the plank theme is not present.")
 
 		elif (thisDE == "gnome" or thisDE == "ubuntu:gnome" or thisDE == "unity"):
 			# When the DE is gnome set
@@ -76,11 +77,12 @@ def set_desktop_theme(self, state, nexttheme):
 			if self.manager.cursor_theme:
 				os.system("gsettings set org.gnome.desktop.interface cursor-theme %s" % nexttheme[7])
 
-			# plank theme
-			try:
-				os.system("gsettings set net.launchpad.plank.dock.settings theme %s" % nexttheme[3])
-			except:
-				module_logger.error("Either 'plank' is not installed or the plank theme is not present.")
+			# Plank theme
+			if self.manager.plank_theme:
+				try:
+					os.system("gsettings set net.launchpad.plank.dock.settings theme %s" % nexttheme[8])
+				except:
+					module_logger.error("Either 'plank' is not installed or the plank theme is not present.")
 
 		elif (thisDE == "mate"):
 			# When the DE is mate set
@@ -95,18 +97,20 @@ def set_desktop_theme(self, state, nexttheme):
 			if self.manager.cursor_theme:
 				os.system("gsettings set org.mate.peripherals-mouse cursor-theme %s" % nexttheme[7])
 
-			# plank theme
-			try:
-				os.system("gsettings set net.launchpad.plank.dock.settings theme %s" % nexttheme[3])
-			except:
-				module_logger.error("Either 'plank' is not installed or the plank theme is not present")
+			# Plank theme
+			if self.manager.plank_theme:
+				try:
+					os.system("gsettings set net.launchpad.plank.dock.settings theme %s" % nexttheme[8])
+				except:
+					module_logger.error("Either 'plank' is not installed or the plank theme is not present")
 
 		themes = {}
 		themes["System"] = nexttheme[4]
 		themes["DE Theme"] = nexttheme[3]
 		themes["Decoration"] = nexttheme[5]
 		themes["Icon"] = nexttheme[6]
 		themes["Cursor"] = nexttheme[7]
+		themes["Plank"] = nexttheme[8]
 		module_logger.info("Updated with Colour Variant: %s, Themes: %s" % (nexttheme[1], themes))
 
 	def get_desktop_theme(self, state, systheme, colvariants):
@@ -126,6 +130,9 @@ def get_desktop_theme(self, state, systheme, colvariants):
 			themes["Icon"] = self.run_command("gsettings get org.cinnamon.desktop.interface icon-theme")
 			# Cursor theme
 			themes["Cursor"] = self.run_command("gsettings get org.cinnamon.desktop.interface cursor-theme")
+			# Plank theme
+			if self.manager.plank_theme:
+				themes["Plank"] = self.run_command("gsettings get net.launchpad.plank.dock.settings theme")
 
 		elif (thisDE == "gnome" or thisDE == "ubuntu:gnome" or thisDE == "unity"):
 			# When the DE is gnome/unity get
@@ -137,6 +144,9 @@ def get_desktop_theme(self, state, systheme, colvariants):
 			themes["Icon"] = self.run_command("gsettings get org.gnome.desktop.interface icon-theme")
 			# Cursor theme
 			themes["Cursor"] = self.run_command("gsettings get org.gnome.desktop.interface cursor-theme")
+			# Plank theme
+			if self.manager.plank_theme:
+				themes["Plank"] = self.run_command("gsettings get net.launchpad.plank.dock.settings theme")
 
 		elif (thisDE == "mate"):
 			# When the DE is mate get
@@ -148,6 +158,9 @@ def get_desktop_theme(self, state, systheme, colvariants):
 			currenttheme.append(self.run_command("gsettings get org.mate.interface icon-theme"))
 			# Cursor theme
 			currenttheme.append(self.run_command("gsettings get org.mate.peripherals-mouse cursor-theme"))
+			# Plank theme
+			if self.manager.plank_theme:
+				themes["Plank"] = self.run_command("gsettings get net.launchpad.plank.dock.settings theme")
 
 		currenttheme["Themes"] = themes
 

src/ThemeManager/common.py

@@ -156,6 +156,20 @@ def load_config(self):
 				self.cursor_colvariants.append(var.strip().strip('"').strip("'"))
 			self.cursor_colorvariants = self.cursor_colorvariants.strip(",")	# removes the last comma, it looks ugly with the comma
 
+			# Plank Theme
+			self.plank_theme = self.config["system-theme"].getboolean('plank-theme')
+			self.plankthemename = self.config["system-theme"]['plank-theme-name']
+			self.plank_darkmode_suffix = self.config["system-theme"]['plank-dark-mode-suffix']
+			self.plank_theme_name_style = int(self.config["system-theme"]['plank-theme-style-name'])
+			
+			colvars = self.config["system-theme"]['plank-color-variants'].split(',')
+			self.plank_colorvariants = ""		# This string will be saved in config file
+			self.plank_colvariants = []		# This list will be used to randomize variants
+			for var in colvars:
+				self.plank_colorvariants += str(var+",")
+				self.plank_colvariants.append(var.strip().strip('"').strip("'"))
+			self.plank_colorvariants = self.plank_colorvariants.strip(",")	# removes the last comma, it looks ugly with the comma
+			
 			theme_interval = self.config["system-theme"]['theme-interval']
 			self.theme_interval_HH = int(theme_interval.split(':')[0])
 			self.theme_interval_MM = int(theme_interval.split(':')[1])
@@ -182,6 +196,13 @@ def load_config(self):
 			self.cursor_colvariants = []
 			self.cursor_colorvariants = ""
 
+			self.plank_theme = False
+			self.plankthemename = ""
+			self.plank_darkmode_suffix = "Dark"
+			self.plank_colvariants = []
+			self.plank_colorvariants = ""
+			self.plank_theme_name_style = 0
+			
 			self.theme_interval_HH = 1
 			self.theme_interval_MM = 0
 			self.theme_interval_SS = 0
@@ -206,6 +227,11 @@ def save_config(self):
 				'cursor-theme': False,
 				'cursor-theme-name': "",
 				'cursor-color-variants': "",
+				'plank-theme': False,
+				'plank-theme-name': "",
+				'plank-color-variants': "",
+				'plank-dark-mode-suffix': "Dark",
+				'plank-theme-style-name': 0,
 				'theme-interval': '1:0:0'
 			}
 			with open(CONFIG_FILE, 'w') as f:
@@ -239,6 +265,9 @@ def prep_theme_variants(self, state, theme_styles):
 		if self.cursor_theme:
 			cursrtheme = self.prep_cursor_theme(currentcolor)
 
+		if self.plank_theme:
+			planktheme = self.prep_plank_theme(currentstate, currentcolor)
+		
 		if currentstate == "daytime":
 			wmtheme = self.systemthemename
 			if len(currentcolor) != 0:
@@ -280,13 +309,14 @@ def prep_theme_variants(self, state, theme_styles):
 				else:
 					gtktheme = self.systemthemename+"-"+self.darkmode_suffix
 
-		nxt_theme = [timestamp, currentcolor, stateflag, shelltheme, gtktheme, wmtheme, icontheme, cursrtheme]
+		nxt_theme = [timestamp, currentcolor, stateflag, shelltheme, gtktheme, wmtheme, icontheme, cursrtheme, planktheme]
 		themes = {}
 		themes["System"] = gtktheme
 		themes["DE Theme"] = shelltheme
 		themes["Decoration"] = wmtheme
 		themes["Icon"] = icontheme
 		themes["Cursor"] = cursrtheme
+		themes["Plank"] = planktheme
 		module_logger.debug("Next Colour Variant: %s, Next Themes: %s" % (nxt_theme[1], themes))
 
 		return nxt_theme
@@ -340,6 +370,32 @@ def prep_cursor_theme(self, currentcolor):
 
 		module_logger.debug("Cursor Theme: %s, Colour Variant: %s" % (cursrtheme, cursrcolor))
 		return cursrtheme
+		
+	def prep_plank_theme(self, currentstate, currentcolor):
+		for color in self.plank_colvariants:
+			if currentcolor.lower() in color.lower():
+				plankcolor = color
+				break
+		else:
+			plankcolor = random.choice(self.plank_colvariants)
+		module_logger.debug("Plank Colour Variant: %s", plankcolor)
+		if currentstate == "night":
+			if len(plankcolor) != 0:
+				if theme_styles[self.plank_theme_name_style] == theme_styles[0]:
+					planktheme = self.plankthemename+"-"+self.plank_darkmode_suffix+"-"+plankcolor
+				else:
+					planktheme = self.plankthemename+"-"+plankcolor+"-"+self.plank_darkmode_suffix
+			else:
+				planktheme = self.plankthemename+"-"+self.plank_darkmode_suffix
+		else:
+			# for daytime and transition
+			if len(plankcolor) != 0:
+				planktheme = self.plankthemename+"-"+plankcolor
+			else:
+				planktheme = self.plankthemename
+		
+		module_logger.debug("Plank Theme: %s, Colour Variant: %s" % (planktheme, plankcolor))
+		return planktheme
 
 if __name__ == "__main__":
 	pass

src/ThemeManager/gui.py

@@ -100,6 +100,11 @@ def __init__(self, application):
 		self.icon_colour_variants = self.builder.get_object("icon_colour_variants")
 		self.icon_darkmode_name = self.builder.get_object("icon_dark_mode_name")
 
+		self.plank_settings = self.builder.get_object("plank_settings")
+		self.plank_theme_name = self.builder.get_object("plank_theme_name")
+		self.plank_colour_variants = self.builder.get_object("plank_colour_variants")
+		self.plank_darkmode_name = self.builder.get_object("plank_dark_mode_name")
+		
 		self.cursor_settings = self.builder.get_object("cursor_settings")
 		self.cursor_theme_name = self.builder.get_object("cursor_theme_name")
 		self.cursor_colour_variants = self.builder.get_object("cursor_colour_variants")
@@ -111,6 +116,7 @@ def __init__(self, application):
 		# Buttons
 		self.icon_switch = self.builder.get_object("icon_switch")
 		self.cursor_switch = self.builder.get_object("cursor_switch")
+		self.plank_switch = self.builder.get_object("plank_switch")
 		self.darkermode_switch = self.builder.get_object("darker_switch")
 		self.randomize_button = self.builder.get_object("randomize_theme_button")
 		self.save_button = self.builder.get_object("save_button")
@@ -132,6 +138,12 @@ def __init__(self, application):
 		self.icon_theme_name_style_combo.add_attribute(renderer, "text", 0)
 		self.icon_theme_name_style_combo.set_model(theme_style_store)
 
+		self.plank_theme_name_style_combo = self.builder.get_object("plank_theme_name_style_combo")
+		renderer = Gtk.CellRendererText()
+		self.plank_theme_name_style_combo.pack_start(renderer, True)
+		self.plank_theme_name_style_combo.add_attribute(renderer, "text", 0)
+		self.plank_theme_name_style_combo.set_model(theme_style_store)
+		
 		# Widget signals
 		self.randomize_button.connect("clicked", self.on_random_button)
 		self.save_button.connect("clicked", self.on_save_button)
@@ -222,6 +234,16 @@ def load_conf(self):
 		else:
 			self.cursor_settings.set_visible(False)
 
+		self.plank_switch.set_active(self.manager.plank_theme)
+		self.plank_theme_name.set_text(str(self.manager.plankthemename))
+		self.plank_colour_variants.set_text(str(self.manager.plank_colorvariants))
+		if self.manager.plank_theme:
+			self.plank_settings.set_visible(True)
+		else:
+			self.plank_settings.set_visible(False)
+		self.plank_darkmode_name.set_text(str(self.manager.plank_darkmode_suffix))
+		self.plank_theme_name_style_combo.set_active(self.manager.plank_theme_name_style) # Select 1st category
+		
 		self.user_interval_HH.set_value(self.manager.theme_interval_HH)
 		self.user_interval_MM.set_value(self.manager.theme_interval_MM)
 		self.user_interval_SS.set_value(self.manager.theme_interval_SS)
@@ -264,6 +286,11 @@ def on_save_button(self, widget):
 			'cursor-theme': self.cursor_switch.get_active(),
 			'cursor-theme-name': self.cursor_theme_name.get_text(),
 			'cursor-color-variants': self.cursor_colour_variants.get_text(),
+			'plank-theme': self.plank_switch.get_active(),
+			'plank-theme-name': self.plank_theme_name.get_text(),
+			'plank-color-variants': self.plank_colour_variants.get_text(),
+			'plank-dark-mode-suffix': self.plank_darkmode_name.get_text(),
+			'plank-theme-style-name': self.plank_theme_name_style_combo.get_active(),
 			'theme-interval': user_interval
 		}
 		with open(CONFIG_FILE, 'w') as f: