From ece942c1fdcf0230dc5454d7874d21c59e131766 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 2 Nov 2010 00:51:35 +0100
Subject: [PATCH] xbmc-dharma: fix Networkmanager patches (seperate patches for
 theme)

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 ...tion-model-for-network-management-0.1.diff | 144 ---------
 ...cessPoints-to-GUIDialogConnection-0.1.diff | 288 ------------------
 2 files changed, 432 deletions(-)

diff --git a/packages/mediacenter/xbmc-dharma/patches/703-Added-a-new-abstraction-model-for-network-management-0.1.diff b/packages/mediacenter/xbmc-dharma/patches/703-Added-a-new-abstraction-model-for-network-management-0.1.diff
index c511fe63d3..07c9d230f0 100644
--- a/packages/mediacenter/xbmc-dharma/patches/703-Added-a-new-abstraction-model-for-network-management-0.1.diff
+++ b/packages/mediacenter/xbmc-dharma/patches/703-Added-a-new-abstraction-model-for-network-management-0.1.diff
@@ -1,148 +1,4 @@
 diff -Naur xbmc-dharma-35100/addons/skin.confluence/720p/DialogAccessPoints.xml xbmc-dharma-35100.patch/addons/skin.confluence/720p/DialogAccessPoints.xml
---- xbmc-dharma-35100/addons/skin.confluence/720p/DialogAccessPoints.xml	1970-01-01 01:00:00.000000000 +0100
-+++ xbmc-dharma-35100.patch/addons/skin.confluence/720p/DialogAccessPoints.xml	2010-11-01 21:17:04.279892685 +0100
-@@ -0,0 +1,141 @@
-+<window id="10041">
-+  <defaultcontrol>3</defaultcontrol>
-+	<include>dialogeffect</include>
-+  <controls>
-+		<control type="group">
-+			<include>VisibleFadeEffect</include>
-+		  <posx>340</posx>
-+		  <posy>110</posy>
-+      <width>600</width>
-+      <height>500</height>
-+
-+      <control type="image">
-+        <description>background image</description>
-+        <posx>0</posx>
-+        <posy>0</posy>
-+        <width>600</width>
-+        <height>500</height>
-+        <texture border="40">DialogBack.png</texture>
-+      </control>
-+			<control type="image">
-+				<posx>0</posx>
-+				<posy>10</posy>
-+				<width>600</width>
-+				<height>100</height>
-+				<aspectratio>stretch</aspectratio>
-+				<texture>GlassTitleBar.png</texture>
-+			</control>
-+
-+      <control type="label" id="1">
-+        <description>heading label</description>
-+        <posx>0</posx>
-+        <posy>0</posy>
-+        <height>70</height>
-+        <width>600</width>
-+			  <font>font13_title</font>
-+        <label>1046</label>
-+			  <align>center</align>
-+			  <aligny>center</aligny>
-+        <textcolor>white</textcolor>
-+      </control>
-+
-+		  <control type="list" id="3">
-+			  <posx>20</posx>
-+			  <posy>60</posy>
-+			  <width>550</width>
-+			  <height>480</height>
-+			  <onup>3</onup>
-+			  <ondown>3</ondown>
-+			  <onleft>5</onleft>
-+			  <onright>61</onright>
-+			  <pagecontrol>61</pagecontrol>
-+			  <scrolltime>200</scrolltime>
-+			  <animation effect="slide" start="0,0" end="10,0" time="0" condition="!Control.IsVisible(61)">Conditional</animation>
-+			  <itemlayout height="40" width="530">
-+				  <control type="image">
-+					  <posx>0</posx>
-+					  <posy>0</posy>
-+					  <width>530</width>
-+					  <height>40</height>
-+					  <texture border="0,2,0,2">MenuItemNF.png</texture>
-+				  </control>
-+          <control type="image">
-+            <posx>475</posx>
-+            <posy>10</posy>
-+            <width>20</width>
-+            <height>20</height>
-+            <visible>!IsEmpty(ListItem.Property(encryption))</visible>
-+            <texture>ap-lock.png</texture>
-+          </control>
-+          <control type="image">
-+            <posx>440</posx>
-+            <posy>5</posy>
-+            <width>30</width>
-+            <height>30</height>
-+            <texture>ap-signal$INFO[ListItem.Property(signal)].png</texture>
-+          </control>
-+          <control type="image">
-+            <posx>0</posx>
-+            <posy>0</posy>
-+            <width>40</width>
-+            <height>40</height>
-+            <texture>$INFO[ListItem.Property(state)].png</texture>
-+          </control>
-+				  <control type="label">
-+					  <posx>40</posx>
-+					  <posy>0</posy>
-+					  <width>490</width>
-+					  <height>40</height>
-+					  <font>font13</font>
-+					  <textcolor>grey2</textcolor>
-+					  <align>left</align>
-+					  <aligny>center</aligny>
-+					  <label>$INFO[ListItem.Label]</label>
-+				  </control>
-+			  </itemlayout>
-+			  <focusedlayout height="40" width="530">
-+				  <control type="image">
-+					  <posx>0</posx>
-+					  <posy>0</posy>
-+					  <width>530</width>
-+					  <height>40</height>
-+					  <texture border="0,2,0,2">MenuItemFO.png</texture>
-+				  </control>
-+          <control type="image">
-+            <posx>475</posx>
-+            <posy>10</posy>
-+            <width>20</width>
-+            <height>20</height>
-+            <visible>!IsEmpty(ListItem.Property(encryption))</visible>
-+            <texture>ap-lock.png</texture>
-+          </control>
-+          <control type="image">
-+            <posx>440</posx>
-+            <posy>5</posy>
-+            <width>30</width>
-+            <height>30</height>
-+            <texture>ap-signal$INFO[ListItem.Property(signal)].png</texture>
-+          </control>
-+          <control type="image">
-+            <posx>0</posx>
-+            <posy>0</posy>
-+            <width>40</width>
-+            <height>40</height>
-+            <texture>$INFO[ListItem.Property(state)].png</texture>
-+          </control>
-+				  <control type="label">
-+					  <posx>40</posx>
-+					  <posy>0</posy>
-+					  <width>490</width>
-+					  <height>40</height>
-+					  <font>font13</font>
-+					  <textcolor>selected</textcolor>
-+					  <align>left</align>
-+					  <aligny>center</aligny>
-+					  <label>$INFO[ListItem.Label]</label>
-+				  </control>
-+			  </focusedlayout>
-+		  </control>
-+	  </control>
-+  </controls>
-+</window>
 diff -Naur xbmc-dharma-35100/guilib/system.h xbmc-dharma-35100.patch/guilib/system.h
 --- xbmc-dharma-35100/guilib/system.h	2010-10-30 05:36:40.000000000 +0200
 +++ xbmc-dharma-35100.patch/guilib/system.h	2010-11-01 21:17:04.300892931 +0100
