Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

6 files changed, 28 insertions, 17 deletions

diff --git a/README b/README
index 1a709f0..9cdd6a9 100644
--- a/README
+++ b/README
@@ -28,5 +28,6 @@ Alt+r  Rotate the screen
 Alt+o  Toggle overlay visibility
 Alt+=  Open the developer console
 Alt+0  Open the developer console
+Alt+q  Quit the emulator
 
-Ctrl+S Activate sketch mode in chat
+Ctrl+s Activate sketch mode in chat
diff --git a/pylint.sh b/pylint.sh
new file mode 100755
index 0000000..0791742
--- /dev/null
+++ b/pylint.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+TODO="C0111,C0301,C0322,W0311,C0324,W0331,W0212,W0611,W0613,W0201,W0106,W0622,W0403,W0612,W0102,W0404,W0704,W0402,W0702,W0401,E0602,E1111,W0101,W0105,W0601,W0602,W0703,W0701,W0312,W0231,W0233"
+
+BROKEN="C0103,E1101"
+
+DISABLE="W0142,R0913,W0621,R0903,R0201,R0904,W0511,W0232,R0902,W0603,R0914,C0302,C0102,I0011,R0911,R0912,R0901,R0801,R0923,R0915"
+
+PYTHONPATH=.:./shell:$SUGAR_PREFIX/lib/python2.4/site-packages/gtk-2.0:$PYTHONPATH \
+  pylint \
+  --include-ids=y \
+  --disable-msg=$TODO,$BROKEN,$DISABLE \
+  shell sugar
diff --git a/shell/view/clipboardmenu.py b/shell/view/clipboardmenu.py
index 5472e4b..607b112 100644
--- a/shell/view/clipboardmenu.py
+++ b/shell/view/clipboardmenu.py
@@ -1,6 +1,3 @@
-import logging
-import gtk
-import gobject
 import hippo
 
 from sugar.graphics.menu import Menu
diff --git a/sugar-emulator b/sugar-emulator
index 5fd9268..56ee796 100755
--- a/sugar-emulator
+++ b/sugar-emulator
@@ -19,6 +19,8 @@
 import os
 import sys
 
+import gtk
+
 os.environ['SUGAR_EMULATOR'] = 'yes'
 
 sourcedir = os.path.abspath(os.path.dirname(__file__))
@@ -31,6 +33,7 @@ else:
 
 from sugar import env
 from sugar import util
+from sugar.emulator import Emulator
 
 if sourcedir:
 	if os.environ.has_key('PYTHONPATH'):
@@ -70,16 +73,13 @@ if sourcedir:
 	util.write_service('org.laptop.sugar.Console', bin,
 					   env.get_user_service_dir())
 
-from sugar.emulator import Emulator
-
-program = 'sugar-shell'
+if len(sys.argv) == 1:
+    program = 'sugar-shell'
+else:
+    program = sys.argv[1]
 
-fullscreen = False
-for i in range(1, len(sys.argv)):
-	if sys.argv[i] == '-fullscreen':
-		fullscreen = True
-	else:
-		program = sys.argv[i]
+fullscreen = (gtk.gdk.screen_width() <= 1200 and
+              gtk.gdk.screen_height() <= 900)
 
 emulator = Emulator(fullscreen)
 emulator.start()
diff --git a/sugar/emulator.py b/sugar/emulator.py
index b37dae6..664e379 100644
--- a/sugar/emulator.py
+++ b/sugar/emulator.py
@@ -84,13 +84,13 @@ class XephyrProcess(Process):
         if fullscreen:
             cmd += '-fullscreen '
         else:
-            cmd += '-screen 800x600 '
+            cmd += '-screen 1200x900'
         Process.__init__(self, cmd)
         
     def get_name(self):
         return 'Xephyr'
 
-    def start(self):
+    def start(self, standard_output=False):
         Process.start(self)
         os.environ['DISPLAY'] = ":%d" % (self._display)
         os.environ['SUGAR_XEPHYR_PID'] = '%d' % self.pid
@@ -105,7 +105,7 @@ class XnestProcess(Process):
     def get_name(self):
         return 'Xnest'
 
-    def start(self):
+    def start(self, standard_output=False):
         Process.start(self)
         os.environ['DISPLAY'] = ":%d" % (self._display)
 
diff --git a/tools/build-snapshot.sh b/tools/build-snapshot.sh
index 786b887..3bb4cd2 100755
--- a/tools/build-snapshot.sh
+++ b/tools/build-snapshot.sh
@@ -1,6 +1,6 @@
 VERSION=0.63
 DATE=`date +%Y%m%d`
-RELEASE=2.11
+RELEASE=2.12
 TARBALL=sugar-$VERSION-$RELEASE.${DATE}git.tar.bz2
 
 rm sugar-$VERSION.tar.bz2