Fixed imports

This commit is contained in:
Mathieu Comandon 2010-05-13 12:20:28 +02:00
parent f5de7add0b
commit 3d9a02bde6
58 changed files with 313 additions and 195 deletions

View file

@ -1 +1,2 @@
nbproject
build

View file

@ -1,4 +1,4 @@
project = lutris
template = ubuntu-application
lp_id = lutris
version = 0.4.1
version = 0.4.2

View file

@ -2,7 +2,18 @@
#
# -*- coding: utf-8 -*-
### BEGIN LICENSE
# This file is in the public domain
# Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
# by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranties of
# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
### END LICENSE
import apport

View file

@ -2,17 +2,17 @@
# -*- coding: utf-8 -*-
### BEGIN LICENSE
# Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>
#This program is free software: you can redistribute it and/or modify it
#under the terms of the GNU General Public License version 3, as published
#by the Free Software Foundation.
#
#This program is distributed in the hope that it will be useful, but
#WITHOUT ANY WARRANTY; without even the implied warranties of
#MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
# by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranties of
# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
### END LICENSE
import sys
@ -40,11 +40,11 @@ else:
fullPath = os.getcwd()
sys.path.insert(0, os.path.dirname(fullPath))
from coverflow import coverflow
from lutris.gui import dictionary_grid
import runners
from lutris import constants
from lutris import AboutLutrisDialog
from lutris.coverflow.coverflow import coverflow
from lutris.gui.dictionary_grid import DictionaryGrid
import lutris.runners
import lutris.constants
from lutris.AboutLutrisDialog import AboutLutrisDialog , NewAboutLutrisDialog
from lutris.game import LutrisGame
from lutris.config import LutrisConfig
from lutris.gui.ftpdialog import FtpDialog
@ -120,7 +120,7 @@ class LutrisWindow(gtk.Window):
#Game list
self.game_list = self.get_game_list()
self.game_list_grid_view = dictionary_grid.DictionaryGrid(self.game_list,["Game Name","Runner"])
self.game_list_grid_view = DictionaryGrid(self.game_list,["Game Name","Runner"])
self.game_list_grid_view.connect('row-activated',self.game_launch)
self.game_list_grid_view.connect("cursor-changed", self.select_game)
self.game_list_grid_view.connect("button-press-event", self.mouse_menu)
@ -154,9 +154,9 @@ class LutrisWindow(gtk.Window):
def get_game_list(self):
game_list = []
for file in os.listdir(constants.game_config_path):
if file.endswith(constants.config_extension):
game_name = file[:len(file)-len(constants.config_extension)]
for file in os.listdir(lutris.constants.game_config_path):
if file.endswith(lutris.constants.config_extension):
game_name = file[:len(file)-len(lutris.constants.config_extension)]
Game = LutrisGame(game_name)
if not Game.load_success:
message = "Error while loading configuration for %s" % game_name
@ -171,7 +171,7 @@ class LutrisWindow(gtk.Window):
def about(self, widget, data=None):
"""about - display the about box for lutris """
about = AboutLutrisDialog.NewAboutLutrisDialog()
about = NewAboutLutrisDialog()
response = about.run()
about.destroy()
@ -224,7 +224,7 @@ class LutrisWindow(gtk.Window):
mount_iso_dialog = MountIsoDialog()
def on_fullscreen_clicked(self,widget):
game = coverflow.coverflow()
game = lutris.coverflow.coverflow.coverflow()
if game:
if game == "NOCOVERS":
logging.error("Add some covers to these games first !")
@ -253,7 +253,7 @@ class LutrisWindow(gtk.Window):
self.game_list_grid_view.append_row(game_info)
def import_cedega(self,widget,data=None):
cedega = runners.cedega.cedega()
cedega = lutris.runners.cedega.cedega()
cedega.import_games()
self.get_game_list()
@ -261,7 +261,7 @@ class LutrisWindow(gtk.Window):
logging.debug("Import from steam not yet implemented")
def import_scummvm(self,widget,data=None):
scummvm = runners.scummvm.scummvm()
scummvm = lutris.runners.scummvm.scummvm()
scummvm.import_games()
games = self.get_game_list()
current_game_names = []
@ -306,7 +306,7 @@ class LutrisWindow(gtk.Window):
if self.gameName:
extensions = ["png", "jpg", "jpeg"]
for extension in extensions:
coverFile = os.path.join(constants.cover_path, self.gameName + "." + extension)
coverFile = os.path.join(lutris.constants.cover_path, self.gameName + "." + extension)
if os.path.exists(coverFile):
#Resize the image
cover_pixbuf = gtk.gdk.pixbuf_new_from_file(coverFile)

