Remove FEH

6 files changed, 0 insertions, 358 deletions

diff --git a/.gitignore b/.gitignore
index 696b04ca1c..fc288a31bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -493,8 +493,6 @@ lib/cpluff/stamp-h1
 /tools/Linux/kodi.sh
 /tools/Linux/kodi-standalone.sh
 /tools/Linux/kodi-xsession.desktop
-/tools/Linux/FEH-ARM.py
-/tools/Linux/FEH.py
 
 # /tools/osx
 /tools/osx/XBMCHelper
diff --git a/Makefile.in b/Makefile.in
index bab75a77a0..897c07592d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -601,7 +601,6 @@ install-scripts:
 	@cd $(DESTDIR)$(bindir); [ -L xbmc-standalone ] || [ -f xbmc-standalone ] ||  ln -s @APP_NAME_LC@-standalone xbmc-standalone
 	@install -d $(DESTDIR)$(datarootdir)/@APP_NAME_LC@
 	@cd $(DESTDIR)$(datarootdir); [ -L xbmc ] || [ -d xbmc ] || ln -s @APP_NAME_LC@ xbmc
-	@install -m 0644 tools/Linux/FEH.py $(DESTDIR)$(datarootdir)/@APP_NAME_LC@/FEH.py
 	@install -d $(DESTDIR)$(datarootdir)/xsessions
 	@install -m 0644 tools/Linux/@APP_NAME_LC@-xsession.desktop $(DESTDIR)$(datarootdir)/xsessions/@APP_NAME_LC@.desktop
 	@cd $(DESTDIR)$(datarootdir)/xsessions; [ -L xbmc.desktop ] || [ -f xbmc.desktop ] || ln -s @APP_NAME_LC@.desktop xbmc.desktop