diff --git a/packages/mediacenter/xbmc-dharma/patches/704-Renamed-GUIDialogAccessPoints-to-GUIDialogConnection-0.1.diff b/packages/mediacenter/xbmc-dharma/patches/704-Renamed-GUIDialogAccessPoints-to-GUIDialogConnection-0.1.diff
index dc92cb8e27..501b22b0ef 100644
--- a/packages/mediacenter/xbmc-dharma/patches/704-Renamed-GUIDialogAccessPoints-to-GUIDialogConnection-0.1.diff
+++ b/packages/mediacenter/xbmc-dharma/patches/704-Renamed-GUIDialogAccessPoints-to-GUIDialogConnection-0.1.diff
@@ -1,293 +1,5 @@
 diff -Naur xbmc-dharma-35100/addons/skin.confluence/720p/DialogAccessPoints.xml xbmc-dharma-35100.patch/addons/skin.confluence/720p/DialogAccessPoints.xml
---- xbmc-dharma-35100/addons/skin.confluence/720p/DialogAccessPoints.xml	2010-11-01 21:23:31.857433553 +0100
-+++ xbmc-dharma-35100.patch/addons/skin.confluence/720p/DialogAccessPoints.xml	1970-01-01 01:00:00.000000000 +0100
-@@ -1,141 +0,0 @@
--<window id="10041">
--  <defaultcontrol>3</defaultcontrol>
--	<include>dialogeffect</include>
--  <controls>
--		<control type="group">
--			<include>VisibleFadeEffect</include>
--		  <posx>340</posx>
--		  <posy>110</posy>
--      <width>600</width>
--      <height>500</height>
--
--      <control type="image">
--        <description>background image</description>
--        <posx>0</posx>
--        <posy>0</posy>
--        <width>600</width>
--        <height>500</height>
--        <texture border="40">DialogBack.png</texture>
--      </control>
--			<control type="image">
--				<posx>0</posx>
--				<posy>10</posy>
--				<width>600</width>
--				<height>100</height>
--				<aspectratio>stretch</aspectratio>
--				<texture>GlassTitleBar.png</texture>
--			</control>
--
--      <control type="label" id="1">
--        <description>heading label</description>
--        <posx>0</posx>
--        <posy>0</posy>
--        <height>70</height>
--        <width>600</width>
--			  <font>font13_title</font>
--        <label>1046</label>
--			  <align>center</align>
--			  <aligny>center</aligny>
--        <textcolor>white</textcolor>
--      </control>
--
--		  <control type="list" id="3">
--			  <posx>20</posx>
--			  <posy>60</posy>
--			  <width>550</width>
--			  <height>480</height>
--			  <onup>3</onup>
--			  <ondown>3</ondown>
--			  <onleft>5</onleft>
--			  <onright>61</onright>
--			  <pagecontrol>61</pagecontrol>
--			  <scrolltime>200</scrolltime>
--			  <animation effect="slide" start="0,0" end="10,0" time="0" condition="!Control.IsVisible(61)">Conditional</animation>
--			  <itemlayout height="40" width="530">
--				  <control type="image">
--					  <posx>0</posx>
--					  <posy>0</posy>
--					  <width>530</width>
--					  <height>40</height>
--					  <texture border="0,2,0,2">MenuItemNF.png</texture>
--				  </control>
--          <control type="image">
--            <posx>475</posx>
--            <posy>10</posy>
--            <width>20</width>
--            <height>20</height>
--            <visible>!IsEmpty(ListItem.Property(encryption))</visible>
--            <texture>ap-lock.png</texture>
--          </control>
--          <control type="image">
--            <posx>440</posx>
--            <posy>5</posy>
--            <width>30</width>
--            <height>30</height>
--            <texture>ap-signal$INFO[ListItem.Property(signal)].png</texture>
--          </control>
--          <control type="image">
--            <posx>0</posx>
--            <posy>0</posy>
--            <width>40</width>
--            <height>40</height>
--            <texture>$INFO[ListItem.Property(state)].png</texture>
--          </control>
--				  <control type="label">
--					  <posx>40</posx>
--					  <posy>0</posy>
--					  <width>490</width>
--					  <height>40</height>
--					  <font>font13</font>
--					  <textcolor>grey2</textcolor>
--					  <align>left</align>
--					  <aligny>center</aligny>
--					  <label>$INFO[ListItem.Label]</label>
--				  </control>
--			  </itemlayout>
--			  <focusedlayout height="40" width="530">
--				  <control type="image">
--					  <posx>0</posx>
--					  <posy>0</posy>
--					  <width>530</width>
--					  <height>40</height>
--					  <texture border="0,2,0,2">MenuItemFO.png</texture>
--				  </control>
--          <control type="image">
--            <posx>475</posx>
--            <posy>10</posy>
--            <width>20</width>
--            <height>20</height>
--            <visible>!IsEmpty(ListItem.Property(encryption))</visible>
--            <texture>ap-lock.png</texture>
--          </control>
--          <control type="image">
--            <posx>440</posx>
--            <posy>5</posy>
--            <width>30</width>
--            <height>30</height>
--            <texture>ap-signal$INFO[ListItem.Property(signal)].png</texture>
--          </control>
--          <control type="image">
--            <posx>0</posx>
--            <posy>0</posy>
--            <width>40</width>
--            <height>40</height>
--            <texture>$INFO[ListItem.Property(state)].png</texture>
--          </control>
--				  <control type="label">
--					  <posx>40</posx>
--					  <posy>0</posy>
--					  <width>490</width>
--					  <height>40</height>
--					  <font>font13</font>
--					  <textcolor>selected</textcolor>
--					  <align>left</align>
--					  <aligny>center</aligny>
--					  <label>$INFO[ListItem.Label]</label>
--				  </control>
--			  </focusedlayout>
--		  </control>
--	  </control>
--  </controls>
--</window>
 diff -Naur xbmc-dharma-35100/addons/skin.confluence/720p/DialogConnections.xml xbmc-dharma-35100.patch/addons/skin.confluence/720p/DialogConnections.xml