View file

@ -1,10 +1,21 @@
<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-requires about_lutris_dialog 1.0 -->
<!-- interface-naming-policy project-wide -->
<requires lib="gtk+" version="2.16" />
<object class="AboutLutrisDialog" id="about_lutris_dialog">
<property name="border_width">5</property>
<property name="version">0.2-public5</property><property name="license" translatable="yes"># Copyright (C) 2010 Mathieu Comandon &lt;strycore@gmail.com&gt;
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
# by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranties of
# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
</property><property name="authors">Copyright (C) 2010 Mathieu Comandon &lt;strycore@gmail.com&gt;</property><property name="copyright" translatable="yes">Copyright (C) 2010 Mathieu Comandon &lt;strycore@gmail.com&gt;</property><property name="border_width">5</property>
<property name="icon">../media/icon.png</property>
<property name="type_hint">normal</property>
<property name="has_separator">False</property>
@ -15,7 +26,7 @@
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<placeholder/>
<placeholder />
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area1">
@ -31,4 +42,4 @@
</object>
</child>
</object>
</interface>
</interface>

30
debian/changelog vendored
View file

@ -1,3 +1,33 @@
lutris (0.2-public5) lucid; urgency=low
* New release.
-- Mathieu Comandon <strycore@gmail.com> Thu, 13 May 2010 12:17:40 +0200
lutris (0.2-public4) lucid; urgency=low
* New release.
-- Mathieu Comandon <strycore@gmail.com> Thu, 13 May 2010 12:17:12 +0200
lutris (0.2-public3) lucid; urgency=low
* New release.
-- Mathieu Comandon <strycore@gmail.com> Thu, 13 May 2010 12:12:32 +0200
lutris (0.2-public2) lucid; urgency=low
* New release.
-- Mathieu Comandon <strycore@gmail.com> Thu, 13 May 2010 12:08:40 +0200
lutris (0.2-public2) lucid; urgency=low
* New release.
-- Mathieu Comandon <strycore@gmail.com> Thu, 13 May 2010 12:08:14 +0200
lutris (0.2~public2) lucid; urgency=low
* New release.

3
debian/control vendored
View file

@ -4,7 +4,7 @@ Priority: extra
Build-Depends: cdbs (>= 0.4.43),
debhelper (>= 6),
python,
python-central (>= 0.6.11),
python-support (>= 0.6.4),
python-distutils-extra (>= 2.10)
Maintainer: Mathieu Comandon <strycore@gmail.com>
Standards-Version: 3.8.2
@ -15,6 +15,7 @@ Architecture: all
XB-Python-Version: ${python:Versions}
Depends: ${misc:Depends},
${python:Depends},
python-apport,
python-gobject,
python-apt,
python-gtk2,

View file

