Skip to content

Commit

Permalink
[aml] add network Manager
Browse files Browse the repository at this point in the history
  • Loading branch information
davilla authored and Cory Fields committed Jan 28, 2013
1 parent 7688b31 commit c096563
Show file tree
Hide file tree
Showing 92 changed files with 4,822 additions and 1,998 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -1099,6 +1099,7 @@ lib/cmyth/Makefile

# /xbmc/network/
/xbmc/network/Makefile
/xbmc/network/linux/Makefile
/xbmc/network/upnp/Makefile

# /lib/libRTV/
Expand Down
1 change: 1 addition & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
xbmc/pvr/timers/pvrtimers.a \
xbmc/pvr/windows/pvrwindows.a \
xbmc/rendering/rendering.a \
xbmc/security/security.a \
xbmc/settings/settings.a \
xbmc/storage/storage.a \
xbmc/utils/utils.a \
Expand Down
179 changes: 179 additions & 0 deletions addons/skin.confluence/720p/DialogAccessPoints.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
<window id="141">
<defaultcontrol>3</defaultcontrol>
<include>dialogeffect</include>
<controls>
<control type="group">
<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>
<visible>![Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)]</visible>
</control>
<control type="image">
<description>background image</description>
<posx>0</posx>
<posy>0</posy>
<width>600</width>
<height>500</height>
<texture border="40">DialogBack2.png</texture>
<visible>Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)</visible>
</control>
<control type="image">
<description>Dialog Header image</description>
<posx>40</posx>
<posy>16</posy>
<width>520</width>
<height>40</height>
<texture>dialogheader.png</texture>
</control>
<control type="label" id="1">
<description>heading label</description>
<posx>40</posx>
<posy>20</posy>
<width>520</width>
<height>30</height>
<font>font13_title</font>
<label>1046</label>
<align>center</align>
<aligny>center</aligny>
<textcolor>selected</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="button">
<description>Close Window button</description>
<posx>510</posx>
<posy>15</posy>
<width>64</width>
<height>32</height>
<label>-</label>
<font>-</font>
<onclick>PreviousMenu</onclick>
<texturefocus>DialogCloseButton-focus.png</texturefocus>
<texturenofocus>DialogCloseButton.png</texturenofocus>
<onleft>3</onleft>
<onright>3</onright>
<onup>3</onup>
<ondown>3</ondown>
<visible>system.getbool(input.enablemouse)</visible>
</control>
<control type="list" id="3">
<posx>20</posx>
<posy>70</posy>
<width>530</width>
<height>400</height>
<onup>3</onup>
<ondown>3</ondown>
<onleft>61</onleft>
<onright>61</onright>
<pagecontrol>61</pagecontrol>
<scrolltime>200</scrolltime>
<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 type="scrollbar" id="61">
<posx>555</posx>
<posy>70</posy>
<width>25</width>
<height>400</height>
<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
<texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
<texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
<textureslidernib>ScrollBarNib.png</textureslidernib>
<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
<onleft>3</onleft>
<onright>3</onright>
<showonepage>false</showonepage>
<orientation>vertical</orientation>
</control>
</control>
</controls>
</window>
Binary file added addons/skin.confluence/media/ap-lock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/ap-signal1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/ap-signal2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/ap-signal3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/ap-signal4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/ap-signal5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/connected.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/connecting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/disconnected.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -2357,6 +2357,7 @@ OUTPUT_FILES="Makefile \
xbmc/guilib/Makefile \
xbmc/interfaces/Makefile \
xbmc/network/Makefile \
xbmc/network/linux/Makefile \
xbmc/network/upnp/Makefile \
lib/libRTV/Makefile \
lib/libexif/Makefile \
Expand Down
18 changes: 16 additions & 2 deletions language/English/strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -2555,7 +2555,9 @@ msgctxt "#713"
msgid "HTTP proxy"
msgstr ""

#empty string with id 714
msgctxt "#714"
msgid "- Network Connection"
msgstr ""

msgctxt "#715"
msgid "- Assignment"
Expand Down Expand Up @@ -11015,8 +11017,20 @@ msgctxt "#33200"
msgid "Detected New Connection"
msgstr ""

#empty strings from id 33201 to 33999
msgctxt "#33201"
msgid "Available connections"
msgstr ""

msgctxt "#33202"
msgid "Disconnected"
msgstr ""

msgctxt "#33203"
msgid "Connecting"
msgstr ""

#translators: no need to add these to your language files
#empty strings from id 33204 to 33999

msgctxt "#34000"
msgid "Lame"
Expand Down
4 changes: 1 addition & 3 deletions tools/amlogic/depends/xbmc/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
include ../../Makefile.include
export BUILDROOT
export SOURCE=$(CURDIR)/../../../..
all:
$(MAKE) -I $(BUILDROOT) -f xbmc.mk
$(MAKE) -I $(BUILDROOT) -f xbmc.mk
Loading

1 comment on commit c096563

@Stane1983
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still did not locate bug in code, but bug exists in network manager. Eg: 2 networks (wifi) with same encryption and same passkey. SSID of no 1 network is Vlasic and SSID of no 2 network is Vlasic-xyz. XBMC chooses network to which it will connect on it's own choice.

Please sign in to comment.