Skip to content

Commit

Permalink
Merge pull request #149 from Ignoble61/krypton
Browse files Browse the repository at this point in the history
Revert "Krypton hotfix"
  • Loading branch information
BobCratchett committed Feb 23, 2016
2 parents 07ee154 + b959579 commit 7ff4b8a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
1 change: 0 additions & 1 deletion resources/lib/template.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,6 @@ def getInclude( self, tree, name, condition, profile ):
# We didn't find the node, so create it
newInclude = xmltree.SubElement( tree, "include" )
newInclude.set( "name", name )
newInclude.set( "definition", name )

# If we've been passed a condition, create an include with that as condition
# and name as text
Expand Down
6 changes: 0 additions & 6 deletions resources/lib/xmlfunctions.py
Original file line number Diff line number Diff line change
Expand Up @@ -337,25 +337,21 @@ def writexml( self, profilelist, mainmenuID, groups, numLevels, buildMode, progr

mainmenuTree = xmltree.SubElement( root, "include" )
mainmenuTree.set( "name", "skinshortcuts-mainmenu" )
mainmenuTree.set( "definition", "skinshortcuts-mainmenu" )

submenuTrees = []
for level in range( 0, int( numLevels) + 1 ):
subelement = xmltree.SubElement(root, "include")
subtree = xmltree.SubElement( root, "include" )
if level == 0:
subtree.set( "name", "skinshortcuts-submenu" )
subtree.set( "definition", "skinshortcuts-submenu" )
else:
subtree.set( "name", "skinshortcuts-submenu-" + str( level ) )
subtree.set( "definition", "skinshortcuts-submenu-" + str( level ) )
if not subtree in submenuTrees:
submenuTrees.append( subtree )

if buildMode == "single":
allmenuTree = xmltree.SubElement( root, "include" )
allmenuTree.set( "name", "skinshortcuts-allmenus" )
allmenuTree.set( "definition", "skinshortcuts-allmenus" )

profilePercent = 100 / len( profilelist )
profileCount = -1
Expand Down Expand Up @@ -482,9 +478,7 @@ def writexml( self, profilelist, mainmenuID, groups, numLevels, buildMode, progr
justmenuTreeB = xmltree.SubElement( root, "include" )

justmenuTreeA.set( "name", "skinshortcuts-group-" + DATA.slugify( submenu ) )
justmenuTreeA.set( "definition", "skinshortcuts-group-" + DATA.slugify( submenu ) )
justmenuTreeB.set( "name", "skinshortcuts-group-alt-" + DATA.slugify( submenu ) )
justmenuTreeB.set( "definition", "skinshortcuts-group-alt-" + DATA.slugify( submenu ) )

submenuNodes[ submenu ] = [ justmenuTreeA, justmenuTreeB ]

Expand Down

0 comments on commit 7ff4b8a

Please sign in to comment.