@ -1,17 +1,17 @@
# -*- coding: utf-8 -*-
### BEGIN LICENSE
# Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>
#This program is free software: you can redistribute it and/or modify it
#under the terms of the GNU General Public License version 3, as published
#by the Free Software Foundation.
#
#This program is distributed in the hope that it will be useful, but
#WITHOUT ANY WARRANTY; without even the implied warranties of
#MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
# by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranties of
# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
### END LICENSE
import sys
@ -19,7 +19,7 @@ import os
import gtk
from lutris.lutrisconfig import getdatapath
from lutris import constants
import lutris.constants
class AboutLutrisDialog(gtk.AboutDialog):
__gtype_name__ = "AboutLutrisDialog"
@ -48,15 +48,15 @@ class AboutLutrisDialog(gtk.AboutDialog):
#code for other initialization actions should be added here
self.set_position(gtk.WIN_POS_CENTER)
self.set_icon_from_file(constants.lutris_icon_path)
self.set_logo(gtk.gdk.pixbuf_new_from_file(constants.lutris_icon_path))
self.set_name(constants.name)
self.set_version(constants.version)
self.set_copyright(constants.copyright)
self.set_license(constants.license)
self.set_authors(constants.authors)
self.set_artists(constants.artists)
self.set_website(constants.website)
self.set_icon_from_file(lutris.constants.lutris_icon_path)
self.set_logo(gtk.gdk.pixbuf_new_from_file(lutris.constants.lutris_icon_path))
self.set_name(lutris.constants.name)
self.set_version(lutris.constants.version)
self.set_copyright(lutris.constants.copyright)
self.set_license(lutris.constants.license)
self.set_authors(lutris.constants.authors)
self.set_artists(lutris.constants.artists)
self.set_website(lutris.constants.website)
def NewAboutLutrisDialog():
"""NewAboutLutrisDialog - returns a fully instantiated

View file

@ -22,7 +22,7 @@
import gtk
import runners
import lutris.runners
import os
import logging
from lutris.config import LutrisConfig
@ -52,7 +52,7 @@ class AddGameDialog(gtk.Dialog):
runner_liststore = gtk.ListStore(str,str)
runner_liststore.append(("Choose a runner for the list",""))
for runner_cls in runners.__all__:
runner = eval("runners."+runner_cls+"."+runner_cls+"()")
runner = eval("lutris.runners."+runner_cls+"."+runner_cls+"()")
if hasattr(runner,"description"):
description = runner.description
else:

View file

@ -24,7 +24,7 @@ import yaml
import os
import logging
import copy
import constants as constants
import lutris.constants as constants
class LutrisConfig():
def __init__(self,runner=None,game=None):

View file

@ -38,8 +38,8 @@ try:
from pyglet import window
#from pyglet import clock
PYGLET_ENABLED = True
import covergl
import anim
import lutris.coverflow.covergl
import lutris.coverflow.anim
except ImportError,msg:
print "Pyglet Error: %s" % str(msg)
PYGLET_ENABLED = False
@ -105,23 +105,23 @@ def coverflow():
def on_resize(w, h):
# Override the default on_resize handler to create a 3D projection
glViewport (0, 0, w, h)
covergl.change_projection(True, w, h)
lutris.coverflow.covergl.change_projection(True, w, h)
glClear(GL_COLOR_BUFFER_BIT)
setup()
covergl.setup_values()
lutris.coverflow.covergl.setup_values()
w.clicked = False
for i, fname in enumerate(filenames):
cover = covergl.Cover(2.0, fname, angle=-70)
cover = lutris.coverflow.covergl.Cover(2.0, fname, angle=-70)
x = i*0.75
cover.fX.set(x)
covers.append(cover)
tracks.append(x)
covers[0].focus()
advance = covergl.mk_advance(tracks, covers)
advance = lutris.coverflow.covergl.mk_advance(tracks, covers)
@w.event
def on_key_press(symbol, modifiers):
if symbol == window.key.LEFT: advance(True)
@ -161,12 +161,12 @@ def coverflow():
def on_draw():
w.clear()
w.dispatch_events()
covergl.display(w.width, w.height, covers)
lutris.coverflow.covergl.display(w.width, w.height, covers)
w.flip()
clock = pyglet.clock.get_default()
clock.set_fps_limit(60)
clock.schedule(anim.add_time)
clock.schedule(lutris.coverflow.anim.add_time)
pyglet.app.run()
if w.clicked:
return filenames[advance.i]

View file

@ -5,7 +5,7 @@ except ImportError,msg:
print msg
PYGLET_ENABLED = False
#from PIL import Image
import anim
import lutris.coverflow.anim
_glGenTextures = glGenTextures
def glGenTextures(i):
@ -36,8 +36,8 @@ afValues = []
def setup_values():
global pValueCoverAngle, pValueCoverTrack, pValueCoverAlpha, pValueCoverBounce
# set some animation variables */
pValueCoverTrack = anim.animate(start=0, end=0, dt=.5, method="sine")
pValueCoverAlpha = anim.animate(start=0, end=1., dt=2., method="exponential")
pValueCoverTrack = lutris.coverflow.anim.animate(start=0, end=0, dt=.5, method="sine")
pValueCoverAlpha = lutris.coverflow.anim.animate(start=0, end=1., dt=2., method="exponential")
def mk_advance(tracks, covers):
def advance(reverse=True):
@ -179,10 +179,10 @@ class Cover(object):
self.z_base = -5
self.z_focus = -2
self.y_base = self.fHeight/0.5 - 1
self.fX = anim.ConstantAnimator(0)
self.fY = anim.ConstantAnimator(0)
self.fZ = anim.animate(start=self.z_base, end=self.z_base, dt=.5, method="ease_out_back")
self.fAngle = anim.animate(start=angle, end=angle, dt=.5, method="ease_out_circ")
self.fX = lutris.coverflow.anim.ConstantAnimator(0)
self.fY = lutris.coverflow.anim.ConstantAnimator(0)
self.fZ = lutris.coverflow.anim.animate(start=self.z_base, end=self.z_base, dt=.5, method="ease_out_back")
self.fAngle = lutris.coverflow.anim.animate(start=angle, end=angle, dt=.5, method="ease_out_circ")
self.fAlpha = pValueCoverAlpha
self.current = False
def __del__(self):

View file

@ -29,7 +29,7 @@ import os,time
from lutris.config import LutrisConfig
from lutris.thread import LutrisThread
from lutris.desktop_control import LutrisDesktopControl
from runners import *
from lutris.runners import *
from lutris.constants import *
class LutrisGame():

View file

@ -20,7 +20,7 @@
###############################################################################
import gtk
import runners
import lutris.runners
from lutris.config_vbox import ConfigVBox
class GameConfigVBox(ConfigVBox):
@ -29,7 +29,7 @@ class GameConfigVBox(ConfigVBox):
self.lutris_config = lutris_config
self.lutris_config.config_type = "game"
self.runner_class = self.lutris_config.runner
runner = eval("runners."+self.runner_class+"."+self.runner_class+"()")
runner = eval("lutris.runners."+self.runner_class+"."+self.runner_class+"()")
if hasattr(runner,"game_options"):
self.options = runner.game_options
else:

View file

@ -18,11 +18,8 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
__author__="strider"
__date__ ="$28 nov. 2009 05:29:44$"
from tool.url_tool import UrlTool
from tool.re_tool import RE_tool
from lutris.tool.url_tool import UrlTool
from lutris.tool.re_tool import RE_tool
import urllib2
import logging
import os
@ -38,14 +35,14 @@ class GoogleImage():
self.url_tool = UrlTool()
self.url_tool.local = False
self.fetch_count = 0
# "Everybody stand back"
# "I know regular expressions"
# Python ! *tap* *tap*
# "Wait, forgot to escape a space." Wheeeeee[taptaptap]eeeeee.
self.webpage = self.url_tool.read_html("http://images.google.fr/images?q="+urllib2.quote(search_string)+"&oe=utf-8&rls=com.ubuntu:fr:official&client=firefox-a&um=1&ie=UTF-8&sa=N&hl=en&tab=wi")
def scan_for_images(self,dest):
re_tool = RE_tool()
# "Everybody stand back"
# "I know regular expressions"
# Python ! *tap* *tap*
# "Wait, forgot to escape a space." Wheeeeee[taptaptap]eeeeee.
images = re_tool.findall("\[\"/imgres\?imgurl\\\\x3d(.*?)\\\\x26imgrefurl\\\\x3d(.*?)\\\\x3d1\",\"\",\"(.*?)\".*?http://(.*?)(\d+ x \d+ - \d+[bkm]).*?\"(.*?)\".*?http://(.*?)\",.*?\]", self.webpage)
self.google_results = []
index = 0

View file

@ -1,7 +1,7 @@
import gtk
import gobject
from grid_column import StringColumn, CurrencyColumn, CheckColumn
from grid_column import IntegerColumn, TagsColumn
from lutris.gui.grid_column import StringColumn, CurrencyColumn, CheckColumn
from lutris.gui.grid_column import IntegerColumn, TagsColumn
def get_column(key, index, dictionary_index, editable):
if key.lower() == "id":

View file

@ -1,24 +1,24 @@
# -*- coding: utf-8 -*-
### BEGIN LICENSE
# Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>
#This program is free software: you can redistribute it and/or modify it
#under the terms of the GNU General Public License version 3, as published
#by the Free Software Foundation.
#
#This program is distributed in the hope that it will be useful, but
#WITHOUT ANY WARRANTY; without even the implied warranties of
#MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
# by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranties of
# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
### END LICENSE
"""A Treeview for Dictionaries"""
import gtk
import gobject
import conventions
from grid_column import StringColumn
from lutris.gui.conventions import *
from lutris.gui.grid_column import StringColumn
class DictionaryGrid(gtk.TreeView):
def __init__(self, dictionaries=None, keys=None, type_hints=None):
@ -244,7 +244,7 @@ class DictionaryGrid(gtk.TreeView):
column = self.__type_hints[k](k,i,len(self.keys))
else:
#no column supplied, use conventions to get a column
column = conventions.get_column(k,i,len(self.keys), self.editable)
column = get_column(k,i,len(self.keys), self.editable)
#add the created column, and remember it's key
self.append_column(column)

View file

@ -1,6 +1,17 @@
# -*- coding: utf-8 -*-
### BEGIN LICENSE
# This file is in the public domain
# Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
# by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranties of
# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
### END LICENSE
"""Helpers for an Ubuntu application."""

View file

@ -20,7 +20,7 @@
###############################################################################
import gtk
import runners
import lutris.runners
from lutris.config_vbox import ConfigVBox
class InstallerConfigVBox(ConfigVBox):
@ -29,7 +29,7 @@ class InstallerConfigVBox(ConfigVBox):
self.lutris_config = lutris_config
self.lutris_config.config_type = "game"
self.runner_class = self.lutris_config.runner
runner = eval("runners."+self.runner_class+"."+self.runner_class+"()")
runner = eval("lutris.runners."+self.runner_class+"."+self.runner_class+"()")
if hasattr(runner,"installer_options"):
self.options = runner.installer_options
else:

View file

@ -22,7 +22,7 @@
import gtk
import runners
import lutris.runners
import os
import logging
import subprocess
@ -53,7 +53,7 @@ class InstallerDialog(gtk.Dialog):
runner_liststore = gtk.ListStore(str,str)
runner_liststore.append(("Choose a runner for the list",""))
for runner_cls in runners.__all__:
runner = eval("runners."+runner_cls+"."+runner_cls+"()")
runner = eval("lutris.runners."+runner_cls+"."+runner_cls+"()")
if hasattr(runner,"description"):
description = runner.description
else:
@ -118,7 +118,7 @@ class InstallerDialog(gtk.Dialog):
self.lutris_config.config["runner"] = self.runner_class
#Run the installer
runner = eval("runners."+self.runner_class+"."+self.runner_class+"()")
runner = eval("lutris.runners."+self.runner_class+"."+self.runner_class+"()")
self.lutris_config.update_global_config()
command = runner.get_install_command(self.lutris_config.config["game"]["installer"])
#command = runner.get_install_command()

View file

@ -1,17 +1,17 @@
# -*- coding: utf-8 -*-
### BEGIN LICENSE
# Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>
#This program is free software: you can redistribute it and/or modify it
#under the terms of the GNU General Public License version 3, as published
#by the Free Software Foundation.
#
#This program is distributed in the hope that it will be useful, but
#WITHOUT ANY WARRANTY; without even the implied warranties of
#MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
# by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranties of
# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
### END LICENSE
# THIS IS Lutris CONFIGURATION FILE
@ -21,7 +21,7 @@
# where your project will head for your data (for instance, images and ui files)
# by default, this is ../data, relative your trunk layout
__lutris_data_directory__ = '../data/'
__lutris_data_directory__ = '/usr/share/lutris/'
__license__ = 'GPL-3'

View file

@ -19,7 +19,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
import runners
import lutris.runners
from lutris.config_vbox import ConfigVBox
import gtk
@ -27,7 +27,7 @@ class RunnerConfigVBox(ConfigVBox):
def __init__(self,lutris_config,caller):
runner = lutris_config.runner
ConfigVBox.__init__(self,runner,caller)
runner_instance = eval("runners."+runner+"."+runner+"()")
runner_instance = eval("lutris.runners."+runner+"."+runner+"()")
if hasattr(runner_instance, "runner_options"):
self.options = runner_instance.runner_options
else:

View file

@ -19,7 +19,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
from lutris.desktop_control import LutrisDesktopControl
import os
import os.path

View file

@ -20,7 +20,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
class browser(Runner):
'''Runner for browser games'''

View file

@ -20,7 +20,7 @@
###############################################################################
from lutris.config import LutrisConfig
from runners.runner import Runner
from lutris.runners.runner import Runner
import ConfigParser
import os

View file

@ -19,7 +19,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
class dosbox(Runner):
'''Runner for MSX games'''

View file

@ -20,7 +20,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
class frotz(Runner):
'''Runner for z-code games such as Zork'''

View file

@ -19,7 +19,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
import os.path
class gens(Runner):

View file

@ -19,7 +19,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
class hatari(Runner):
'''Runner for intellivision games'''

View file

@ -19,7 +19,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
import os.path
class jzintv(Runner):
'''Runner for intellivision games'''

View file

@ -22,7 +22,7 @@ import os.path
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
import os
import stat

View file

@ -19,11 +19,10 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
import os
import subprocess
from runner import Runner
from lutris.runners.runner import Runner
from lutris.desktop_control import LutrisDesktopControl
import subprocess
import os
class mednafen(Runner):
def __init__(self,settings=None):

View file

@ -4,7 +4,7 @@ Created on Apr 25, 2009
@author: strider
'''
from wine import wine
from lutris.runners.wine import wine
import os
class nulldc(wine):

View file

@ -20,7 +20,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
import os.path
class o2em(Runner):
'''Runner for MSX games'''

View file

@ -19,7 +19,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
class openmsx(Runner):
'''Runner for MSX games'''

View file

@ -19,7 +19,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
class osmose(Runner):
'''Runner for intellivision games'''

View file

@ -20,7 +20,7 @@
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
class pcsx(Runner):
def __init__(self,settings = None):

View file

@ -19,12 +19,12 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
import os
import subprocess
from runner import Runner
from ConfigParser import ConfigParser
from lutris.runners.runner import Runner
from lutris.config import LutrisConfig
from lutris.constants import *
from ConfigParser import ConfigParser
import os
import subprocess
class scummvm(Runner):
def __init__(self,settings=None):

View file

@ -22,7 +22,7 @@ import os.path
import os
import subprocess
from runner import Runner
from lutris.runners.runner import Runner
class sdlmame(Runner):
def __init__(self,settings=None):

View file

@ -20,7 +20,7 @@
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
class snes9x(Runner):
def __init__(self,settings = None):

View file

@ -1,11 +1,28 @@
# To change this template, choose Tools | Templates
# and open the template in the editor.
# -*- coding:Utf-8 -*-
###############################################################################
## Lutris
##
## Copyright (C) 2009 Mathieu Comandon strycore@gmail.com
##
## 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 3 of the License, 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 this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from wine import wine
from runners.runner import Runner
from lutris.runners.runner import Runner
from lutris.runners.wine import wine
import os
__author__ = "strider"
__date__ = "$Oct 6, 2009 12:23:49 PM$"
class steam(Runner):
def __init__(self,settings = None):

View file

@ -20,7 +20,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
class stella(Runner):
'''Runner for stella Atari 2600 emulator'''

View file

@ -20,7 +20,7 @@
###############################################################################
import os
from runner import Runner
from lutris.runners.runner import Runner
class uae(Runner):
def __init__(self,settings = None):

36
lutris/runners/vavoom.py Executable file
View file

@ -0,0 +1,36 @@
# -*- coding:Utf-8 -*-
###############################################################################
## Lutris
##
## Copyright (C) 2009 Mathieu Comandon strycore@gmail.com
##
## 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 3 of the License, 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 this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from lutris.runners.runner import Runner
class vavoom(Runner):
def __init__(self,settings=None):
self.executable = "vavoom"
self.package = None
self.description = "Runs games based on the Doom engine like Doom, Hexen, Heretic"
self.machine = "Games based on the Doom engine"
if settings:
self.wad = settings["main"]["wad"]
def play(self):
return [self.executable,self.gfxmode,self.wad]

View file

@ -20,7 +20,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
###############################################################################
from runner import Runner
from lutris.runners.runner import Runner
class vice(Runner):
'''Runner for MSX games'''

View file

@ -22,7 +22,7 @@
import os
import logging
import lutris.constants
from runner import Runner
from lutris.runners.runner import Runner
class wine(Runner):
def __init__(self,settings = None):
self.executable = "wine"

View file

@ -1,4 +1,4 @@
import runners
import lutris.runners
import gtk
from lutris.runner_config_dialog import RunnerConfigDialog
@ -20,7 +20,7 @@ class RunnersDialog(gtk.Dialog):
for runner in runner_list:
hbox = gtk.HBox()
#Label
runner_instance = eval("runners."+runner+"."+runner+"()")
runner_instance = eval("lutris.runners."+runner+"."+runner+"()")
machine = runner_instance.machine
runner_label = gtk.Label()
runner_label.set_markup("<b>"+runner + "</b> ( "+machine+" ) ")
@ -48,7 +48,7 @@ class RunnersDialog(gtk.Dialog):
self.destroy()
def on_install_clicked(self,widget,runner):
runner_instance = eval("runners."+runner+"."+runner+"()")
runner_instance = eval("lutris.runners."+runner+"."+runner+"()")
runner_instance.install_runner()
def on_configure_clicked(self,widget,runner):

View file

@ -24,7 +24,8 @@ import logging
import threading
import subprocess
import gobject
from runners.cedega import cedega
from lutris.runners.cedega import cedega
class LutrisThread(threading.Thread):
"""Runs the game in a separate thread"""

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-03-02 00:58+0100\n"
"POT-Creation-Date: 2010-05-13 12:19+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -16,12 +16,25 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../data/ui/PreferencesLutrisDialog.ui.h:1 ../data/ui/AddgameDialog.ui.h:1
msgid "gtk-cancel"
#: ../data/ui/AboutLutrisDialog.ui.h:1
msgid ""
"# Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>\n"
"# This program is free software: you can redistribute it and/or modify it \n"
"# under the terms of the GNU General Public License version 3, as "
"published \n"
"# by the Free Software Foundation.\n"
"# \n"
"# This program is distributed in the hope that it will be useful, but \n"
"# WITHOUT ANY WARRANTY; without even the implied warranties of \n"
"# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR \n"
"# PURPOSE. See the GNU General Public License for more details.\n"
"# \n"
"# You should have received a copy of the GNU General Public License along \n"
"# with this program. If not, see <http://www.gnu.org/licenses/>.\n"
msgstr ""
#: ../data/ui/PreferencesLutrisDialog.ui.h:2 ../data/ui/AddgameDialog.ui.h:2
msgid "gtk-ok"
#: ../data/ui/AboutLutrisDialog.ui.h:14
msgid "Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>"
msgstr ""
#: ../data/ui/LutrisWindow.ui.h:1
@ -107,3 +120,11 @@ msgstr ""
#: ../data/ui/LutrisWindow.ui.h:21
msgid "configure the default options"
msgstr ""
#: ../data/ui/PreferencesLutrisDialog.ui.h:1
msgid "gtk-cancel"
msgstr ""
#: ../data/ui/PreferencesLutrisDialog.ui.h:2
msgid "gtk-ok"
msgstr ""

View file

@ -1,18 +0,0 @@
__author__="strider"
__date__ ="$21 nov. 2009 21:07:14$"
from runners.runner import Runner
class vavoom(Runner):
def __init__(self,settings=None):
self.executable = "vavoom"
self.package = None
self.description = "Runs games based on the Doom engine like Doom, Hexen, Heretic"
self.machine = "Games based on the Doom engine"
if settings:
self.wad = settings["main"]["wad"]
def play(self):
return [self.executable,self.gfxmode,self.wad]

View file

@ -2,17 +2,17 @@
# -*- coding: utf-8 -*-
### BEGIN LICENSE
# Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>
#This program is free software: you can redistribute it and/or modify it
#under the terms of the GNU General Public License version 3, as published
#by the Free Software Foundation.
#
#This program is distributed in the hope that it will be useful, but
#WITHOUT ANY WARRANTY; without even the implied warranties of
#MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
# by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranties of
# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program. If not, see <http://www.gnu.org/licenses/>.
### END LICENSE
###################### DO NOT TOUCH THIS (HEAD TO THE SECOND PART) ######################
@ -93,7 +93,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
DistUtilsExtra.auto.setup(
name='lutris',
version='0.2-public2',
version='0.2-public5',
license='GPL-3',
author='Mathieu Comandon',
author_email='strycore@gmail.com',