---- xbmc-dharma-35100/addons/skin.confluence/720p/DialogConnections.xml	1970-01-01 01:00:00.000000000 +0100
-+++ xbmc-dharma-35100.patch/addons/skin.confluence/720p/DialogConnections.xml	2010-11-01 21:23:48.524628785 +0100
-@@ -0,0 +1,141 @@
-+<window id="10041">
-+  <defaultcontrol>3</defaultcontrol>
-+	<include>dialogeffect</include>
-+  <controls>
-+		<control type="group">
-+			<include>VisibleFadeEffect</include>
-+		  <posx>340</posx>
-+		  <posy>110</posy>
-+      <width>600</width>
-+      <height>500</height>
-+
-+      <control type="image">
-+        <description>background image</description>
-+        <posx>0</posx>
-+        <posy>0</posy>
-+        <width>600</width>
-+        <height>500</height>
-+        <texture border="40">DialogBack.png</texture>
-+      </control>
-+			<control type="image">
-+				<posx>0</posx>
-+				<posy>10</posy>
-+				<width>600</width>
-+				<height>100</height>
-+				<aspectratio>stretch</aspectratio>
-+				<texture>GlassTitleBar.png</texture>
-+			</control>
-+
-+      <control type="label" id="1">
-+        <description>heading label</description>
-+        <posx>0</posx>
-+        <posy>0</posy>
-+        <height>70</height>
-+        <width>600</width>
-+			  <font>font13_title</font>
-+        <label>33200</label>
-+			  <align>center</align>
-+			  <aligny>center</aligny>
-+        <textcolor>white</textcolor>
-+      </control>
-+
-+		  <control type="list" id="3">
-+			  <posx>20</posx>
-+			  <posy>60</posy>
-+			  <width>550</width>
-+			  <height>480</height>
-+			  <onup>3</onup>
-+			  <ondown>3</ondown>
-+			  <onleft>5</onleft>
-+			  <onright>61</onright>
-+			  <pagecontrol>61</pagecontrol>
-+			  <scrolltime>200</scrolltime>
-+			  <animation effect="slide" start="0,0" end="10,0" time="0" condition="!Control.IsVisible(61)">Conditional</animation>
-+			  <itemlayout height="40" width="530">
-+				  <control type="image">
-+					  <posx>0</posx>
-+					  <posy>0</posy>
-+					  <width>530</width>
-+					  <height>40</height>
-+					  <texture border="0,2,0,2">MenuItemNF.png</texture>
-+				  </control>
-+          <control type="image">
-+            <posx>475</posx>
-+            <posy>10</posy>
-+            <width>20</width>
-+            <height>20</height>
-+            <visible>!IsEmpty(ListItem.Property(encryption))</visible>
-+            <texture>ap-lock.png</texture>
-+          </control>
-+          <control type="image">
-+            <posx>440</posx>
-+            <posy>5</posy>
-+            <width>30</width>
-+            <height>30</height>
-+            <texture>ap-signal$INFO[ListItem.Property(signal)].png</texture>
-+          </control>
-+          <control type="image">
-+            <posx>0</posx>
-+            <posy>0</posy>
-+            <width>40</width>
-+            <height>40</height>
-+            <texture>$INFO[ListItem.Property(state)].png</texture>
-+          </control>
-+				  <control type="label">
-+					  <posx>40</posx>
-+					  <posy>0</posy>
-+					  <width>490</width>
-+					  <height>40</height>
-+					  <font>font13</font>
-+					  <textcolor>grey2</textcolor>
-+					  <align>left</align>
-+					  <aligny>center</aligny>
-+					  <label>$INFO[ListItem.Label]</label>
-+				  </control>
-+			  </itemlayout>
-+			  <focusedlayout height="40" width="530">
-+				  <control type="image">
-+					  <posx>0</posx>
-+					  <posy>0</posy>
-+					  <width>530</width>
-+					  <height>40</height>
-+					  <texture border="0,2,0,2">MenuItemFO.png</texture>
-+				  </control>
-+          <control type="image">
-+            <posx>475</posx>
-+            <posy>10</posy>
-+            <width>20</width>
-+            <height>20</height>
-+            <visible>!IsEmpty(ListItem.Property(encryption))</visible>
-+            <texture>ap-lock.png</texture>
-+          </control>
-+          <control type="image">
-+            <posx>440</posx>
-+            <posy>5</posy>
-+            <width>30</width>
-+            <height>30</height>
-+            <texture>ap-signal$INFO[ListItem.Property(signal)].png</texture>
-+          </control>
-+          <control type="image">
-+            <posx>0</posx>
-+            <posy>0</posy>
-+            <width>40</width>
-+            <height>40</height>
-+            <texture>$INFO[ListItem.Property(state)].png</texture>
-+          </control>
-+				  <control type="label">
-+					  <posx>40</posx>
-+					  <posy>0</posy>
-+					  <width>490</width>
-+					  <height>40</height>
-+					  <font>font13</font>
-+					  <textcolor>selected</textcolor>
-+					  <align>left</align>
-+					  <aligny>center</aligny>
-+					  <label>$INFO[ListItem.Label]</label>
-+				  </control>
-+			  </focusedlayout>
-+		  </control>
-+	  </control>
-+  </controls>
-+</window>
 diff -Naur xbmc-dharma-35100/guilib/Key.h xbmc-dharma-35100.patch/guilib/Key.h
 --- xbmc-dharma-35100/guilib/Key.h	2010-10-30 05:36:40.000000000 +0200
 +++ xbmc-dharma-35100.patch/guilib/Key.h	2010-11-01 21:23:48.525628797 +0100