From 3d9a02bde6e905dfff354a8419bcf6ddb5f635fe Mon Sep 17 00:00:00 2001 From: Mathieu Comandon Date: Thu, 13 May 2010 12:20:28 +0200 Subject: [PATCH] Fixed imports --- .bzrignore | 1 + .quickly | 2 +- apport/source_lutris.py | 13 ++++- bin/lutris | 50 ++++++++++---------- data/ui/AboutLutrisDialog.ui | 25 +++++++--- debian/changelog | 30 ++++++++++++ debian/control | 3 +- lutris/AboutLutrisDialog.py | 42 ++++++++-------- lutris/add_game_dialog.py | 4 +- lutris/config.py | 2 +- {coverflow => lutris/coverflow}/__init__.py | 0 {coverflow => lutris/coverflow}/anim.py | 0 {coverflow => lutris/coverflow}/coverflow.py | 16 +++---- {coverflow => lutris/coverflow}/covergl.py | 14 +++--- lutris/game.py | 2 +- lutris/game_config_vbox.py | 4 +- lutris/google_image.py | 15 +++--- lutris/gui/conventions.py | 4 +- lutris/gui/dictionary_grid.py | 28 +++++------ lutris/helpers.py | 13 ++++- lutris/installer_config_vbox.py | 4 +- lutris/installer_dialog.py | 6 +-- lutris/lutrisconfig.py | 24 +++++----- lutris/runner_config_vbox.py | 4 +- {runners => lutris/runners}/__init__.py | 0 {runners => lutris/runners}/atari800.py | 2 +- {runners => lutris/runners}/browser.py | 2 +- {runners => lutris/runners}/cedega.py | 2 +- {runners => lutris/runners}/dosbox.py | 2 +- {runners => lutris/runners}/frotz.py | 2 +- {runners => lutris/runners}/gens.py | 2 +- {runners => lutris/runners}/hatari.py | 2 +- {runners => lutris/runners}/jzintv.py | 2 +- {runners => lutris/runners}/linux.py | 2 +- {runners => lutris/runners}/mednafen.py | 7 ++- {runners => lutris/runners}/nulldc.py | 2 +- {runners => lutris/runners}/o2em.py | 2 +- {runners => lutris/runners}/openmsx.py | 2 +- {runners => lutris/runners}/osmose.py | 2 +- {runners => lutris/runners}/pcsx.py | 2 +- {runners => lutris/runners}/runner.py | 0 {runners => lutris/runners}/scummvm.py | 8 ++-- {runners => lutris/runners}/sdlmame.py | 2 +- {runners => lutris/runners}/snes9x.py | 2 +- {runners => lutris/runners}/steam.py | 29 +++++++++--- {runners => lutris/runners}/stella.py | 2 +- {runners => lutris/runners}/uae.py | 2 +- lutris/runners/vavoom.py | 36 ++++++++++++++ {runners => lutris/runners}/vice.py | 2 +- {runners => lutris/runners}/wine.py | 2 +- lutris/runners_dialog.py | 6 +-- lutris/thread.py | 3 +- {tool => lutris/tool}/__init__.py | 0 {tool => lutris/tool}/re_tool.py | 0 {tool => lutris/tool}/url_tool.py | 0 po/lutris.pot | 31 ++++++++++-- runners/vavoom.py | 18 ------- setup.py | 24 +++++----- 58 files changed, 313 insertions(+), 195 deletions(-) rename {coverflow => lutris/coverflow}/__init__.py (100%) rename {coverflow => lutris/coverflow}/anim.py (100%) rename {coverflow => lutris/coverflow}/coverflow.py (92%) rename {coverflow => lutris/coverflow}/covergl.py (95%) rename {runners => lutris/runners}/__init__.py (100%) rename {runners => lutris/runners}/atari800.py (99%) rename {runners => lutris/runners}/browser.py (97%) rename {runners => lutris/runners}/cedega.py (98%) rename {runners => lutris/runners}/dosbox.py (97%) rename {runners => lutris/runners}/frotz.py (97%) rename {runners => lutris/runners}/gens.py (98%) rename {runners => lutris/runners}/hatari.py (99%) rename {runners => lutris/runners}/jzintv.py (98%) rename {runners => lutris/runners}/linux.py (98%) rename {runners => lutris/runners}/mednafen.py (99%) rename {runners => lutris/runners}/nulldc.py (97%) rename {runners => lutris/runners}/o2em.py (98%) rename {runners => lutris/runners}/openmsx.py (97%) rename {runners => lutris/runners}/osmose.py (98%) rename {runners => lutris/runners}/pcsx.py (97%) rename {runners => lutris/runners}/runner.py (100%) rename {runners => lutris/runners}/scummvm.py (99%) rename {runners => lutris/runners}/sdlmame.py (98%) rename {runners => lutris/runners}/snes9x.py (98%) rename {runners => lutris/runners}/steam.py (68%) rename {runners => lutris/runners}/stella.py (97%) rename {runners => lutris/runners}/uae.py (99%) create mode 100755 lutris/runners/vavoom.py rename {runners => lutris/runners}/vice.py (98%) rename {runners => lutris/runners}/wine.py (99%) rename {tool => lutris/tool}/__init__.py (100%) rename {tool => lutris/tool}/re_tool.py (100%) rename {tool => lutris/tool}/url_tool.py (100%) delete mode 100755 runners/vavoom.py diff --git a/.bzrignore b/.bzrignore index 1ffd74082..e9c0fcefc 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1 +1,2 @@ nbproject +build diff --git a/.quickly b/.quickly index 9a53dd4c6..67e2b3361 100644 --- a/.quickly +++ b/.quickly @@ -1,4 +1,4 @@ project = lutris template = ubuntu-application lp_id = lutris -version = 0.4.1 +version = 0.4.2 diff --git a/apport/source_lutris.py b/apport/source_lutris.py index 9b65e4c1f..f7e8b90c9 100644 --- a/apport/source_lutris.py +++ b/apport/source_lutris.py @@ -2,7 +2,18 @@ # # -*- coding: utf-8 -*- ### BEGIN LICENSE -# This file is in the public domain +# Copyright (C) 2010 Mathieu Comandon +# 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 . ### END LICENSE import apport diff --git a/bin/lutris b/bin/lutris index 586492df9..a32c9a036 100755 --- a/bin/lutris +++ b/bin/lutris @@ -2,17 +2,17 @@ # -*- coding: utf-8 -*- ### BEGIN LICENSE # Copyright (C) 2010 Mathieu Comandon -#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 . +# 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 . ### 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) diff --git a/data/ui/AboutLutrisDialog.ui b/data/ui/AboutLutrisDialog.ui index 42497e8d9..bfaf1c446 100644 --- a/data/ui/AboutLutrisDialog.ui +++ b/data/ui/AboutLutrisDialog.ui @@ -1,10 +1,21 @@ - - - - + + + - 5 + 0.2-public5# 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/>. +Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>Copyright (C) 2010 Mathieu Comandon <strycore@gmail.com>5 ../media/icon.png normal False @@ -15,7 +26,7 @@ vertical 2 - + @@ -31,4 +42,4 @@ - + \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 30bcbc123..784dd051d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +lutris (0.2-public5) lucid; urgency=low + + * New release. + + -- Mathieu Comandon Thu, 13 May 2010 12:17:40 +0200 + +lutris (0.2-public4) lucid; urgency=low + + * New release. + + -- Mathieu Comandon Thu, 13 May 2010 12:17:12 +0200 + +lutris (0.2-public3) lucid; urgency=low + + * New release. + + -- Mathieu Comandon Thu, 13 May 2010 12:12:32 +0200 + +lutris (0.2-public2) lucid; urgency=low + + * New release. + + -- Mathieu Comandon Thu, 13 May 2010 12:08:40 +0200 + +lutris (0.2-public2) lucid; urgency=low + + * New release. + + -- Mathieu Comandon Thu, 13 May 2010 12:08:14 +0200 + lutris (0.2~public2) lucid; urgency=low * New release. diff --git a/debian/control b/debian/control index 80f8f6481..a7b27529f 100644 --- a/debian/control +++ b/debian/control @@ -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 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, diff --git a/lutris/AboutLutrisDialog.py b/lutris/AboutLutrisDialog.py index 17c001459..c34301013 100644 --- a/lutris/AboutLutrisDialog.py +++ b/lutris/AboutLutrisDialog.py @@ -1,17 +1,17 @@ # -*- coding: utf-8 -*- ### BEGIN LICENSE # Copyright (C) 2010 Mathieu Comandon -#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 . +# 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 . ### 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 diff --git a/lutris/add_game_dialog.py b/lutris/add_game_dialog.py index bb470d62f..f4fc0d9af 100644 --- a/lutris/add_game_dialog.py +++ b/lutris/add_game_dialog.py @@ -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: diff --git a/lutris/config.py b/lutris/config.py index f09a28373..7cc1e28f0 100644 --- a/lutris/config.py +++ b/lutris/config.py @@ -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): diff --git a/coverflow/__init__.py b/lutris/coverflow/__init__.py similarity index 100% rename from coverflow/__init__.py rename to lutris/coverflow/__init__.py diff --git a/coverflow/anim.py b/lutris/coverflow/anim.py similarity index 100% rename from coverflow/anim.py rename to lutris/coverflow/anim.py diff --git a/coverflow/coverflow.py b/lutris/coverflow/coverflow.py similarity index 92% rename from coverflow/coverflow.py rename to lutris/coverflow/coverflow.py index f4bbf1b2a..8b4652f86 100755 --- a/coverflow/coverflow.py +++ b/lutris/coverflow/coverflow.py @@ -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] diff --git a/coverflow/covergl.py b/lutris/coverflow/covergl.py similarity index 95% rename from coverflow/covergl.py rename to lutris/coverflow/covergl.py index 2ad2115a5..1e84181d1 100755 --- a/coverflow/covergl.py +++ b/lutris/coverflow/covergl.py @@ -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): diff --git a/lutris/game.py b/lutris/game.py index 02b9b7a83..fd1b5f0eb 100644 --- a/lutris/game.py +++ b/lutris/game.py @@ -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(): diff --git a/lutris/game_config_vbox.py b/lutris/game_config_vbox.py index 292e7ff89..3d71a661b 100644 --- a/lutris/game_config_vbox.py +++ b/lutris/game_config_vbox.py @@ -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: diff --git a/lutris/google_image.py b/lutris/google_image.py index 6e6030219..500489785 100755 --- a/lutris/google_image.py +++ b/lutris/google_image.py @@ -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 diff --git a/lutris/gui/conventions.py b/lutris/gui/conventions.py index 14117d6d3..d6a683a36 100644 --- a/lutris/gui/conventions.py +++ b/lutris/gui/conventions.py @@ -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": diff --git a/lutris/gui/dictionary_grid.py b/lutris/gui/dictionary_grid.py index 0b956a971..5e2177037 100644 --- a/lutris/gui/dictionary_grid.py +++ b/lutris/gui/dictionary_grid.py @@ -1,24 +1,24 @@ # -*- coding: utf-8 -*- ### BEGIN LICENSE # Copyright (C) 2010 Mathieu Comandon -#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 . +# 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 . ### 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) diff --git a/lutris/helpers.py b/lutris/helpers.py index 3cd37a093..13ebb6c2e 100644 --- a/lutris/helpers.py +++ b/lutris/helpers.py @@ -1,6 +1,17 @@ # -*- coding: utf-8 -*- ### BEGIN LICENSE -# This file is in the public domain +# Copyright (C) 2010 Mathieu Comandon +# 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 . ### END LICENSE """Helpers for an Ubuntu application.""" diff --git a/lutris/installer_config_vbox.py b/lutris/installer_config_vbox.py index 3de7ff297..76356bba7 100644 --- a/lutris/installer_config_vbox.py +++ b/lutris/installer_config_vbox.py @@ -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: diff --git a/lutris/installer_dialog.py b/lutris/installer_dialog.py index 72f92c691..d9522f92a 100644 --- a/lutris/installer_dialog.py +++ b/lutris/installer_dialog.py @@ -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() diff --git a/lutris/lutrisconfig.py b/lutris/lutrisconfig.py index 389e8fa9f..4a3f8bc67 100644 --- a/lutris/lutrisconfig.py +++ b/lutris/lutrisconfig.py @@ -1,17 +1,17 @@ # -*- coding: utf-8 -*- ### BEGIN LICENSE # Copyright (C) 2010 Mathieu Comandon -#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 . +# 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 . ### 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' diff --git a/lutris/runner_config_vbox.py b/lutris/runner_config_vbox.py index 78a2617c6..dbf68bee4 100644 --- a/lutris/runner_config_vbox.py +++ b/lutris/runner_config_vbox.py @@ -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: diff --git a/runners/__init__.py b/lutris/runners/__init__.py similarity index 100% rename from runners/__init__.py rename to lutris/runners/__init__.py diff --git a/runners/atari800.py b/lutris/runners/atari800.py similarity index 99% rename from runners/atari800.py rename to lutris/runners/atari800.py index 8ce9c4e43..797f4b211 100644 --- a/runners/atari800.py +++ b/lutris/runners/atari800.py @@ -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 diff --git a/runners/browser.py b/lutris/runners/browser.py similarity index 97% rename from runners/browser.py rename to lutris/runners/browser.py index e99ba1c64..b0e2b8135 100644 --- a/runners/browser.py +++ b/lutris/runners/browser.py @@ -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''' diff --git a/runners/cedega.py b/lutris/runners/cedega.py similarity index 98% rename from runners/cedega.py rename to lutris/runners/cedega.py index 131162b44..a00118dc4 100755 --- a/runners/cedega.py +++ b/lutris/runners/cedega.py @@ -20,7 +20,7 @@ ############################################################################### from lutris.config import LutrisConfig -from runners.runner import Runner +from lutris.runners.runner import Runner import ConfigParser import os diff --git a/runners/dosbox.py b/lutris/runners/dosbox.py similarity index 97% rename from runners/dosbox.py rename to lutris/runners/dosbox.py index 58efad2ad..195acfe07 100755 --- a/runners/dosbox.py +++ b/lutris/runners/dosbox.py @@ -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''' diff --git a/runners/frotz.py b/lutris/runners/frotz.py similarity index 97% rename from runners/frotz.py rename to lutris/runners/frotz.py index e6cf77e94..d695c2cd6 100644 --- a/runners/frotz.py +++ b/lutris/runners/frotz.py @@ -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''' diff --git a/runners/gens.py b/lutris/runners/gens.py similarity index 98% rename from runners/gens.py rename to lutris/runners/gens.py index a27cf444d..b0db9c9ec 100644 --- a/runners/gens.py +++ b/lutris/runners/gens.py @@ -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): diff --git a/runners/hatari.py b/lutris/runners/hatari.py similarity index 99% rename from runners/hatari.py rename to lutris/runners/hatari.py index bd4da6146..7bfa7aab2 100644 --- a/runners/hatari.py +++ b/lutris/runners/hatari.py @@ -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''' diff --git a/runners/jzintv.py b/lutris/runners/jzintv.py similarity index 98% rename from runners/jzintv.py rename to lutris/runners/jzintv.py index 23018cf78..67d09dc83 100644 --- a/runners/jzintv.py +++ b/lutris/runners/jzintv.py @@ -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''' diff --git a/runners/linux.py b/lutris/runners/linux.py similarity index 98% rename from runners/linux.py rename to lutris/runners/linux.py index ef606b86b..8a5174da6 100755 --- a/runners/linux.py +++ b/lutris/runners/linux.py @@ -22,7 +22,7 @@ import os.path ############################################################################### -from runner import Runner +from lutris.runners.runner import Runner import os import stat diff --git a/runners/mednafen.py b/lutris/runners/mednafen.py similarity index 99% rename from runners/mednafen.py rename to lutris/runners/mednafen.py index 2ea894c6e..c96ef2c0b 100755 --- a/runners/mednafen.py +++ b/lutris/runners/mednafen.py @@ -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): diff --git a/runners/nulldc.py b/lutris/runners/nulldc.py similarity index 97% rename from runners/nulldc.py rename to lutris/runners/nulldc.py index 7c37e1b0f..64c647cb2 100755 --- a/runners/nulldc.py +++ b/lutris/runners/nulldc.py @@ -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): diff --git a/runners/o2em.py b/lutris/runners/o2em.py similarity index 98% rename from runners/o2em.py rename to lutris/runners/o2em.py index ef9447132..4710516a0 100644 --- a/runners/o2em.py +++ b/lutris/runners/o2em.py @@ -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''' diff --git a/runners/openmsx.py b/lutris/runners/openmsx.py similarity index 97% rename from runners/openmsx.py rename to lutris/runners/openmsx.py index a8a375218..182a41bb0 100755 --- a/runners/openmsx.py +++ b/lutris/runners/openmsx.py @@ -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''' diff --git a/runners/osmose.py b/lutris/runners/osmose.py similarity index 98% rename from runners/osmose.py rename to lutris/runners/osmose.py index 22bc0d29f..d87fc8df8 100644 --- a/runners/osmose.py +++ b/lutris/runners/osmose.py @@ -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''' diff --git a/runners/pcsx.py b/lutris/runners/pcsx.py similarity index 97% rename from runners/pcsx.py rename to lutris/runners/pcsx.py index bcb228a70..95b0e6200 100644 --- a/runners/pcsx.py +++ b/lutris/runners/pcsx.py @@ -20,7 +20,7 @@ ############################################################################### -from runner import Runner +from lutris.runners.runner import Runner class pcsx(Runner): def __init__(self,settings = None): diff --git a/runners/runner.py b/lutris/runners/runner.py similarity index 100% rename from runners/runner.py rename to lutris/runners/runner.py diff --git a/runners/scummvm.py b/lutris/runners/scummvm.py similarity index 99% rename from runners/scummvm.py rename to lutris/runners/scummvm.py index 4b7b9cd41..e6d1a43b7 100755 --- a/runners/scummvm.py +++ b/lutris/runners/scummvm.py @@ -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): diff --git a/runners/sdlmame.py b/lutris/runners/sdlmame.py similarity index 98% rename from runners/sdlmame.py rename to lutris/runners/sdlmame.py index 83c020a03..ec4f4ae10 100755 --- a/runners/sdlmame.py +++ b/lutris/runners/sdlmame.py @@ -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): diff --git a/runners/snes9x.py b/lutris/runners/snes9x.py similarity index 98% rename from runners/snes9x.py rename to lutris/runners/snes9x.py index 5353cbeef..b839017b8 100755 --- a/runners/snes9x.py +++ b/lutris/runners/snes9x.py @@ -20,7 +20,7 @@ ############################################################################### -from runner import Runner +from lutris.runners.runner import Runner class snes9x(Runner): def __init__(self,settings = None): diff --git a/runners/steam.py b/lutris/runners/steam.py similarity index 68% rename from runners/steam.py rename to lutris/runners/steam.py index 4ccea9355..b24444f34 100755 --- a/runners/steam.py +++ b/lutris/runners/steam.py @@ -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): diff --git a/runners/stella.py b/lutris/runners/stella.py similarity index 97% rename from runners/stella.py rename to lutris/runners/stella.py index 0ad7e7142..3894384b8 100644 --- a/runners/stella.py +++ b/lutris/runners/stella.py @@ -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''' diff --git a/runners/uae.py b/lutris/runners/uae.py similarity index 99% rename from runners/uae.py rename to lutris/runners/uae.py index 06ebabd0c..b9e6cc7c9 100755 --- a/runners/uae.py +++ b/lutris/runners/uae.py @@ -20,7 +20,7 @@ ############################################################################### import os -from runner import Runner +from lutris.runners.runner import Runner class uae(Runner): def __init__(self,settings = None): diff --git a/lutris/runners/vavoom.py b/lutris/runners/vavoom.py new file mode 100755 index 000000000..fdc72b79a --- /dev/null +++ b/lutris/runners/vavoom.py @@ -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] \ No newline at end of file diff --git a/runners/vice.py b/lutris/runners/vice.py similarity index 98% rename from runners/vice.py rename to lutris/runners/vice.py index bd937d31c..27cee381a 100644 --- a/runners/vice.py +++ b/lutris/runners/vice.py @@ -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''' diff --git a/runners/wine.py b/lutris/runners/wine.py similarity index 99% rename from runners/wine.py rename to lutris/runners/wine.py index 74b460c22..39f92d6f2 100755 --- a/runners/wine.py +++ b/lutris/runners/wine.py @@ -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" diff --git a/lutris/runners_dialog.py b/lutris/runners_dialog.py index e0382fda4..9787b1137 100644 --- a/lutris/runners_dialog.py +++ b/lutris/runners_dialog.py @@ -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(""+runner + " ( "+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): diff --git a/lutris/thread.py b/lutris/thread.py index e7948be92..37137f2b5 100644 --- a/lutris/thread.py +++ b/lutris/thread.py @@ -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""" diff --git a/tool/__init__.py b/lutris/tool/__init__.py similarity index 100% rename from tool/__init__.py rename to lutris/tool/__init__.py diff --git a/tool/re_tool.py b/lutris/tool/re_tool.py similarity index 100% rename from tool/re_tool.py rename to lutris/tool/re_tool.py diff --git a/tool/url_tool.py b/lutris/tool/url_tool.py similarity index 100% rename from tool/url_tool.py rename to lutris/tool/url_tool.py diff --git a/po/lutris.pot b/po/lutris.pot index a9c935c7f..df41f9c91 100644 --- a/po/lutris.pot +++ b/po/lutris.pot @@ -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 \n" "Language-Team: LANGUAGE \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 \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 .\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 " 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 "" diff --git a/runners/vavoom.py b/runners/vavoom.py deleted file mode 100755 index 182eec0b6..000000000 --- a/runners/vavoom.py +++ /dev/null @@ -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] \ No newline at end of file diff --git a/setup.py b/setup.py index 08f2756de..d8bd4063e 100644 --- a/setup.py +++ b/setup.py @@ -2,17 +2,17 @@ # -*- coding: utf-8 -*- ### BEGIN LICENSE # Copyright (C) 2010 Mathieu Comandon -#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 . +# 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 . ### 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',