sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop support for running from source dir. As it is now it's just confusing.

Browse Source 
Will have to figure out the exact needs and rewrite in a better way.
This commit is contained in:
Marco Pesenti Gritti 2007-03-09 17:38:05 +01:00
parent 6c5d28ecf5
commit b8cc8ec68f
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shell/sugar-shell
View File

@ -20,9 +20,6 @@ import sys
import os import os
from ConfigParser import ConfigParser from ConfigParser import ConfigParser
if len(sys.argv) == 2:
sys.path.insert(0, sys.argv[1])
import pygtk import pygtk
pygtk.require('2.0') pygtk.require('2.0')
import gtk import gtk
@ -36,8 +33,7 @@ from sugar import TracebackUtils
logger.cleanup() logger.cleanup()
logger.start('shell') logger.start('shell')
if len(sys.argv) == 1: sys.path.insert(0, env.get_shell_path())
sys.path.insert(0, env.get_shell_path())
from view.Shell import Shell from view.Shell import Shell
from model.ShellModel import ShellModel from model.ShellModel import ShellModel

24
sugar-emulator
View File

@ -25,23 +25,11 @@ import gtk
os.environ['SUGAR_EMULATOR'] = 'yes' os.environ['SUGAR_EMULATOR'] = 'yes'
sourcedir = os.path.abspath(os.path.dirname(__file__))
if os.path.isfile(os.path.join(sourcedir, 'sugar/__uninstalled__.py')):
print 'Running sugar from ' + sourcedir + ' ...'
sys.path.insert(0, sourcedir)
else:
print 'Running the installed sugar...'
sourcedir = None
from sugar import env from sugar import env
from sugar import util
from sugar.emulator import Emulator from sugar.emulator import Emulator
import _sugar import _sugar
if len(sys.argv) == 1: if len(sys.argv) == 1:
if sourcedir:
program = os.path.join(sourcedir, 'shell/sugar-shell')
else:
program = 'sugar-shell' program = 'sugar-shell'
else: else:
program = sys.argv[1] program = sys.argv[1]
@ -54,18 +42,10 @@ else:
height = 900 height = 900
dpi = min(_sugar.get_screen_dpi(), 96) dpi = min(_sugar.get_screen_dpi(), 96)
kbd_config = os.path.join(env.get_emulator_path('kbdconfig'))
if sourcedir:
kbd_config = os.path.join(sourcedir, 'emulator/kbdconfig')
else:
kbd_config = os.path.join(env.get_emulator_path('kbdconfig'))
emulator = Emulator(width, height, dpi) emulator = Emulator(width, height, dpi)
emulator.set_keyboard_config(kbd_config) emulator.set_keyboard_config(kbd_config)
emulator.start() emulator.start()
if sourcedir: os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program)
program = os.path.join(sourcedir, program)
os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program, sourcedir)
else:
os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program)