openshot.code team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 728
committer: Jonathan Thomas <Jonathan.Oomph@xxxxxxxxx>
branch nick: openshot
timestamp: Fri 2012-09-28 00:30:12 -0500
message:
  Fixed an ugly bug with changing themes, where some of the settings would be left from the previous theme.  Also, updated the new "holo" dark theme to look better.
modified:
  openshot/classes/project.py
  openshot/classes/theme.py
  openshot/themes/holo/effect.png
  openshot/themes/holo/icons/snap.png
  openshot/themes/holo/ruler_left.png
  openshot/themes/holo/ruler_middle.png
  openshot/themes/holo/ruler_right.png
  openshot/windows/MainGTK.py
  openshot/windows/preferences.py


--
lp:openshot
https://code.launchpad.net/~openshot.code/openshot/main

Your team OpenShot Code is subscribed to branch lp:openshot.
To unsubscribe from this branch go to https://code.launchpad.net/~openshot.code/openshot/main/+edit-subscription

=== modified file 'openshot/classes/project.py'
--- openshot/classes/project.py	2012-09-05 20:10:28 +0000
+++ openshot/classes/project.py	2012-09-28 05:30:12 +0000
@@ -100,7 +100,7 @@
 			self.thumbnailer.start()
 			
 	def set_theme(self, folder_name):
-		""" Set the current theme and theme settings """ 
+		""" Set the current theme and theme settings """
 
 		# Set the theme, and load the theme settings
 		self.theme = folder_name

=== modified file 'openshot/classes/theme.py'
--- openshot/classes/theme.py	2010-11-21 05:59:43 +0000
+++ openshot/classes/theme.py	2012-09-28 05:30:12 +0000
@@ -70,7 +70,7 @@
 			"x" : int(self.xmldoc.getElementsByTagName('timeline')[0].getElementsByTagName('playhead_text')[0].getElementsByTagName('x')[0].firstChild.toxml()),
 			"y" : int(self.xmldoc.getElementsByTagName('timeline')[0].getElementsByTagName('playhead_text')[0].getElementsByTagName('y')[0].firstChild.toxml()),
 		}
-		
+
 		output["ruler"] = {
 			"height" : int(self.xmldoc.getElementsByTagName('timeline')[0].getElementsByTagName('ruler')[0].getElementsByTagName('height')[0].firstChild.toxml()),
 			"x" : int(self.xmldoc.getElementsByTagName('timeline')[0].getElementsByTagName('ruler')[0].getElementsByTagName('x')[0].firstChild.toxml()),

=== modified file 'openshot/themes/holo/effect.png'
Binary files openshot/themes/holo/effect.png	2012-09-27 22:33:34 +0000 and openshot/themes/holo/effect.png	2012-09-28 05:30:12 +0000 differ
=== modified file 'openshot/themes/holo/icons/snap.png'
Binary files openshot/themes/holo/icons/snap.png	2012-09-27 22:33:34 +0000 and openshot/themes/holo/icons/snap.png	2012-09-28 05:30:12 +0000 differ
=== modified file 'openshot/themes/holo/ruler_left.png'
Binary files openshot/themes/holo/ruler_left.png	2012-09-27 22:33:34 +0000 and openshot/themes/holo/ruler_left.png	2012-09-28 05:30:12 +0000 differ
=== modified file 'openshot/themes/holo/ruler_middle.png'
Binary files openshot/themes/holo/ruler_middle.png	2012-09-27 22:33:34 +0000 and openshot/themes/holo/ruler_middle.png	2012-09-28 05:30:12 +0000 differ
=== modified file 'openshot/themes/holo/ruler_right.png'
Binary files openshot/themes/holo/ruler_right.png	2012-09-27 22:33:34 +0000 and openshot/themes/holo/ruler_right.png	2012-09-28 05:30:12 +0000 differ
=== modified file 'openshot/windows/MainGTK.py'
--- openshot/windows/MainGTK.py	2012-09-12 07:02:29 +0000
+++ openshot/windows/MainGTK.py	2012-09-28 05:30:12 +0000
@@ -221,7 +221,7 @@
 			self.nbFiles.set_current_page(0)
 
 		self.project.project_type = self.settings.general["default_profile"]
-		self.project.theme = self.settings.general["default_theme"]
+		self.project.set_theme(self.settings.general["default_theme"])
 		
 		# Load Autosave settings
 		self.load_autosave_settings()
@@ -932,7 +932,7 @@
 		else:
 			# elementary icon path (i.e. simple icons)
 			elementary_path = os.path.join(self.project.THEMES_DIR, "elementary", "icons")
-			
+
 			# remove images
 			all_buttons = [(self.tlbPrevious, "stock", gtk.STOCK_MEDIA_PREVIOUS),
 					 (self.tlbPreviousMarker, "stock", gtk.STOCK_GOTO_FIRST),

=== modified file 'openshot/windows/preferences.py'
--- openshot/windows/preferences.py	2012-01-30 23:16:33 +0000
+++ openshot/windows/preferences.py	2012-09-28 05:30:12 +0000
@@ -277,7 +277,7 @@
 		theme_name = self.cmbThemes.get_active_text()
 		
 		# update theme on main form
-		self.form.project.theme = theme_name
+		self.form.project.set_theme(theme_name)
 		self.form.update_icon_theme()
 		self.form.refresh()