mythbuntu-dev team mailing list archive
-
mythbuntu-dev team
-
Mailing list archive
-
Message #00097
[Merge] lp:~rhpot1991/mythbuntu/mythbuntu-common into lp:~mythbuntu-dev/mythbuntu/mythbuntu-common
rhpot1991 has proposed merging lp:~rhpot1991/mythbuntu/mythbuntu-common into lp:~mythbuntu-dev/mythbuntu/mythbuntu-common.
Requested reviews:
mythbuntu-dev (mythbuntu-dev)
For more details, see:
https://code.launchpad.net/~rhpot1991/mythbuntu/mythbuntu-common/+merge/101433
Dropped Theme Tab, fixed errors in Plugins Tab/dictionary.
--
https://code.launchpad.net/~rhpot1991/mythbuntu/mythbuntu-common/+merge/101433
Your team mythbuntu-dev is requested to review the proposed merge of lp:~rhpot1991/mythbuntu/mythbuntu-common into lp:~mythbuntu-dev/mythbuntu/mythbuntu-common.
=== modified file 'debian/changelog'
--- debian/changelog 2012-02-20 07:54:38 +0000
+++ debian/changelog 2012-04-10 19:20:26 +0000
@@ -1,9 +1,14 @@
mythbuntu-common (0.69) UNRELEASED; urgency=low
+ [ John Baab ]
+ * Drop theme tab (installable from mythtv itself)
+ * Removed obsolete plugins from dictionary.
+
+ [ Mario Limonciello ]
* Drop mythvideos and mythmovies plugin checkboxes (gone in 0.25)
* Update precise in repos.db.
- -- Mario Limonciello <Mario_Limonciello@xxxxxxxx> Sun, 12 Feb 2012 22:20:25 -0600
+ -- John Baab <rhpot1991@xxxxxxxxxx> Mon, 09 Apr 2012 11:38:09 -0500
mythbuntu-common (0.66) precise; urgency=low
=== modified file 'mythbuntu_common/dictionaries.py'
--- mythbuntu_common/dictionaries.py 2011-09-09 21:08:24 +0000
+++ mythbuntu_common/dictionaries.py 2012-04-10 19:20:26 +0000
@@ -36,15 +36,6 @@
return list
####################
-#Theme dictionaries: these are for managing a list of all possible themes
-####################
-def get_theme_dictionary(self):
- list= {
- "mythtv-themes": self.supported_themes, \
- "mythtv-theme-mythbuntu": self.mythbuntu_theme }
- return list
-
-####################
#Plugin dictionaries: these are for managing a list of all possible plugins
####################
def get_frontend_plugin_dictionary(self):
@@ -54,10 +45,8 @@
"mythgame": self.mythgame_checkbox, \
"mythgallery": self.mythgallery_checkbox, \
"mythmusic": self.mythmusic_checkbox, \
- "mythmovies": self.mythmovies_checkbox, \
"mythnews": self.mythnews_checkbox, \
"mythnetvision": self.mythnetvision_checkbox, \
- "mythvideo": self.mythvideo_checkbox, \
"mythweather": self.mythweather_checkbox }
return list
@@ -109,12 +98,6 @@
"dhcp3-server": self.diskless_server_dhcp }
return list
-def get_artwork_dictionary(self):
- list = {
- "mythbuntu-gdm-theme": self.gdm_theme, \
- "mythbuntu-default-settings": self.xfce_theme }
- return list
-
def get_graphics_dictionary():
list = {}
##AMD graphics detection
=== removed file 'plugins/python/themes.py'
--- plugins/python/themes.py 2009-08-14 16:35:44 +0000
+++ plugins/python/themes.py 1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-## -*- coding: utf-8 -*-
-#
-# «themes» - MCC Themes enablement plugin
-#
-# Copyright (C) 2009, Mario Limonciello, for Mythbuntu
-#
-#
-# Mythbuntu is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this application; if not, write to the Free Software Foundation, Inc., 51
-# Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##################################################################################
-
-from MythbuntuControlCentre.plugin import MCCPlugin
-from gtk import SENSITIVE
-
-from mythbuntu_common.dictionaries import *
-
-class ThemesPlugin(MCCPlugin):
- """Theme enablement"""
-
- def __init__(self):
- #Initialize parent class
- information = {}
- information["name"] = "Themes"
- information["icon"] = "gtk-select-color"
- information["ui"] = "tab_themes"
- MCCPlugin.__init__(self,information)
-
- def captureState(self):
- """Determines the state of the items on managed by this plugin
- and stores it into the plugin's own internal structures"""
- #Dictionaries
- self.dictionary_state={}
- for list in get_theme_dictionary(self), \
- get_artwork_dictionary(self):
- for item in list:
- self.dictionary_state[list[item]]=self.query_installed(item)
-
- def applyStateToGUI(self):
- """Takes the current state information and sets the GUI
- for this plugin"""
- #Load the detected dictionary
- for item in self.dictionary_state:
- item.set_active(self.dictionary_state[item])
-
- def compareState(self):
- """Determines what items have been modified on this plugin"""
- #Prepare for state capturing
- MCCPlugin.clearParentState(self)
-
- #Installable items
- for list in get_theme_dictionary(self), \
- get_artwork_dictionary(self):
- for item in list:
- if list[item].get_active() != self.dictionary_state[list[item]]:
- if list[item].get_active():
- self._markInstall(item)
- else:
- self._markRemove(item)
-
- def toggle_meta(self,widget):
- """Toggles a large set of options at once"""
- if widget is not None:
- list=get_theme_dictionary(self)
- toggle=widget.get_active()
- for item in list:
- if list[item].flags() & SENSITIVE:
- list[item].set_active(toggle)
=== removed file 'plugins/ui/tab_themes.ui'
--- plugins/ui/tab_themes.ui 2011-09-09 21:09:06 +0000
+++ plugins/ui/tab_themes.ui 1970-01-01 00:00:00 +0000
@@ -1,207 +0,0 @@
-<?xml version="1.0"?>
-<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkVBox" id="tab_themes">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <child>
- <object class="GtkLabel" id="theme_heading_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><big><b>Themes and Artwork</b></big></property>
- <property name="use_markup">True</property>
- <property name="single_line_mode">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHSeparator" id="hseparator23">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">6</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox15">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkLabel" id="theme_description">
- <property name="width_request">600</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Themes can improve the appeal of a MythBuntu box. Post-installation, the active theme can be set from the "Settings-> Appearance" menu in your Frontend.</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>MythTV Themes</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <child>
- <object class="GtkCheckButton" id="themes_meta">
- <property name="label" translatable="yes">Enable/Disable all</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="toggle_meta"/>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment15">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
- <property name="left_padding">25</property>
- <child>
- <object class="GtkCheckButton" id="mythbuntu_theme">
- <property name="label" translatable="yes">Mythbuntu Theme</property>
- <property name="width_request">175</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment21">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
- <property name="left_padding">25</property>
- <child>
- <object class="GtkCheckButton" id="supported_themes">
- <property name="label" translatable="yes">Supported Themes</property>
- <property name="width_request">200</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Mythbuntu Artwork</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <child>
- <object class="GtkAlignment" id="alignment18">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
- <property name="left_padding">25</property>
- <child>
- <object class="GtkCheckButton" id="xfce_theme">
- <property name="label" translatable="yes">Session</property>
- <property name="width_request">175</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment19">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="xscale">0</property>
- <property name="left_padding">25</property>
- <child>
- <object class="GtkCheckButton" id="gdm_theme">
- <property name="label" translatable="yes">Login (GDM)</property>
- <property name="width_request">175</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">6</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
-</interface>
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2009-10-03 23:45:02 +0000
+++ po/POTFILES.in 2012-04-10 19:20:26 +0000
@@ -1,4 +1,3 @@
-./plugins/ui/tab_themes.ui
./plugins/ui/tab_system_roles.ui
./plugins/ui/tab_proprietary_codecs.ui
./plugins/ui/tab_remote_control.ui
@@ -12,7 +11,6 @@
./plugins/python/mythexport.py
./plugins/python/graphics_drivers.py
./plugins/python/mysql_configuration.py
-./plugins/python/themes.py
./plugins/python/remote.py
./plugins/python/services.py
./plugins/python/plugins.py
Follow ups