diff --git a/configure.in b/configure.in
index 9db91c736c..20e0a2372c 100644
--- a/configure.in
+++ b/configure.in
@@ -2519,8 +2519,6 @@ OUTPUT_FILES="Makefile \
     tools/Linux/${APP_NAME_LC}.sh \
     tools/Linux/${APP_NAME_LC}-standalone.sh \
     tools/Linux/${APP_NAME_LC}-xsession.desktop \
-    tools/Linux/FEH.py \
-    tools/Linux/FEH-ARM.py \
     tools/EventClients/Makefile \
     tools/EventClients/Clients/OSXRemote/Makefile \
     xbmc/peripherals/bus/Makefile \
diff --git a/tools/Linux/FEH-ARM.py.in b/tools/Linux/FEH-ARM.py.in
deleted file mode 100644
index e92dea68f9..0000000000
--- a/tools/Linux/FEH-ARM.py.in
+++ /dev/null
@@ -1,173 +0,0 @@
-import os
-import sys
-import re
-
-AvailableOutputs = []
-Output = None
-
-try:
-    from qt import *
-    AvailableOutputs.append("--error-output=Qt")
-except:
-    pass
-try:
-    import pygtk
-    pygtk.require('2.0')
-    import gtk
-    AvailableOutputs.append("--error-output=GTK")
-except:
-    pass
-try:
-    import pygame
-    import datetime
-    AvailableOutputs.append("--error-output=SDL")
-except:
-    pass
-
-def error(errorLine):
-    if Output == "--error-output=Qt":
-        createQt(errorLine)
-    elif Output == "--error-output=GTK":
-        createGTK(errorLine)
-    elif Output == "--error-output=SDL":
-        createSDL(errorLine)
-    else:
-        print errorLine
-
-    exit(1)
-
-def createQt(errorLine):
-    app = QApplication(sys.argv)
-    QObject.connect(app, SIGNAL('lastWindowClosed()')
-                       , app
-                       , SLOT('quit()')
-                       )
-    
-    dialog = QDialog(None, "Error", 0, 0)
-    dialog.setCaption(dialog.tr("Error"))
-    layout=QVBoxLayout(dialog)
-    layout.setSpacing(6)
-    layout.setMargin(5)
-
-    label=QLabel(errorLine, dialog)
-
-    layout.addWidget(label)
-
-    bnExit=QPushButton("Quit", dialog, "add")
-    dialog.connect(bnExit, SIGNAL("clicked()"), qApp, SLOT("quit()"))
-
-    layout.addWidget(bnExit)
-
-    app.setMainWidget(dialog)
-    dialog.show()
-    app.exec_loop()
-
-def createGTK(errorLine):
-    window = gtk.Window(gtk.WINDOW_TOPLEVEL)
-    window.connect("destroy", lambda w: gtk.main_quit())
-
-    window.set_title("Error")
-    vbox = gtk.VBox(False, 5)
-    window.add(vbox)
-    window.set_border_width(5)
-
-    frame = gtk.Frame()
-    frame.set_shadow_type(gtk.SHADOW_NONE)
-    label = gtk.Label(errorLine)
-    frame.add(label)
-    vbox.pack_start(frame, False, False, 0)
-
-    button = gtk.Button("Quit")
-    button.connect_object("clicked", gtk.Widget.destroy, window)
-
-    vbox.pack_start(button, False, False, 0)
-
-    window.show_all ()
-
-    gtk.main()
-
-def createSDL(errorLine):
-    pygame.init()
-    pygame.font.init()
-    pygame.display.set_caption("Error")
-
-    size = width, height = 800, 600
-    speed = [2, 2]
-    black = 0, 0, 0
-
-    screen = pygame.display.set_mode(size)
-    font = pygame.font.Font(None, 32)
-
-    autoQuit = 10
-    start = datetime.datetime.now()
-    finish = datetime.datetime.now()
-    delta = finish - start
-    while delta.seconds < autoQuit:
-        for event in pygame.event.get():
-            if event.type == pygame.QUIT or event.type == pygame.KEYDOWN:
-                sys.exit()
-
-        screen.fill(black)
-
-        place = [200, 200]
-        for line in errorLine.split('\n'):
-            text = font.render(line, 1, (255,255,255) )
-            place[1] += font.size(line)[1]
-            screen.blit(text, text.get_rect().move(place))
-            
-
-        quitline = "Press any button to continue ("
-        quitline += str(autoQuit - delta.seconds)
-        quitline += ")"
-        text = font.render(quitline, 1, (255,255,255) )
-        screen.blit(text, text.get_rect().move(200,400))
-
-        pygame.display.flip()
-
-        finish = datetime.datetime.now()
-        delta = finish - start
-
-def badDirectRendering():
-    out = os.popen("glxinfo | grep \"direct rendering\"", 'r')
-    line = out.read()
-    direct = "Yes" not in line
-    out.close()
-
-    return direct
-
-def badColorDepth():
-    out = os.popen('xdpyinfo | grep "depth of root"', 'r')
-    
-    p = re.compile("([0-9]*) planes")
-    for line in out.readlines():
-        match = p.search(line)
-        if (match is not None):
-            if int(match.group(1)) >= 16:
-                bitDepth = False
-            else:
-                bitDepth = True
-    out.close()
-
-    return bitDepth
-
-def possibleOutput(text):
-    return text in sys.argv and text in AvailableOutputs
-
-if __name__=="__main__":
-    if len(AvailableOutputs) > 0:
-        Output = AvailableOutputs[0]
-    else:
-        Output = None
-
-    for text in sys.argv:
-        if possibleOutput(text):
-            Output = text
-
-    if "--no-test" in sys.argv:
-        exit(0)
-
-    if (@USE_X11@ == 1 and @USE_OPENGL@ == 1 and badDirectRendering()):
-        error("@APP_NAME@ needs hardware accelerated OpenGL rendering.\nInstall an appropriate graphics driver.\n\nPlease consult @APP_NAME@ Wiki for supported hardware\nhttp://xbmc.org/wiki/?title=Supported_hardware")
-
-    if (@USE_X11@ == 1 and badColorDepth()):
-        error("@APP_NAME@ cannot run unless the\nscreen color depth is atleast 24 bit.\n\nPlease reconfigure your screen.")
diff --git a/tools/Linux/FEH.py.in b/tools/Linux/FEH.py.in
deleted file mode 100644
index 7d220c06a9..0000000000
--- a/tools/Linux/FEH.py.in
+++ /dev/null
@@ -1,175 +0,0 @@
-import os
-import sys
-import re
-
-AvailableOutputs = []
-Output = None
-
-try:
-    from qt import *
-    AvailableOutputs.append("--error-output=Qt")
-except:
-    pass
-try:
-    import pygtk
-    pygtk.require('2.0')
-    import gtk
-    AvailableOutputs.append("--error-output=GTK")
-except:
-    pass
-try:
-    import pygame
-    import datetime
-    AvailableOutputs.append("--error-output=SDL")
-except:
-    pass
-
-def error(errorLine):
-    if Output == "--error-output=Qt":
-        createQt(errorLine)
-    elif Output == "--error-output=GTK":
-        createGTK(errorLine)
-    elif Output == "--error-output=SDL":
-        createSDL(errorLine)
-    else:
-        try:
-            print(errorLine)
-        except:
-            print(errorLine)
-
-    exit(1)
-
-def createQt(errorLine):
-    app = QApplication(sys.argv)
-    QObject.connect(app, SIGNAL('lastWindowClosed()')
-                       , app
-                       , SLOT('quit()')
-                       )
-
-    dialog = QDialog(None, "Error", 0, 0)
-    dialog.setCaption(dialog.tr("Error"))
-    layout=QVBoxLayout(dialog)
-    layout.setSpacing(6)
-    layout.setMargin(5)
-
-    label=QLabel(errorLine, dialog)
-
-    layout.addWidget(label)
-
-    bnExit=QPushButton("Quit", dialog, "add")
-    dialog.connect(bnExit, SIGNAL("clicked()"), qApp, SLOT("quit()"))
-
-    layout.addWidget(bnExit)
-
-    app.setMainWidget(dialog)
-    dialog.show()
-    app.exec_loop()
-
-def createGTK(errorLine):
-    window = gtk.Window(gtk.WINDOW_TOPLEVEL)
-    window.connect("destroy", lambda w: gtk.main_quit())
-
-    window.set_title("Error")
-    vbox = gtk.VBox(False, 5)
-    window.add(vbox)
-    window.set_border_width(5)
-
-    frame = gtk.Frame()
-    frame.set_shadow_type(gtk.SHADOW_NONE)
-    label = gtk.Label(errorLine)
-    frame.add(label)
-    vbox.pack_start(frame, False, False, 0)
-
-    button = gtk.Button("Quit")
-    button.connect_object("clicked", gtk.Widget.destroy, window)
-
-    vbox.pack_start(button, False, False, 0)
-
-    window.show_all ()
-
-    gtk.main()
-
-def createSDL(errorLine):
-    pygame.init()
-    pygame.font.init()
-    pygame.display.set_caption("Error")
-
-    size = width, height = 800, 600
-    speed = [2, 2]
-    black = 0, 0, 0
-
-    screen = pygame.display.set_mode(size)
-    font = pygame.font.Font(None, 32)
-
-    autoQuit = 10
-    start = datetime.datetime.now()
-    finish = datetime.datetime.now()
-    delta = finish - start
-    while delta.seconds < autoQuit:
-        for event in pygame.event.get():
-            if event.type == pygame.QUIT or event.type == pygame.KEYDOWN:
-                sys.exit()
-
-        screen.fill(black)
-
-        place = [200, 200]
-        for line in errorLine.split('\n'):
-            text = font.render(line, 1, (255,255,255) )
-            place[1] += font.size(line)[1]
-            screen.blit(text, text.get_rect().move(place))
-
-
-        quitline = "Press any button to continue ("
-        quitline += str(autoQuit - delta.seconds)
-        quitline += ")"
-        text = font.render(quitline, 1, (255,255,255) )
-        screen.blit(text, text.get_rect().move(200,400))
-
-        pygame.display.flip()
-
-        finish = datetime.datetime.now()
-        delta = finish - start
-
-def badDirectRendering():
-    out = os.popen("glxinfo | grep \"direct rendering\"", 'r')
-    line = out.read()
-    direct = "Yes" not in line
-    out.close()
-
-    return direct
-
-def badColorDepth():
-    out = os.popen('xdpyinfo | grep "depth of root"', 'r')
-    p = re.compile("([0-9]*) planes")
-    for line in out.readlines():
-        match = p.search(line)
-        if (match is not None):
-            if int(match.group(1)) > 16:
-                bitDepth = False
-            else:
-                bitDepth = True
-    out.close()
-
-    return bitDepth
-
-def possibleOutput(text):
-    return text in sys.argv and text in AvailableOutputs
-
-if __name__=="__main__":
-    if len(AvailableOutputs) > 0:
-        Output = AvailableOutputs[0]
-    else:
-        Output = None
-
-    for text in sys.argv:
-        if possibleOutput(text):
-            Output = text
-
-    if "--no-test" in sys.argv:
-        exit(0)
-
-    if (@USE_X11@ == 1 and @USE_OPENGL@ == 1 and badDirectRendering()):
-        error("@APP_NAME@ needs hardware accelerated OpenGL rendering.\nInstall an appropriate graphics driver.\n\nPlease consult @APP_NAME@ Wiki for supported hardware\nhttp://kodi.wiki/view/Supported_hardware")
-
-    if (@USE_X11@ == 1 and badColorDepth()):
-        error("@APP_NAME@ cannot run unless the\nscreen color depth is atleast 24 bit.\n\nPlease reconfigure your screen.")
diff --git a/tools/Linux/kodi.sh.in b/tools/Linux/kodi.sh.in
index 35dee2c323..43290f81d9 100644
--- a/tools/Linux/kodi.sh.in
+++ b/tools/Linux/kodi.sh.in
@@ -138,11 +138,6 @@ print_crash_report()
 }
 
 migrate_home
-python @datadir@/${bin_name}/FEH.py $SAVED_ARGS
-RET=$?
-if [ $RET -ne 0 ]; then
-  exit $RET
-fi
 
 if command_exists gdb; then
   # Output warning in case ulimit is unsupported by shell