diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
deleted file mode 100644
index 67d8b9c81a..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/mediacenter/xbmc-addon-settings/init.d/05_systemconfig b/packages/mediacenter/xbmc-addon-settings/init.d/05_systemconfig
deleted file mode 100644
index 67c1f97e66..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/init.d/05_systemconfig
+++ /dev/null
@@ -1,34 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# This Program 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, 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 OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-#
-# copy userconfig and samples
-#
-# runlevels: openelec, textmode
-
-progress "copy system config"
-
-if [ -f /usr/share/xbmc/addons/os.openelec.settings/default_settings.xml ]; then
- if [ ! -f $HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml ]; then
- mkdir -p $HOME/.xbmc/userdata/addon_data/os.openelec.settings
- cp /usr/share/xbmc/addons/os.openelec.settings/default_settings.xml \
- $HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml
- fi
-fi
diff --git a/packages/mediacenter/xbmc-addon-settings/install b/packages/mediacenter/xbmc-addon-settings/install
index 8bdfac1944..2f078388e4 100755
--- a/packages/mediacenter/xbmc-addon-settings/install
+++ b/packages/mediacenter/xbmc-addon-settings/install
@@ -22,7 +22,5 @@
. config/options $1
-mkdir -p $INSTALL/usr/share/xbmc/addons/os.openelec.settings
- cp -R $PKG_DIR/source/* $INSTALL/usr/share/xbmc/addons/os.openelec.settings
- cp -R $PKG_DIR/config/* $INSTALL/usr/share/xbmc/addons/os.openelec.settings
- $SED "s|@OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.settings/addon.xml
+mkdir -p $INSTALL/usr/share/xbmc/addons/xbmc-addon-settings
+ cp -R $PKG_BUILD/service.openelec.settings/* $INSTALL/usr/share/xbmc/addons/xbmc-addon-settings
diff --git a/packages/mediacenter/xbmc-addon-settings/meta b/packages/mediacenter/xbmc-addon-settings/meta
index 3253332925..f0215df3d0 100644
--- a/packages/mediacenter/xbmc-addon-settings/meta
+++ b/packages/mediacenter/xbmc-addon-settings/meta
@@ -19,14 +19,14 @@
################################################################################
PKG_NAME="xbmc-addon-settings"
-PKG_VERSION="1"
+PKG_VERSION="0.0.5"
PKG_REV="1"
PKG_ARCH="any"
-PKG_LICENSE="GPL"
+PKG_LICENSE="prop."
PKG_SITE="http://www.openelec.tv"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_URL="http://www.fiebach.de/xbmc/addons/service.openelec.settings/service.openelec.settings-$PKG_VERSION.zip"
+PKG_DEPENDS="connman"
+PKG_BUILD_DEPENDS="toolchain python"
PKG_PRIORITY="optional"
PKG_SECTION="mediacenter"
PKG_SHORTDESC="xbmc-addon-settings: Settings dialog for OpenELEC"
diff --git a/packages/mediacenter/xbmc-addon-settings/source/addon.xml b/packages/mediacenter/xbmc-addon-settings/source/addon.xml
deleted file mode 100644
index db3144d7f4..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/source/addon.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
- OpenELEC OS Settings Dialog
- OpenELEC OS indstillinger
- OpenELEC OS Ayarları İletişim Kutusu
- OpenELEC OS Panel ustawień
- OpenElec OS Settings Dialog
- OpenElec OS indstillinger
- OpenElec OS Ayarları İletişim Kutusu
- OpenELEC OS Panel ustawień
- all
-
-
diff --git a/packages/mediacenter/xbmc-addon-settings/source/icon.png b/packages/mediacenter/xbmc-addon-settings/source/icon.png
deleted file mode 100644
index 072ab561d5..0000000000
Binary files a/packages/mediacenter/xbmc-addon-settings/source/icon.png and /dev/null differ
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Danish/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Danish/strings.xml
deleted file mode 100644
index b9ae32fb86..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Danish/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
- System
- Tastatur
- Tastatur layout
- Alternativ tastatur layout (valgfrit)
- System opdatering
- System opdatering
- LCD/VFD
- Valg af LCD driver
-
-
- Netværk
- Netværk 2
- Generelle indstillinger
- Hostnavn
- Netværks adapter
- Netværks forbindelse
- Netværks interface
- IP indstillinger
- Statisk IP adresse
- Netmaske præfixlængde
- Netværks gateway
- DNS server 1
- DNS server 2
- DNS server 3
- WLAN indstillinger
- WLAN SSID
- Skjult netværk
- WLAN sikkerhed
- WLAN kodeord
-
-
- Services
- Samba
- Start Samba ved opstart af systemet
-
-
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
deleted file mode 100644
index a4d734b9a2..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
- Systeem
- Toetsenbord
- Toetsenbord layout
- Toetsenbord layout #2
- Systeem update
- Systeem update
- LCD/VFD Driver
- Te gebruiken LCD Driver
-
-
- Netwerk
- Netwerk 2
- Standaard instellingen
- Netwerknaam
- Netwerk apparaat
- Netwerk soort
- Netwerk apparaat of MAC adres
- IP instellingen
- Statisch IP adres
- Netwerkprefix lengte
- Netwerk gateway
- DNS server 1
- DNS server 2
- DNS server 3
- WLAN Instellingen
- WLAN SSID (router naam)
- Verborgen netwerk
- WLAN beveiliging
- WLAN wachtwoord
-
-
- Services
- Samba
- Start Samba bij het opstarten
-
-
-
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
deleted file mode 100644
index 2b5b78f4b8..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
- System
- Keyboard
- Keyboard layout
- Alternate keyboard layout (optional)
- System Update
- System Update
- LCD/VFD
- LCD Driver to use
- HDD standby
- Enable HDD standby
- HDD standby timeout (minutes)
-
-
- Network
- Network 2
- General
- Hostname
- Network Adapter
- Network Technology
- Network Interface
- IP settings
- Static IP address
- Netmask Prefixlength
- Network gateway
- DNS server 1
- DNS server 2
- DNS server 3
- WLAN settings
- WLAN SSID
- Hidden Network
- WLAN Security
- WLAN Passphrase
-
-
- Services
- Samba
- Start Samba at boot
- Use Samba Passwords
- Samba Username
- Samba Password
-
- SSH
- Start ssh server at boot
- Disable password authentication
-
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Finnish/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Finnish/strings.xml
deleted file mode 100644
index 2fd6d51e9a..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Finnish/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
- Järjestelmä
- Näppäimistö
- Näppäimistön asettelu
- Vaihtoehtoinen näppäimistön asettelu (valinnainen)
- Järjestelmän päivitys
- Järjestelmän päivitys
- LCD/VFD
- Käytettävä LCD-ajuri
-
-
- Verkko
- Verkko 2
- Yleinen
- Tietokoneen nimi
- Verkkosovitin
- Verkon tyyppi
- Verkkoliityntä
- IP-asetukset
- Staattinen IP-asetus
- Verkkopeitteen pituus bitteinä
- Verkon yhdyskäytävä
- DNS-palvelin 1
- DNS-palvelin 2
- DNS-palvelin 3
- WLAN-asetukset
- WLAN SSID
- Piilotettu verkko
- WLAN salaustapa
- WLAN salasana
-
-
- Services
- Samba
- Käynnistä Samba käynnistyksen yhteydessä
-
-
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
deleted file mode 100644
index 9cd9007f61..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
- Système
- Clavier
- Clavier
- Clavier alternatif (facultatif)
- Mise à jour du système
- Mise à jour du système
- LCD/VFD
- Pilote LCD
-
-
- Réseau
- Réseau 2
- Général
- Nom d'hôte
- Réseau
- Type de réseau
- Interface réseau
- Paramètres IP
- Adresse IP statique
- Longueur du masque sous-réseau
- Passerelle Réseau
- Serveur DNS 1
- Serveur DNS 2
- Serveur DNS 3
- Paramètres WIFI
- SSID
- Réseau masqué
- Sécurité WIFI
- Passphrase
-
-
- Services
- Samba
- Lancer Samba au démarrage
- Utiliser un mot de passe Samba
- Utilisateur Samba
- Mot de passe Samba
-
-
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml
deleted file mode 100644
index c82173b6cb..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-System
-Tastatur
-Tastaturlayout
-Tastaturlayout #2
-System Aktualisierung
-System Aktualisierung
-LCD/VFD
-LCD Treiber
-
-
-Netzwerk
-Netzwerk 2
-Allgemein
-Gerätename
-Netzwerk Adapter
-Netzwerk Technologie
-Netzwerk Gerät
-IP Einstellungen
-Statische IP Adresse
-Netzmaske Präfixlänge
-Netzwerk Gateway
-DNS Server 1
-DNS Server 2
-DNS Server 3
-WLAN Einstellungen
-WLAN SSID
-Verstecktes Netzwerk
-WLAN Sicherheit
-WLAN Passwort
-
-
-Services
-Samba
-Starte Samba beim Booten
-
-
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Hungarian/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Hungarian/strings.xml
deleted file mode 100644
index d5a2c80b50..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Hungarian/strings.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
- Rendszer
- Billentyűzet
- Billentyű kiosztás
- Alternatív billentyű kiosztás (opcionális)
- Rendszer frissítés
- Rendszer frissítés
- LCD/VFD
- LCD meghajtóprogram használata
-
-
- Hálózat
- Hálózat 2
- Általános
- Hostnév
- Hálózati adapter
- Hálózati technológia
- Hálózati eszköz
- IP beállítások
- Statikus IP cím
- Hálózati maszk
- Hálózati átjáró
- DNS server 1
- DNS server 2
- DNS server 3
- WLAN beállítások
- WLAN azonosító
- Rejtett hálózat
- WLAN biztonság
- WLAN jelszó
-
-
- Services
- Samba
- Samba megosztás indítása bootoláskor
-
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml
deleted file mode 100644
index ce7475fffb..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
- System
- Tastatur
- Språklayout
- Språklayout #2
- Systemoppdateringer
- Systemoppdateringer
- LCD/VFD
- LCD Driver
-
-
- Nettverk
- Nettverk 2
- Generelt
- Vertsnavn
- Nettverkskort
- Overføringsteknologi
- Nettverksgrensesnitt
- IP instillinger
- Statisk IP adresse
- Nettverksprefix lengde
- Standard gateway
- Foretrukket DNS-server
- Alternativ DNS-server
- Alternativ DNS-server
- WLAN instillinger
- WLAN SSID
- Skjult Nettverk
- WLAN Sikkerhet
- WLAN Passord
-
-
- Services
- Samba
- Start Samba under oppstart
-
-
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Polish/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Polish/strings.xml
deleted file mode 100644
index bfb09306b7..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Polish/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
- System
- Klawiatura
- Układ klawiatury
- Alternatywny układ klawiatury (opcjonalny)
- Aktualizacja systemu
- Aktualizacja systemu
- LCD/VFD
- Sterownik LC
-
-
- Sieć
- Sieć 2
- Ogólne
- Nazwa hosta
- Karta sieciowa
- Typ sieci
- Interfejs sieciowy
- Ustawienia IP
- Statyczny adres IP
- Długość prefiksu maski sieci
- Brama sieci
- Serwer DNS 1
- Serwer DNS 2
- Serwer DNS 3
- Ustawienia WLAN
- WLAN SSID
- Śieć ukryta
- Zabezpieczenia sieci WLAN
- Hasło sieci WLAN
-
-
- Services
- Samba
- Uruchom Sambę przy starcie systemu
-
-
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Spanish/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Spanish/strings.xml
deleted file mode 100644
index 27d98faac3..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Spanish/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
- Sistema
- Teclado
- Disposición de teclas
- Disposición alternativa (opcional)
- Actualización del sistema
- Actualización del sistema
- LCD/VFD
- Controlador del LCD
-
-
- Red
- Red 2
- General
- Nombre de equipo
- Adaptador de red
- Tecnología de red
- Interfaz de red
- Parámetros IP
- Dirección IP fija
- Longitud de máscara de red
- Ruta por defecto
- Servidor DNS 1
- Servidor DNS 2
- Servidor DNS 3
- Parámetros WLAN (Wi-Fi)
- SSID WLAN
- Red oculta
- Seguridad WLAN
- Clave WLAN
-
-
- Services
- Samba
- Activar Samba al arranque
-
-
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Turkish/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Turkish/strings.xml
deleted file mode 100644
index df6a09fd66..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Turkish/strings.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
- Sistem
- Klavye
- Klavye düzeni
- Alternatif klavye düzeni (isteğe bağlı)
- Sistem Güncelleme
- Sistem Güncelleme
- LCD/VFD
- Kullanılacak LCD sürücüsü
-
-
- Ağ
- Ağ 2
- Genel
- Ana Bilgisayar Adı
- Ağ Bağdaştırıcısı
- Ağ Teknolojisi
- Ağ Arabirimi
- IP ayarları
- Statik IP adresi
- Ağ Maskesi Önek Uzunluğu
- Ağ geçidi
- DNS sunucu 1
- DNS sunucu 2
- DNS sunucu 3
- WLAN ayarları
- WLAN SSID
- Gizli Ağ
- WLAN Güvenliği
- WLAN Parolası
-
-
- Services
- Samba
- Samba'yı önyüklemede başlat
- Samba İçin Parola Kullan
- Samba Kullanıcı adı
- Samba Parolası
-
-
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
deleted file mode 100644
index dff77a8eee..0000000000
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/packages/mediacenter/xbmc-addon-settings/source/default.py b/packages/mediacenter/xbmc-addon-settings/unpack
old mode 100644
new mode 100755
similarity index 70%
rename from packages/mediacenter/xbmc-addon-settings/source/default.py
rename to packages/mediacenter/xbmc-addon-settings/unpack
index 378d6e1ba0..09ae905c23
--- a/packages/mediacenter/xbmc-addon-settings/source/default.py
+++ b/packages/mediacenter/xbmc-addon-settings/unpack
@@ -1,3 +1,5 @@
+#!/bin/sh
+
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -18,21 +20,10 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
-import os
-import sys
-import xbmcaddon
+. config/options $1
-__scriptname__ = "OpenELEC OS Settings Dialog"
-__author__ = "OpenELEC"
-__url__ = "http://www.openelec.tv"
-__svn_url__ = ""
-__credits__ = ""
-__version__ = "0.0.13"
-__XBMC_Revision__ = "22240"
+ZIP_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
+[ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
-__settings__ = xbmcaddon.Addon(id='os.openelec.settings')
-__language__ = __settings__.getLocalizedString
-__cwd__ = __settings__.getAddonInfo('path')
-
-if __name__ == "__main__":
- __settings__.openSettings()
+mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
+ unzip $SOURCES/$1/$ZIP_PKG -d $BUILD/${PKG_NAME}-${PKG_VERSION} >/dev/null 2>&1