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

Merge branch 'master' of https://github.com/icarito/sugar-toolkit-gtk3

Browse Source
This commit is contained in:
Sam Parkinson
2016-04-27 21:39:12 +10:00
parent 66c01ba2c6 2f2b2d20d8
commit ea3b673f51
7 changed files with 91 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sugar3/activity/activity.py
+23 -8
View File
@@ -67,7 +67,6 @@ import json
from gi.repository import Gtk
from gi.repository import Gdk
from gi.repository import GObject
from gi.repository import Gio
import dbus
import dbus.service
from dbus import PROPERTIES_IFACE
@@ -81,6 +80,7 @@ from telepathy.constants import CONNECTION_HANDLE_TYPE_ROOM
from sugar3 import util
from sugar3 import power
from sugar3.profile import get_nick_name, get_color
from sugar3.presence import presenceservice
from sugar3.activity.activityservice import ActivityService
from sugar3.graphics import style
@@ -90,6 +90,9 @@ from sugar3.graphics.icon import Icon
from sugar3.datastore import datastore
from sugar3.bundle.activitybundle import get_bundle_instance
from sugar3.bundle.helpers import bundle_from_dir
from sugar3 import env
from errno import EEXIST
from gi.repository import SugarExt
_ = lambda msg: gettext.dgettext('sugar-toolkit-gtk3', msg)
@@ -436,13 +439,18 @@ class Activity(Window, Gtk.Container):
self.__jobject_updated_cb)
self.set_title(self._jobject.metadata['title'])
if 'SUGAR_VERSION' not in os.environ:
bundle = get_bundle_instance(get_bundle_path())
self.set_icon_from_file(bundle.get_icon())
def run_main_loop(self):
Gtk.main()
def _initialize_journal_object(self):
title = _('%s Activity') % get_bundle_name()
settings = Gio.Settings('org.sugarlabs.user')
icon_color = settings.get_string('color')
icon_color = get_color().to_string()
jobject = datastore.create()
jobject.metadata['title'] = title
@@ -613,11 +621,12 @@ class Activity(Window, Gtk.Container):
def _adapt_window_to_screen(self):
screen = Gdk.Screen.get_default()
workarea = screen.get_monitor_workarea(screen.get_number())
geometry = Gdk.Geometry()
geometry.max_width = geometry.base_width = geometry.min_width = \
screen.get_width()
workarea.width
geometry.max_height = geometry.base_height = geometry.min_height = \
screen.get_height()
workarea.height
geometry.width_inc = geometry.height_inc = geometry.min_aspect = \
geometry.max_aspect = 1
hints = Gdk.WindowHints(Gdk.WindowHints.ASPECT |
@@ -671,7 +680,7 @@ class Activity(Window, Gtk.Container):
if os.environ.get('SUGAR_ACTIVITY_ROOT'):
return os.environ['SUGAR_ACTIVITY_ROOT']
else:
return '/'
return get_activity_root()
def read_file(self, file_path):
'''
@@ -876,7 +885,7 @@ class Activity(Window, Gtk.Container):
if not self.metadata.get('activity_id', ''):
self.metadata['activity_id'] = self.get_id()
file_path = os.path.join(self.get_activity_root(), 'instance',
file_path = os.path.join(get_activity_root(), 'instance',
'%i' % time.time())
try:
self.write_file(file_path)
@@ -1251,7 +1260,13 @@ def get_activity_root():
if os.environ.get('SUGAR_ACTIVITY_ROOT'):
return os.environ['SUGAR_ACTIVITY_ROOT']
else:
raise RuntimeError('No SUGAR_ACTIVITY_ROOT set.')
activity_root = env.get_profile_path(os.environ['SUGAR_BUNDLE_ID'])
try:
os.mkdir(activity_root)
except OSError, e:
if e.errno != EEXIST:
raise e
return activity_root
def show_object_in_journal(object_id):
src/sugar3/datastore/datastore.py
+2 -2
View File
@@ -32,6 +32,7 @@ import dbus
from sugar3 import env
from sugar3 import mime
from sugar3 import dispatch
from sugar3.profile import get_color
DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore'
DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore'
@@ -222,7 +223,6 @@ class RawObject(object):
def __init__(self, file_path):
stat = os.stat(file_path)
settings = Gio.Settings('org.sugarlabs.user')
metadata = {
'uid': file_path,
'title': os.path.basename(file_path),
@@ -230,7 +230,7 @@ class RawObject(object):
'mime_type': Gio.content_type_guess(file_path, None)[0],
'activity': '',
'activity_id': '',
'icon-color': settings.get_string('color'),
'icon-color': get_color().to_string(),
'description': file_path,
}
src/sugar3/graphics/style.py
+7 -3
View File
@@ -169,9 +169,13 @@ MEDIUM_ICON_SIZE = zoom(55 * 1.5)
LARGE_ICON_SIZE = zoom(55 * 2.0)
XLARGE_ICON_SIZE = zoom(55 * 2.75)
settings = Gio.Settings('org.sugarlabs.font')
FONT_SIZE = settings.get_double('default-size')
FONT_FACE = settings.get_string('default-face')
if 'org.sugarlabs.font' in Gio.Settings.list_schemas():
settings = Gio.Settings('org.sugarlabs.font')
FONT_SIZE = settings.get_double('default-size')
FONT_FACE = settings.get_string('default-face')
else:
FONT_SIZE = 10
FONT_FACE = 'Sans Serif'
FONT_NORMAL = Font('%s %f' % (FONT_FACE, FONT_SIZE))
FONT_BOLD = Font('%s bold %f' % (FONT_FACE, FONT_SIZE))
src/sugar3/graphics/xocolor.py
+3 -2
View File
@@ -244,8 +244,9 @@ class XoColor:
parsed_color = None
if color_string is None:
settings = Gio.Settings('org.sugarlabs.user')
color_string = settings.get_string('color')
if 'org.sugarlabs.user' in Gio.Settings.list_schemas():
settings = Gio.Settings('org.sugarlabs.user')
color_string = settings.get_string('color')
if color_string is not None:
parsed_color = _parse_string(color_string)
src/sugar3/presence/buddy.py
+4 -4
View File
@@ -24,7 +24,6 @@ STABLE.
import logging
from gi.repository import GObject
from gi.repository import Gio
import dbus
from telepathy.interfaces import CONNECTION, \
CONNECTION_INTERFACE_ALIASING, \
@@ -32,6 +31,7 @@ from telepathy.interfaces import CONNECTION, \
from telepathy.constants import HANDLE_TYPE_CONTACT
from sugar3.presence.connectionmanager import get_connection_manager
from sugar3.profile import get_color, get_nick_name
ACCOUNT_MANAGER_SERVICE = 'org.freedesktop.Telepathy.AccountManager'
CONN_INTERFACE_BUDDY_INFO = 'org.laptop.Telepathy.BuddyInfo'
@@ -243,6 +243,6 @@ class Owner(BaseBuddy):
def __init__(self):
BaseBuddy.__init__(self)
settings = Gio.Settings('org.sugarlabs.user')
self.props.nick = settings.get_string('nick')
self.props.color = settings.get_string('color')
self.props.nick = get_nick_name()
self.props.color = get_color().to_string()
src/sugar3/profile.py
+14 -8
View File
@@ -27,6 +27,7 @@ from sugar3 import env
from sugar3 import util
from sugar3.graphics.xocolor import XoColor
import getpass
_profile = None
@@ -62,9 +63,8 @@ class Profile(object):
privkey_hash = property(fget=_get_privkey_hash)
def is_valid(self):
settings = Gio.Settings('org.sugarlabs.user')
nick = settings.get_string('nick')
color = settings.get_string('color')
nick = get_nick_name()
color = get_color()
return nick is not '' and \
color is not '' and \
@@ -204,14 +204,20 @@ def get_profile():
def get_nick_name():
settings = Gio.Settings('org.sugarlabs.user')
return settings.get_string('nick')
if 'org.sugarlabs.user' in Gio.Settings.list_schemas():
settings = Gio.Settings('org.sugarlabs.user')
return settings.get_string('nick')
else:
return getpass.getuser()
def get_color():
settings = Gio.Settings('org.sugarlabs.user')
color = settings.get_string('color')
return XoColor(color)
if 'org.sugarlabs.user' in Gio.Settings.list_schemas():
settings = Gio.Settings('org.sugarlabs.user')
color = settings.get_string('color')
return XoColor(color)
else:
return XoColor()
def get_pubkey():