Commit Graph

1229 Commits

Author SHA1 Message Date
Owen Williams
d7eb3fd734 Fix part of bug 853, reposition and resize sugar frame after rotate 2007-02-24 13:28:04 -05:00
Tomeu Vizoso
ce800fbc66 Add hover to BuddyIcon in the Frame. 2007-02-24 14:58:38 +01:00
Tomeu Vizoso
940b50b4e6 Add hover to ClipboardIcon. 2007-02-24 14:35:31 +01:00
Tomeu Vizoso
52fc6826ab Typo. 2007-02-24 14:23:18 +01:00
Tomeu Vizoso
a2e5b9308e Rename color property in CanvasIcon to xo-color and added properties fill-color and stroke-color. 2007-02-23 17:08:37 +01:00
Tomeu Vizoso
cb0d75eb59 Rename IconColor to XoColor. 2007-02-23 13:09:33 +01:00
Tomeu Vizoso
6756c00917 Added tooltips to CanvasIcon and implement popup positioning in the Frame. 2007-02-22 22:51:24 +01:00
Marco Pesenti Gritti
2c896e35b1 Pass the right parameters to HomeActivity 2007-02-22 17:55:46 +01:00
Tomeu Vizoso
8679737d86 Rename for new API. 2007-02-22 17:39:06 +01:00
Marco Pesenti Gritti
fc805d3a88 Adapt to activity api change 2007-02-22 17:27:00 +01:00
Marco Pesenti Gritti
995c59cb3e Make sugar-activity-factory just a wrapper. 2007-02-22 14:11:50 +01:00
Marco Pesenti Gritti
0b6b6cd6ac Cleanup the Activity API, code needs more love. 2007-02-22 00:57:49 +01:00
Marco Pesenti Gritti
5cf2b49cc1 Add an handle argument to the factory and to the activity constructor. 2007-02-22 00:07:08 +01:00
Tomeu Vizoso
c9af045e43 Removed MenuIcon. 2007-02-21 21:15:08 +01:00
Tomeu Vizoso
b452b7d718 Make ClipboardIcon use the new Menu. 2007-02-21 21:12:27 +01:00
Marco Pesenti Gritti
9ba487fa1f Generate the id in ActivityFactory. I want it to be easy to
run activities without using the shell. Some regression in
the debug messages, which I'll fix as part of further
refactoring.
2007-02-21 20:56:14 +01:00
Marco Pesenti Gritti
ef3f861954 Fix caps 2007-02-21 20:20:36 +01:00
Marco Pesenti Gritti
2627f7ff93 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-02-21 18:06:52 +01:00
Marco Pesenti Gritti
11264b48b2 Split factory client and server 2007-02-21 18:06:39 +01:00
Tomeu Vizoso
7be3333671 Make BuddyIcon and BuddyMenu use the new Menu. 2007-02-21 17:55:44 +01:00
Marco Pesenti Gritti
3fbc00f74a Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-02-21 17:54:01 +01:00
Marco Pesenti Gritti
7db372cc1c Make bundle registry a singleton. Get the object path from the registry. 2007-02-21 17:53:44 +01:00
Marco Pesenti Gritti
f5b13b716e Do not expose the service names from Activity.
This create quite a bit of duplication, but I have to start somewhere cleaning this mess :/
2007-02-21 17:28:49 +01:00
Tomeu Vizoso
3ce2a67304 Refactored Menu out of Popup. 2007-02-21 17:05:41 +01:00
Tomeu Vizoso
500f979302 Renamed Button to IconButton. 2007-02-21 13:01:20 +01:00
Tomeu Vizoso
bbfe539429 Renamed Rollover to Popup. 2007-02-21 10:16:03 +01:00
Marco Pesenti Gritti
0ae5f61a07 Ooops changed the installation path by mistake 2007-02-20 22:12:33 +01:00
Tomeu Vizoso
f3cf928f31 Added Rollover control. 2007-02-20 16:38:25 +01:00
Marco Pesenti Gritti
5f65056d78 Cleanups 2007-02-20 16:35:07 +01:00
Marco Pesenti Gritti
7e96b1afb7 Get rid of the old grid. Never use absolute positioning. 2007-02-20 16:23:49 +01:00
Marco Pesenti Gritti
3de915db96 Completely drop stylesheets. Move some of it inside the nm service, don't want to touch that code because it will be rewritten. 2007-02-20 15:10:18 +01:00
Marco Pesenti Gritti
ee66b2237d More work to get rid of stylesheets, some regressions. 2007-02-20 14:57:50 +01:00
Marco Pesenti Gritti
7ba58f68b0 Position the device icons around the donut 2007-02-20 12:01:58 +01:00
Marco Pesenti Gritti
e0dd1f5232 Infrastructure for the home page devices 2007-02-20 11:48:03 +01:00
Marco Pesenti Gritti
e24193c551 Get rid of stylesheets for MyIcon. 2007-02-19 17:59:29 +01:00
Marco Pesenti Gritti
d199e99514 Do not use Grid here, use units 2007-02-19 17:53:03 +01:00
Marco Pesenti Gritti
927926b49a Remove reference to a stylesheet 2007-02-16 15:38:14 +01:00
Marco Pesenti Gritti
af0a6793f3 Use Button in the zoom box 2007-02-16 15:31:27 +01:00
Marco Pesenti Gritti
c9b103dfef Refactor button a bit to support different sizes. Use it for the overlaybox. 2007-02-16 15:24:02 +01:00
Marco Pesenti Gritti
e1ef7398e2 Fix regression with screen rotation 2007-02-13 16:47:47 +01:00
Marco Pesenti Gritti
8f3fb612fd Reenable the journal. Add desktop background color. 2007-02-13 15:02:39 +01:00
Marco Pesenti Gritti
892caab0d8 Give precendence to user dir over system dir 2007-02-13 13:01:58 +01:00
Tomeu Vizoso
7e324af179 Added toolbar and button controls. 2007-02-07 18:26:39 +01:00
Marco Pesenti Gritti
c44084df09 Make the icon colors list private 2007-02-07 16:55:22 +01:00
Tomeu Vizoso
1fb786f843 Listen for button-press in the hippo.Canvas, not on the gtk.Window. 2007-02-03 21:51:39 +01:00
Tomeu Vizoso
9dcd28e190 Fix for avoiding name clashes between shell and activities when running sugar from the source dir. 2007-02-03 20:20:32 +01:00
Tomeu Vizoso
4bde802bbd Simplified system paths for running sugar from the source dir. 2007-02-03 19:41:00 +01:00
Dan Williams
a228e5297b Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-01-31 11:32:03 -05:00
Dan Williams
de2cfecf92 Use screenshot for overlay window background
Instead of requiring a compositing manager for the transparent background
of the OverlayWindow, take a screenshot and use that instead.
2007-01-31 11:31:52 -05:00
Owen Williams
165bb9213f Update look of activities donut to match wiki
If we remove current activity, set _current_activity to None
2007-01-31 11:16:33 -05:00
Tomeu Vizoso
ae5f1ed2c5 Added missing file to Makefile.am. 2007-01-27 12:58:14 +01:00
Tomeu Vizoso
9d13a9836d Added new tool sugar-install-bundle. 2007-01-27 12:54:56 +01:00
Marco Pesenti Gritti
eeaf517049 We was no more scaling icons depending on screen resolution, fix it 2007-01-27 02:45:09 +01:00
Marco Pesenti Gritti
679f6f7c46 Size property is gone 2007-01-27 01:40:54 +01:00
Marco Pesenti Gritti
fd40c138c6 Rework icon sizing (unfinished, but more or less functional) 2007-01-27 01:36:31 +01:00
Owen Williams
556085dbf8 Merge branch 'master' of git+ssh://ywwg@dev.laptop.org/git/sugar 2007-01-26 09:34:35 -05:00
Dan Williams
d35413d8b0 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-01-26 09:18:53 -05:00
Owen Williams
f2c3505f7e Fix homemodel to return properly-ordered activities (based on timestamp) 2007-01-25 21:30:37 -05:00
Marco Pesenti Gritti
698e0cb7f9 Actually disable animation 2007-01-25 19:50:00 +01:00
Marco Pesenti Gritti
aa79b1fdd6 Another volume change... 2007-01-25 18:04:47 +01:00
Marco Pesenti Gritti
81a1ac0320 Change sound level as asked by Flipo 2007-01-25 17:40:47 +01:00
Marco Pesenti Gritti
5bc623f45e Try to avoid frame flickering by keeping the window offscreen.
First go at animation impl as I was at it, off by default.
2007-01-25 17:37:27 +01:00
Marco Pesenti Gritti
ff4054742a Some refactoring. Store each panel in his own variable, since slide_in/slide_out handling will be different for each of them. 2007-01-25 12:39:44 +01:00
Marco Pesenti Gritti
1456c872bc Split EventFrame to his own file, fixup caps 2007-01-25 12:22:37 +01:00
Dan Williams
89e10838d3 Stub Alt+Tab key handler 2007-01-24 14:56:44 -05:00
Dan Williams
0c66dd5fa2 Re-enable buddy streams now that XMLRPC is fixed for python 2.5 2007-01-24 14:25:31 -05:00
Eduardo Silva
73f53395c9 Fix old Makefile entry 2007-01-21 22:26:41 -03:00
Marco Pesenti Gritti
1cadd9ac0a Handle the case where there is not an hardware manager service installed. 2007-01-22 01:47:58 +01:00
Marco Pesenti Gritti
d36e20159e Our xmlrpc implementation does not work with python 2.5.
Try/except it and log an error.
2007-01-20 13:46:32 +01:00
Marco Pesenti Gritti
4cdf88f31d Do not hardcode /usr/bin/python 2007-01-20 13:38:58 +01:00
Marco Pesenti Gritti
f95bb78a89 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-01-19 15:48:09 +01:00
Marco Pesenti Gritti
5ca728b1d3 Fix API for hippo-canvas 0.2 2007-01-19 15:47:33 +01:00
Eduardo Silva
492be2f6cd Fixed missed Makefile.am entry 2007-01-19 10:28:44 -03:00
Owen Williams
3bedd451e3 Fix redundancy 2007-01-18 21:52:48 +01:00
Marco Pesenti Gritti
1143623d35 Factor out global keys handling from the shell 2007-01-18 15:04:56 +01:00
Marco Pesenti Gritti
704ad1c886 Reenable camera 2007-01-17 22:38:01 +01:00
Marco Pesenti Gritti
f20348a5fd There are 4 different menu shells on the panel, check against the right one. 2007-01-16 20:32:29 +01:00
Tomeu Vizoso
93e030216c Update to new icon API. 2007-01-16 19:22:50 +01:00
Dan Williams
55a459e63d Reduce launch feedback interval to boost launch times 2007-01-16 10:44:43 -05:00
Marco Pesenti Gritti
eef96e7076 Accidentally reverted...
Revert "Revert "On edges show the frame after 1.5 seconds""

This reverts commit cbc8abbb08.
2007-01-16 14:38:51 +01:00
Marco Pesenti Gritti
31ce0dbf69 Remove some unused imports 2007-01-16 00:49:04 +01:00
Marco Pesenti Gritti
cbc8abbb08 Revert "On edges show the frame after 1.5 seconds"
This reverts commit 5e08830feb.
2007-01-15 23:31:07 +01:00
Marco Pesenti Gritti
c30451b19e Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-01-15 11:55:35 +01:00
Marco Pesenti Gritti
5e08830feb On edges show the frame after 1.5 seconds 2007-01-15 11:28:30 +01:00
Dan Williams
2d6e577a16 Enable caching of rendered icon surfaces during launch feedback 2007-01-14 18:22:43 -05:00
Dan Williams
8e614af2de Precompute color fade values; longer redraw interval
cycles be precious, don't waste them
2007-01-14 14:22:12 -05:00
Marco Pesenti Gritti
58b7e4108d Add support for screen rotation. 2007-01-13 23:08:21 +01:00
Marco Pesenti Gritti
f530f5e276 Tweak sounds level a bit as per Flipo suggestion 2007-01-13 00:21:58 +01:00
Marco Pesenti Gritti
6971ddb9a4 Support for activity icons inside the bundle.
Patch by Gonzalo Odiard <godiard@gmail.com>
Modified by me to allow icon theme to override the bundle one.
2007-01-12 21:35:53 +01:00
Marco Pesenti Gritti
55339d4bea Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-01-12 14:31:38 +01:00
Marco Pesenti Gritti
4505c53abc Disable camera key until key autorepeat is fixed 2007-01-12 13:19:19 +01:00
Tomeu Vizoso
334be3331b Some more usability fixes for the clipboard. 2007-01-11 23:57:06 +01:00
Marco Pesenti Gritti
58f218133b Also slide out the frame on shutdown 2007-01-11 11:43:34 +01:00
Marco Pesenti Gritti
297381cad7 Basic implementation of the shutdown graphics 2007-01-11 11:20:08 +01:00
John (J5) Palmieri
dda16d83c0 Merge branch 'master' of git+ssh://johnp@dev.laptop.org/git/sugar 2007-01-10 16:55:22 -05:00
John (J5) Palmieri
b2bf400b67 add import for sugar.graphics.IconColor 2007-01-10 16:55:12 -05:00
Marco Pesenti Gritti
6e599ead06 Toggle console visibility 2007-01-10 17:12:23 +01:00
Marco Pesenti Gritti
84d3471613 Fix to follow the new home api 2007-01-10 15:30:21 +01:00
John (J5) Palmieri
4869f74642 add prelight on mouse enter to activity icons
* prelight uses profile.get_color()
2007-01-09 15:25:51 -05:00
Dan Williams
4853f68eaa Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-01-09 14:21:47 -05:00
Dan Williams
e14c928640 Increase launch timeout to 20s 2007-01-09 14:21:40 -05:00
Marco Pesenti Gritti
ac090fa8e7 Fix part 1 of #439. Also cleanup code a bit. 2007-01-09 20:15:18 +01:00
Marco Pesenti Gritti
5e7735cbae Improve keybindings, fix #575 2007-01-09 18:23:35 +01:00
Marco Pesenti Gritti
987386ddd1 s/=/equal 2007-01-09 18:11:14 +01:00
Marco Pesenti Gritti
429a7ff970 Ensure to emit an activity changed signal when closing the last window. Fix #690. 2007-01-09 17:55:35 +01:00
Marco Pesenti Gritti
ca4704787e Work around the unfocusable terminal bug. For some reason I can't open a terminal directly from the key event. 2007-01-09 16:57:43 +01:00
Marco Pesenti Gritti
1bb37c34de Correct keyboard brightness keycode 2007-01-09 15:31:01 +01:00
Dan Williams
018867a9a8 Remove debug print 2007-01-08 22:56:45 -05:00
Dan Williams
e7956a7bc1 Pulse icons while activity is launching
Saturate/desaturate the icon's colors on a sin curve while launching
2007-01-08 22:55:12 -05:00
Dan Williams
946a8f1b42 Misc shell activity launch fixes
also switch to home screen when launching an activity so we can
get feedback on launch status
2007-01-08 17:05:55 -05:00
Marco Pesenti Gritti
cae78d7041 Rework the console to use autoactivation, move it in services/ 2007-01-08 18:06:59 +01:00
Marco Pesenti Gritti
764eee81e5 Adapt to olpc-hardware-manager API change 2007-01-08 15:00:22 +01:00
Marco Pesenti Gritti
3f847008af Typo 2007-01-08 14:39:09 +01:00
Marco Pesenti Gritti
17a1cb7ae4 Adapt to the new hardware manager 2007-01-08 13:09:13 +01:00
Tomeu Vizoso
1ee6b7faf0 Some clipboard fixes. 2007-01-07 23:38:33 +01:00
Eduardo Silva
a7d6251664 Merge branch 'master' of git://dev.laptop.org/sugar 2007-01-07 14:25:25 -03:00
Eduardo Silva
aad2893f62 [devconsole] - Starting like a dbus service, just open it one time 2007-01-07 14:23:53 -03:00
Dan Williams
70a5e27edd Refactor activity icon handling in the Home View donut
Give each activity icon in the donut its own class to track
launch status in preparation for pulsing launch feedback.
2007-01-07 01:18:57 -05:00
Dan Williams
fb716ae046 Make activity launching asynchronous
The ActivityFactory create() method now returns a handler GObject,
which callers may attach signals to to receive success and error
signals from the result of the activity launch request.
2007-01-07 00:04:30 -05:00
Dan Williams
8cea4c5fc6 Track activities while they launch
HomeModel now uses the activity ID to track activities, and creates
the HomeActivity object when the activity is launched, not when
its window appears.
2007-01-06 19:31:19 -05:00
Dan Williams
b27257fadb Make shell responsible for activity ID generation
Enables tracking of activity launch throughout the whole process, so that
the shell can be aware of the activity ID from the moment the activity
is started by the shell, until the activity becomes active.  Previously,
the activity itself generated its own ID and told the shell what it was.
2007-01-06 16:29:13 -05:00
Tomeu Vizoso
f50d9f5f9a Added icon, title and preview for clipboard objects. Also allow for opening docs and rtfs from the web. 2007-01-05 21:13:46 +01:00
Eduardo Silva
74e407f9ff [devconsole] - Scrollback terminal buffer set to 1000, font size to 8 2007-01-05 17:01:29 -03:00
Marco Pesenti Gritti
62f5c2e239 Cleanup keybindings, fix color/b&w 2007-01-05 20:32:00 +01:00
Dan Williams
1ef693572f Respect return value from 'execute' 2007-01-05 12:25:21 -05:00
Marco Pesenti Gritti
be631afee5 Comment out .5 keys for now, they break stuff and don't work on the keyboard. 2007-01-05 12:57:42 +01:00
Marco Pesenti Gritti
8b9a8e01f8 Remove obsolete file 2007-01-05 12:28:51 +01:00
Marco Pesenti Gritti
2c923b9532 Shutdown when pressing the power button on the olpc. 2007-01-05 12:23:28 +01:00
Marco Pesenti Gritti
5c36c6f274 Remove the shutdown graphical button 2007-01-05 12:20:55 +01:00
Marco Pesenti Gritti
62eada2ee0 Implement audio controls 2007-01-05 03:21:55 +01:00
Marco Pesenti Gritti
dda100fca6 Stub volume control code 2007-01-05 02:19:52 +01:00
Eduardo Silva
bcc4b4f34f Merge branch 'master' of git://dev.laptop.org/sugar 2007-01-04 16:29:14 -03:00
Eduardo Silva
15f586e61a Moving to PEP-8 2007-01-04 16:17:10 -03:00
Marco Pesenti Gritti
41ba004ca3 Fix brightness keybinding 2007-01-04 20:02:45 +01:00
Eduardo Silva
3dd0def247 [dev-console] - Interfaces fixed: memphis, logviewer 2007-01-03 23:51:08 -03:00
Eduardo Silva
e28a1b27ee [dev-console] - New internal structure, and new XO interface 2007-01-02 20:24:44 -03:00
Eduardo Silva
80cd6af44c New log viewer, no more tabs 2007-01-01 22:39:01 -03:00
Marco Pesenti Gritti
a4e1b6b3ff Fix handling of the no activities case 2006-12-24 15:58:53 +01:00
Marco Pesenti Gritti
b3c2368eac Complete the shell model/view split, finally 2006-12-24 15:39:00 +01:00
Marco Pesenti Gritti
0d1e07d9c3 Split ActivityHost in model/view. Refactor accordingly. 2006-12-24 14:35:02 +01:00
Marco Pesenti Gritti
2db2ae5312 Split model/view in the activities donut.
Provide some infrastructure for Alt+Tab implementation.
2006-12-24 12:19:24 +01:00
Marco Pesenti Gritti
db6f615198 Start the journal activity by default 2006-12-24 02:59:20 +01:00
Marco Pesenti Gritti
dce69ef995 Refactor a bit to simply __init__ 2006-12-24 02:51:37 +01:00
Marco Pesenti Gritti
5623c8a3b1 Change the Activity execute method to add a result boolean (handle/not handled).
When the camera key is pressed the Shell send and command to the active activity,
if that's not handled than it startup org.laptop.CameraActivity.
2006-12-21 12:37:02 +01:00
Dan Williams
5512f8461b Re-enable buddy icons in rollover menus 2006-12-21 02:10:21 -05:00
Dan Williams
b960533fb4 Convert shared activity type to an activity bundle service name for activation via DBus 2006-12-20 23:42:16 -05:00
Marco Pesenti Gritti
e023d1c345 Get back mesh view to work. It got broken when refactoring bundles. 2006-12-20 13:58:29 +01:00
Dan Williams
f63456c089 Tell activities to start after launching them 2006-12-19 16:35:24 -05:00
Dan Williams
cebf9cfe33 Use correct DBus session bus when launching activities 2006-12-19 16:00:50 -05:00
Marco Pesenti Gritti
6b09475b99 Add a start method to the activity. It's parallel/alternative to join. 2006-12-18 14:24:28 +01:00
Marco Pesenti Gritti
e0bd5d1df4 Cleanup activity factory startup, remove duplicated argument from the Exec field 2006-12-18 13:47:49 +01:00
Marco Pesenti Gritti
09b096d4d0 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-12-17 00:02:38 +01:00
Tomeu Vizoso
eba35406c5 Usability fixes for dnd on the clipboard 2006-12-16 23:55:22 +01:00
Marco Pesenti Gritti
6c2607d000 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-12-14 23:38:32 +01:00
Dan Williams
72b5383214 Export session bus address for testing purposes 2006-12-14 17:21:25 -05:00
Marco Pesenti Gritti
cc74954770 Remove the terminal keybinding, terminal is now in the devel console 2006-12-14 17:03:11 +01:00
Tomeu Vizoso
eade4bff03 Improve error reporting when a non-activity window is opened. 2006-12-14 16:45:52 +01:00
Tomeu Vizoso
cc39ef169f Clipboard fixes. 2006-12-14 13:50:42 +01:00
Tomeu Vizoso
e68f0e00e9 Added c&v and dnd support to the clipboard. 2006-12-13 22:36:05 +01:00
Owen Williams
e54c40301c Added configuration file support to terminal 2006-12-12 00:53:56 +01:00
Dan Williams
fefe201d24 Patch from Owen Williams:
Switch terminal colors to black-on-white for readability, especially in
no-backlight situations.
2006-12-07 12:55:56 -05:00
Justin Gallardo
b9f9ef0fe9 Changed all tabs to 4 spaces for python style 2006-12-04 11:12:24 -08:00
Marco Pesenti Gritti
78c538535b Fixup makefiles 2006-12-01 23:30:32 +01:00
Marco Pesenti Gritti
7152755c5e Remove more unused old activities stuff 2006-12-01 23:11:56 +01:00
Marco Pesenti Gritti
518d2d61d0 Remove unused old registry code 2006-12-01 23:09:02 +01:00
Marco Pesenti Gritti
ba5d1b4804 Finish up porting to the new registry 2006-12-01 23:04:14 +01:00
Marco Pesenti Gritti
2b97505577 Switch to the new registry 2006-12-01 22:40:02 +01:00
Marco Pesenti Gritti
b5b9d9d5f1 Remove more old activities code 2006-12-01 22:33:00 +01:00
Marco Pesenti Gritti
6169f603e5 Remove the old activities code path from here 2006-12-01 22:23:12 +01:00
Marco Pesenti Gritti
6bdda47901 Since service name and bundle id corrisponds, there
is no need to query the register anymore.
2006-12-01 22:22:09 +01:00
Dan Williams
880842dd86 don't kill the shell when a non-activity window is brought to front
(cherry picked from 5f03e1deb014d91af7deea5051011a67bc2dde5c commit)
2006-11-17 15:31:53 -05:00
Dan Williams
0c47294dbd Merge 2006-11-16 16:55:58 -05:00
Dan Williams
a029157488 Remap keys to match OLPC keyboard and use Shift+Alt for non-OLPC machines 2006-11-16 16:50:36 -05:00
Eduardo Silva
9031ebf503 developer console window size fixes 2006-11-16 14:48:13 +01:00
Eduardo Silva
d51031d882 New developer-console 2006-11-16 14:47:07 +01:00
Dan Williams
b51b2917d0 Rearrange keymappings for the real B1 machines' keyboards
(cherry picked from cda50cbf099f1db64f3cd95aeb05b54444fd66d0 commit)
2006-11-15 17:13:45 -05:00
Tomeu Vizoso
59d57a03d9 First implementation of ClipboardService. Implement pdf viewing and downloading via ClipboardService. 2006-11-15 13:56:19 +01:00
Marco Pesenti Gritti
b2e7bc079c Work around the unfocusable terminal bug 2006-11-13 22:15:08 +01:00
Marco Pesenti Gritti
fcea34c227 Fix makefile 2006-11-12 00:28:19 +01:00
Marco Pesenti Gritti
d3e99e76ef Add a shutdown button 2006-11-11 23:51:16 +01:00
Tomeu Vizoso
61f24de748 Reverting clipboard changes pushed by mistake. These are commits 23565cfd48 and a7e4092b0e. 2006-11-10 14:14:15 +01:00
Tomeu Vizoso
d958e20df7 Make work enter on first time dialog. Fix for bug #324. 2006-11-10 13:40:49 +01:00
Tomeu Vizoso
028bf526f2 Merge branch 'master' of git://dev.laptop.org/sugar 2006-11-10 11:58:11 +01:00
Marco Pesenti Gritti
5c1dbe499f Release 0.51 2006-11-09 00:31:28 +01:00
Marco Pesenti Gritti
c8cd4bcc4e Add a shutdown key combination. Release 0.51 2006-11-09 00:08:33 +01:00
Marco Pesenti Gritti
d1a9762cb8 Bind keys to dcon manager actions, see README 2006-11-08 16:42:50 +01:00
Tomeu Vizoso
a7e4092b0e Created SugarDownloadManager and ClipboardService's wrapper. Show and hide the frame when adding an object to the clipboard. 2006-11-05 19:52:46 +01:00
Tomeu Vizoso
b9f75c1472 Merge branch 'master' of git://dev.laptop.org/sugar 2006-11-05 18:51:05 +01:00
Marco Pesenti Gritti
ee62ed69b4 Pick up system bundles even if xdg dir env is undefined 2006-11-05 18:14:00 +01:00
Tomeu Vizoso
f428b3ab74 Merge branch 'master' of git://dev.laptop.org/sugar 2006-11-03 16:18:39 +01:00
Marco Pesenti Gritti
00026fb5ef Check if we should show the launcher 2006-11-03 16:11:59 +01:00
Tomeu Vizoso
23565cfd48 First version of the ClipboardService. Added support for showing the progress of a pdf download in the clipboard. 2006-11-01 19:43:59 +01:00
Marco Pesenti Gritti
8571920734 Tweak activity search path. Use ~/Activities and XDG_DATA_DIRS/activities 2006-10-31 13:10:34 +01:00
Marco Pesenti Gritti
cb285aba06 Get running activities to work. Still hacky. 2006-10-31 12:06:28 +01:00
Marco Pesenti Gritti
d150ac40cc More work on bundles support 2006-10-29 19:05:09 +01:00
Marco Pesenti Gritti
28f5de3deb Remove unused file 2006-10-29 17:34:27 +01:00
Dan Williams
b2983ac763 Better working nm-applet
- Start nm-applet when the shell starts
- Use the artwork
- Respond to signals and get initial states
2006-10-29 01:33:42 -04:00
Marco Pesenti Gritti
2f58f41e9e Missing file 2006-10-24 20:19:00 +02:00
Marco Pesenti Gritti
6ab3b3c07e Cleanup logs dir on shell startup 2006-10-24 20:00:14 +02:00
Marco Pesenti Gritti
2aa69e7199 Add the overlay icon on the frame 2006-10-24 19:44:18 +02:00
Marco Pesenti Gritti
ad7d04f736 Fix styling of the invites icon 2006-10-23 21:28:19 +02:00
Marco Pesenti Gritti
077bc6a4f1 Do not return the whole dict, just the values! 2006-10-20 18:24:17 +02:00
Marco Pesenti Gritti
f997d02a7a should be add_alone_buddy, add_buddy does not exist 2006-10-20 16:30:30 +02:00
Dan Williams
d784a906e4 Add initial buddies, protect against buddies we don't know about before using them 2006-10-19 15:07:21 -04:00
Dan Williams
4a09253f5f Add initial activities & protect against addition/removal of buddies we don't know about 2006-10-19 15:06:01 -04:00
Marco Pesenti Gritti
4f81f305b2 Fix a race in the spread box. Adapt to api change. 2006-10-19 16:49:53 +02:00
Marco Pesenti Gritti
36e535a29a More fixes 2006-10-19 16:12:55 +02:00
Marco Pesenti Gritti
62659e2806 Show the share button only when the activity is not shared 2006-10-19 15:44:00 +02:00
Marco Pesenti Gritti
cd29967c2e Refactor a bit to keep host independent from the shell 2006-10-19 15:22:42 +02:00
Marco Pesenti Gritti
cf13a7ff5b Unregister the chat service on destroy. 2006-10-19 14:51:13 +02:00
Marco Pesenti Gritti
21aa37cc24 Do not assume when curactivity change we already know about that activity. 2006-10-19 13:28:59 +02:00
Marco Pesenti Gritti
3d3ef947e1 Fix method naming conflict 2006-10-19 12:55:25 +02:00
Marco Pesenti Gritti
fafa1ae35e Refactor stylsheets code a bit to load the global stylsheet
for all modules.
Implement the links sidebar per discussion with Eben.
2006-10-19 11:54:51 +02:00
Marco Pesenti Gritti
6c375a20f3 Center the icon in the allocation space 2006-10-18 19:41:34 +02:00
Marco Pesenti Gritti
f3fbea70a3 Rework menu positioning logic 2006-10-18 17:57:41 +02:00
Marco Pesenti Gritti
54dcb672e5 Move the menu positioning code inside menu shell and
unify it.
2006-10-18 16:23:06 +02:00
Marco Pesenti Gritti
37e1bf6100 When showing the frame automatically hide it on leave, otherwise
it gets annoying.
2006-10-18 00:57:05 +02:00
Marco Pesenti Gritti
03bca10376 Listen also to enter event for frame activation. This makes
mouse activation actually reliable.
2006-10-18 00:44:23 +02:00
Marco Pesenti Gritti
3cda316d11 Enable logging for the shell too 2006-10-18 00:08:14 +02:00
Marco Pesenti Gritti
637a08154e Fix some path bugs. Reload the profile when first time dialog wrote it. 2006-10-17 14:31:04 +02:00
Marco Pesenti Gritti
9ca5c6c0bf Fix opening activities 2006-10-17 10:17:30 +02:00
Marco Pesenti Gritti
77f2de8f73 Let activities extend their own path 2006-10-17 10:07:35 +02:00
Marco Pesenti Gritti
f74614a02b Let the shell deal with extending his own path 2006-10-17 09:39:31 +02:00
Marco Pesenti Gritti
535b67ea41 alt+q shutdown the emulator 2006-10-17 01:09:44 +02:00
Marco Pesenti Gritti
87458b63f5 Fix 2006-10-16 20:59:59 +02:00
Marco Pesenti Gritti
1803ab1a88 Handle icon removal, better alignment 2006-10-16 20:42:39 +02:00
Marco Pesenti Gritti
528dc5a046 Forgot to add these 2006-10-16 18:43:31 +02:00
Marco Pesenti Gritti
5e503f77d1 Get the tray icon to sort of work. 2006-10-16 18:43:04 +02:00
Marco Pesenti Gritti
ab55456801 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-10-16 16:42:06 +02:00
Marco Pesenti Gritti
e00fea9480 Fix a few bugs 2006-10-16 16:38:02 +02:00
Dan Williams
8b46b55e80 Remove dead file from makefile 2006-10-16 10:37:46 -04:00
Marco Pesenti Gritti
790129cb52 Add support for multiple logs 2006-10-16 16:26:37 +02:00
Marco Pesenti Gritti
69647f75b7 Remove more bits of the old console 2006-10-16 16:04:14 +02:00
Marco Pesenti Gritti
4e88e927fb Remove the old dbus stuff, use one log file per process 2006-10-16 15:56:22 +02:00
Marco Pesenti Gritti
5cee6aa01d Hook the log viewer to F12 2006-10-16 15:29:32 +02:00
Marco Pesenti Gritti
07dd398e22 Hack a simple log viewer. 2006-10-16 15:24:23 +02:00
Marco Pesenti Gritti
096d5c5238 Fix makefiles 2006-10-16 13:40:59 +02:00
Marco Pesenti Gritti
bc0ee6d34c Refactor startup. In progress, give me a couple hours.
For now start sugar with "sugar-emulator shell/sugar-shell"
2006-10-16 13:34:43 +02:00
Marco Pesenti Gritti
43bd44b407 Add GPL headers 2006-10-15 01:24:45 +02:00
Marco Pesenti Gritti
62fd4dcd89 Basic functionalities mostly working 2006-10-13 19:04:04 +02:00
Marco Pesenti Gritti
c7fdae2606 Fix title handling. Hide old browser and chat. 2006-10-13 11:17:35 +02:00
Marco Pesenti Gritti
62a46ff92b Create a private sugar lib and put our extensions there. 2006-10-12 12:47:17 +02:00
Marco Pesenti Gritti
8c3ac8960f Spread box cleanups and fixes 2006-10-07 14:33:08 +02:00
Marco Pesenti Gritti
b33a1c141f Move the layouts to be box and subclass them. 2006-10-06 11:11:38 +02:00
Marco Pesenti Gritti
4b36f84c30 Fix several makefiles, use olpc theme for matchbox 2006-10-05 19:48:12 +02:00
Marco Pesenti Gritti
5b37955647 Revert "Install our own matchbox theme to disable shadows"
This reverts 0e77fc5bf9 commit.
2006-10-05 19:34:19 +02:00
Marco Pesenti Gritti
1b0e469dbd More work on the views layout 2006-10-05 18:53:34 +02:00
Marco Pesenti Gritti
0533d1ffd6 Rewrite for hippo 2006-10-05 17:46:36 +02:00
Marco Pesenti Gritti
6479962ca7 Get back presence list to work 2006-10-05 17:09:38 +02:00
Marco Pesenti Gritti
847f69fce7 More stylification 2006-10-05 16:29:55 +02:00
Marco Pesenti Gritti
0bd96b3987 More stylsheets work 2006-10-05 14:52:33 +02:00
Marco Pesenti Gritti
250060b7f8 Remove several hardcoded sizes, substitute them with stylesheets. 2006-10-05 14:38:37 +02:00
Marco Pesenti Gritti
b3abf30dec Improve stylesheet loading 2006-10-05 13:26:02 +02:00
Marco Pesenti Gritti
0e77fc5bf9 Install our own matchbox theme to disable shadows 2006-10-04 19:52:03 +02:00
Marco Pesenti Gritti
5da630c13a Kill unused code, fix makefiles 2006-10-04 15:37:53 +02:00
Marco Pesenti Gritti
62ee1df83c Complete the de-goocanvasification 2006-10-04 15:26:41 +02:00
Marco Pesenti Gritti
72a4aa6fe2 Reimplement the donut using hippo canvas 2006-10-04 14:23:15 +02:00
Marco Pesenti Gritti
1f8ff1db1f Move all the canvas code that doesn't depend on goocanvas anymore in graphics. 2006-10-04 00:55:20 +02:00
Marco Pesenti Gritti
717bdd66f4 Get rid of the old Grid and CanvasBox 2006-10-04 00:25:03 +02:00
Ian Bicking
48951dc1cb Merge branch 'master' of git://dev.laptop.org/sugar 2006-10-03 11:59:40 -05:00
Marco Pesenti Gritti
0cd31b900a Move the menu to hippo canvas 2006-10-03 18:52:11 +02:00
Marco Pesenti Gritti
8f9f473073 Fix makefiles 2006-10-03 17:12:34 +02:00
Marco Pesenti Gritti
75b86618de Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-10-03 16:34:14 +02:00
Marco Pesenti Gritti
e14aa30f07 Port mesh and friends view to hippo, needs work 2006-10-03 16:31:32 +02:00
Ian Bicking
dcf97548c4 Merge branch 'master' of git://dev.laptop.org/sugar 2006-10-02 18:15:34 -05:00
Dan Williams
88da2c7e2d Update makefile 2006-10-02 15:41:44 -04:00
Ian Bicking
9a4cc50ee8 Merge branch 'master' of git://dev.laptop.org/sugar 2006-10-02 10:35:28 -05:00
Marco Pesenti Gritti
a951b36347 Reimplement menu using hippo and hook it up for the
activity menu.
2006-10-02 16:37:30 +02:00
Marco Pesenti Gritti
0a912e214a Start moving to hippo canvas. (Friends presence in the activity regressed) 2006-10-02 01:50:43 +02:00
Marco Pesenti Gritti
be70008c07 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-10-01 19:06:09 +02:00
Ian Bicking
607a8e6e9a Merge branch 'master' of git://dev.laptop.org/sugar 2006-09-29 16:38:52 -05:00
Dan Williams
ca56406aa4 Add OverlayWindow to makefile 2006-09-29 16:46:12 -04:00
Dan Williams
72562502b9 Add composited overlay window underneath chat 2006-09-29 13:35:48 -04:00
Ian Bicking
242f96deb3 Merge branch 'master' of git://dev.laptop.org/sugar 2006-09-28 17:54:19 -05:00
Marco Pesenti Gritti
1e75007161 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-09-29 00:24:12 +02:00
Marco Pesenti Gritti
4f2b8b3e31 No need to initialize gtk threads, glib is enough.
Fix lockups in the browser.
2006-09-29 00:23:24 +02:00
Dan Williams
ba05afdc53 Activate chat service when activity gets shared 2006-09-28 17:08:42 -04:00
Dan Williams
5db9888666 Set default chat window size 2006-09-28 17:00:03 -04:00
Dan Williams
a55242d798 Center chat window, and give it a frame 2006-09-28 16:20:48 -04:00
Dan Williams
e2225c443f Initialize _frame_was_visible, and move signal connections lower 2006-09-28 16:13:48 -04:00
Dan Williams
ef539c50d9 Fix frame behavior on chat; when we show the chat remember previous frame state and return to it when we hide chat 2006-09-28 16:12:07 -04:00
Dan Williams
a91738d3a9 Default values for args for do_slide_in and do_slide_out, and add is_visisble() 2006-09-28 16:11:29 -04:00
Dan Williams
5a6a0d2d7d Start making activity chat work; hit F9 to activate 2006-09-28 15:52:56 -04:00
Dan Williams
ddef3947d4 Import gobject 2006-09-28 14:45:32 -04:00
Ian Bicking
56281c804f Revert "Make ShellModel emit signals on activity change, and make Owner listen for them. Fix Owner's current activity update code to actually update at the correct interval"
This reverts 906f5bbed0 commit.
2006-09-27 16:51:56 -05:00
Dan Williams
906f5bbed0 Make ShellModel emit signals on activity change, and make Owner listen for them. Fix Owner's current activity update code to actually update at the correct interval 2006-09-27 17:00:12 -04:00
Dan Williams
71b0e7c3a9 Don't traceback on unknown image formats 2006-09-27 14:27:17 -04:00
Marco Pesenti Gritti
7443ee4c8b Don't allow empty nick names and if it happens consider
the profile invalid.
2006-09-26 22:52:45 +02:00
Marco Pesenti Gritti
92e37fd904 Fix add and remove friends 2006-09-26 19:49:41 +02:00
Marco Pesenti Gritti
c8fd8ef3d9 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-09-26 19:37:43 +02:00
Dan Williams
ba21a36ef8 Correctly deal with current activities on startup, buddy presence changes, and current activity changes 2006-09-26 13:40:52 -04:00
Dan Williams
c9533d448b Fix current activity handling 2006-09-26 13:39:42 -04:00
Marco Pesenti Gritti
4975e94a84 Update some icon names 2006-09-26 19:35:58 +02:00
Marco Pesenti Gritti
fa31b7c0bd Align to the center of the icon 2006-09-25 22:06:45 +02:00
Marco Pesenti Gritti
5b3eeb0a9c Keep the icon layout updated when adding buddies to the snow flake 2006-09-25 22:01:35 +02:00
Marco Pesenti Gritti
9619921735 Image layout fixes 2006-09-25 21:35:25 +02:00
Dan Williams
ef24aa7553 Scale the icon to a paritcular size 2006-09-25 15:36:40 -04:00
Dan Williams
6e28f4467d Add buddy icon to the buddy menu 2006-09-25 15:20:28 -04:00
Dan Williams
550c201101 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-09-25 14:15:49 -04:00
Dan Williams
d0664dc801 Add icon-changed signal 2006-09-25 14:05:01 -04:00
Marco Pesenti Gritti
57992d3fb4 Handle None current activity case 2006-09-25 19:41:08 +02:00
Marco Pesenti Gritti
aa71d354b2 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-09-25 19:15:44 +02:00
Marco Pesenti Gritti
2ad9696c87 Adapt to BuddyModel constructor change 2006-09-25 19:15:23 +02:00
Dan Williams
709eefc5bd Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-09-25 13:14:36 -04:00
Marco Pesenti Gritti
d63180c4f4 Some fixes 2006-09-25 18:55:35 +02:00
Marco Pesenti Gritti
59add6e901 More work on the mesh view 2006-09-25 18:38:01 +02:00
Dan Williams
de23158979 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-09-25 10:57:26 -04:00
Dan Williams
ea5b59dca7 Send buddy icon hash in presence service announcement too 2006-09-25 10:56:12 -04:00
Marco Pesenti Gritti
2ee61e4475 Show activities again 2006-09-25 16:40:15 +02:00
Marco Pesenti Gritti
e31bcc76b3 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-09-25 16:01:29 +02:00
Marco Pesenti Gritti
56229aad36 Write a mesh model and start using it in the mesh view 2006-09-25 16:01:11 +02:00
Dan Williams
9fa9bd9583 Add BuddyActivityView.py to makefile 2006-09-25 09:25:44 -04:00
Marco Pesenti Gritti
1070ed3ae6 Better layout 2006-09-25 11:42:13 +02:00
Marco Pesenti Gritti
d5f8d62d35 Add size request to BuddyActivityView and use it in IconLayout 2006-09-25 11:35:30 +02:00
Dan Williams
3e4c8cabc7 Switch to BuddyActivityView to show current activity 2006-09-24 23:15:53 -04:00
Dan Williams
da221ee84e Add get_current_activity accessor 2006-09-24 23:12:46 -04:00
Marco Pesenti Gritti
bcd150fa81 Implement very simple spread out logic for the IconLayout 2006-09-25 00:08:33 +02:00
Marco Pesenti Gritti
3f73da0549 Some cleanups of the IconLayout 2006-09-24 22:55:13 +02:00
Dan Williams
e92548df5c Use the new BuddyModel color-changed signal 2006-09-22 17:37:41 -04:00
Dan Williams
d12c57895c Add color-changed and current-activity-changed signals 2006-09-22 17:37:16 -04:00
Dan Williams
188394f09f - Track BuddyModel appeared/disappeared signals, and update our icon colors accordingly
- s/friend/buddy since BuddyModel isn't just for friends
2006-09-22 17:24:56 -04:00
Dan Williams
2031eb650a - don't hardcode inactive buddy color
- shorten signal handler id variable names
- add appeared/disappeared signals to BuddyModel
- deal with buddy disappearance
2006-09-22 17:24:00 -04:00
Dan Williams
0aea72f485 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-09-22 16:35:09 -04:00
Dan Williams
940329703f Clean up buddy checking & retrieval; make constructor choice between name & real buddy explicit. 2006-09-22 16:35:03 -04:00
Marco Pesenti Gritti
fc000346e4 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-09-22 21:50:20 +02:00
Marco Pesenti Gritti
a2489b49d4 Fix a few bugs 2006-09-22 21:49:59 +02:00
Dan Williams
2d445fcc5f Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-09-22 15:49:23 -04:00
Dan Williams
2f7b3abef7 Monitor buddy property change signals on creation; misc cleanups 2006-09-22 15:49:16 -04:00
Marco Pesenti Gritti
f2b2b8c6ba Fix friends removal 2006-09-22 21:36:52 +02:00
Marco Pesenti Gritti
17913d20b8 Increase zoom view icon sizes 2006-09-22 21:29:48 +02:00
Dan Williams
801d020058 Don't die on malformed friends config file 2006-09-22 12:50:55 -04:00
Marco Pesenti Gritti
4a1995af8d Play with sizes a bit 2006-09-22 15:06:43 +02:00
Marco Pesenti Gritti
d8c61d271a Convert to the new icon format 2006-09-22 14:32:07 +02:00
Marco Pesenti Gritti
2d8c9a3310 Implement activation modes. Do not hide when sticky because
activated by single frame key press.
2006-09-22 11:14:33 +02:00
Marco Pesenti Gritti
5e55efe9d5 Get icon size from the handle. Remove the padding from
the zoom view icons and reorder them.
2006-09-22 10:55:10 +02:00
Dan Williams
3c11feca6f Start trying to deal with current activity changes 2006-09-21 16:49:25 -04:00
Dan Williams
f9012b88f6 Move remove code down to fix undefined var error 2006-09-21 13:52:17 -04:00
Marco Pesenti Gritti
66124465e8 Do not show the frame when leaving the edge before the time 2006-09-21 18:04:37 +02:00
Marco Pesenti Gritti
af54df80ec Handle closing all activities correctly 2006-09-21 15:16:36 +02:00
Marco Pesenti Gritti
229793e9f0 Adapt to API change 2006-09-21 15:02:46 +02:00
Marco Pesenti Gritti
3c64b65829 Drop color schemes per design change 2006-09-21 15:00:59 +02:00
Marco Pesenti Gritti
a054eb3a4b Implement the frame mouse activation logic.
Some fixes in the Timeline
2006-09-21 14:45:36 +02:00
Marco Pesenti Gritti
446a58d52c Simple timeline API.
Use it to implement the frame key logic.
2006-09-21 14:08:10 +02:00
Marco Pesenti Gritti
09db49cc18 s/BuddyInfo/BuddyModel 2006-09-20 12:27:38 +02:00
Dan Williams
d0f23744f0 Use asynchronous service resolution to capture service updates too 2006-09-19 13:54:32 -04:00
Marco Pesenti Gritti
ec0debdb30 Do not hide the frame if menushell is active. 2006-09-19 14:43:42 +02:00
Marco Pesenti Gritti
9ff192d0b3 Use a different menu shell for the zoom view and the frame 2006-09-19 14:04:11 +02:00
Marco Pesenti Gritti
f5ef5d8c94 Show/hide the frame on mouse motion, needs work 2006-09-18 16:51:21 +02:00
Marco Pesenti Gritti
180c65e81c Implement close button for the activity.
Some fixes.
2006-09-18 11:56:53 +02:00
Marco Pesenti Gritti
1f3187e0b5 Cleanup shell model/view separation 2006-09-18 11:48:33 +02:00
Marco Pesenti Gritti
89e2f5be91 Rework menu positioning. Cleanups. 2006-09-17 01:05:59 +02:00
Marco Pesenti Gritti
edba3e0082 Implement menu color scheme and fixup colors 2006-09-16 20:48:27 +02:00
Marco Pesenti Gritti
465253d95e Initial implementation of the activity menu 2006-09-16 20:35:03 +02:00
Marco Pesenti Gritti
d9fc47ca01 s/BuddyPopup/BuddyMenu 2006-09-16 15:43:07 +02:00
Marco Pesenti Gritti
a1d2b993c0 Generic menu 2006-09-16 15:36:39 +02:00
Marco Pesenti Gritti
8dbdda5384 Move all the popup logic from IconItem to MenuIcon 2006-09-16 15:01:38 +02:00
Marco Pesenti Gritti
7c91b1c49f Factor out to a generic icon with menu 2006-09-16 14:45:09 +02:00
Marco Pesenti Gritti
956b663409 Do not show invite if there is no active activity 2006-09-16 11:00:46 +02:00
Marco Pesenti Gritti
11a013aff2 For the owner show only nick name 2006-09-16 10:46:10 +02:00
Dan Williams
922b7238b9 Merge 2006-09-15 16:50:06 -04:00
Dan Williams
b39eff3365 Refcount tracked service types; ensure only the process that registers a service can change it; add support for updated service properties/published values 2006-09-15 16:41:11 -04:00
Marco Pesenti Gritti
e79a5f5e98 Really fix invites 2006-09-15 16:19:56 +02:00
Marco Pesenti Gritti
fe64b7c6d4 Fix invites 2006-09-15 16:04:30 +02:00
Marco Pesenti Gritti
a2655faa7d Fix makefiles 2006-09-15 15:35:20 +02:00
Marco Pesenti Gritti
7b37c4d38b Fix opening new activities 2006-09-15 15:30:46 +02:00
Marco Pesenti Gritti
f2f25f874d Implement friends removal, lots of cleanups 2006-09-15 15:28:18 +02:00
Marco Pesenti Gritti
16574cbfcc s/FriendIcon/BuddyIcon since that is generic now 2006-09-15 14:41:56 +02:00
Marco Pesenti Gritti
844216585a Pass around the shell so that groups can reuse the grid 2006-09-15 14:24:26 +02:00
Marco Pesenti Gritti
5f99dcf9a5 Move the presence service out of the shell 2006-09-15 13:54:16 +02:00
Marco Pesenti Gritti
bcc1740f7f Move the view to his own module 2006-09-15 13:23:21 +02:00
Marco Pesenti Gritti
ca19f0f251 Move the model to his own module 2006-09-15 12:52:37 +02:00
Marco Pesenti Gritti
14383f4fc7 Forgot to add the model 2006-09-15 12:40:46 +02:00
Marco Pesenti Gritti
645aa93e50 Split shell in model/view, cleanup things a lot 2006-09-15 12:40:22 +02:00
Marco Pesenti Gritti
0232dc73b5 Remove unused code 2006-09-15 11:49:04 +02:00
Marco Pesenti Gritti
207f643d38 Typo 2006-09-15 03:33:09 +02:00
Marco Pesenti Gritti
3a10f80aa1 A bunch of cleanups and fixes 2006-09-15 02:54:25 +02:00
Marco Pesenti Gritti
40ac396055 Fix small bugs in the grid logic 2006-09-15 01:56:59 +02:00
Marco Pesenti Gritti
ae9adff40b Cleanup 2006-09-15 01:30:37 +02:00
Marco Pesenti Gritti
3fc81ae945 Add a popup shell which ensure only one popup is active at
the same time.
2006-09-15 01:01:26 +02:00
Marco Pesenti Gritti
fd92a6d7d9 Improve popup/popdown logic 2006-09-15 00:34:42 +02:00
Marco Pesenti Gritti
3ee23b3a92 Keep popups out of the frame 2006-09-14 21:15:48 +02:00
Marco Pesenti Gritti
8265e29cdf Use FriendIcon in the frame 2006-09-14 20:52:21 +02:00
Marco Pesenti Gritti
3a4f8da5ce Factor out friend icon 2006-09-14 19:37:40 +02:00
Marco Pesenti Gritti
c36089522b s/BuddyPopup/FriendPopup 2006-09-14 15:21:36 +02:00
Marco Pesenti Gritti
2a6d2139ad Move popup menu handling in the icon 2006-09-14 15:12:34 +02:00
Marco Pesenti Gritti
3b41f1248a More layout fixes 2006-09-14 15:07:22 +02:00
Marco Pesenti Gritti
d053a7f219 Make the popup logic more solid 2006-09-14 14:24:14 +02:00
Marco Pesenti Gritti
fe69dec4ad Implement popup menu for friends 2006-09-14 13:03:11 +02:00
Marco Pesenti Gritti
8f6baf6239 Skeleton theme test 2006-09-13 16:26:54 +02:00
Marco Pesenti Gritti
016891ec9a Get rid of old grid implementation leftovers 2006-09-13 13:53:27 +02:00
Marco Pesenti Gritti
857b9cb659 Rewrite of the grid stuff. Simpler api and cleaner implementation.
Also follow the micro grids in pentagram design.
2006-09-13 13:50:00 +02:00
Dan Williams
7fc7656f78 Fix dead code error 2006-09-12 14:22:06 -04:00
Dan Williams
1853ea3a3e Fix traceback in logging print 2006-09-12 14:04:35 -04:00
Dan Williams
8c58dcd540 spacing cleanups; refactor service addition so that service address checks aren't done for owner 2006-09-12 12:58:24 -04:00
Dan Williams
bf035f3685 Cosmetic spacing fix 2006-09-12 12:48:32 -04:00
Dan Williams
13cca4606f Merge fix 2006-09-12 12:37:23 -04:00
Dan Williams
f205e8c67b Rework PS owner service handling to use avahi flags for local services 2006-09-12 12:36:24 -04:00
Marco Pesenti Gritti
8ebb57d985 I messed up... back to actually remove the service 2006-09-12 13:26:51 +02:00
Marco Pesenti Gritti
53f7cc1f34 Cleanup browser model service on destroy.
Remove the activity service even if the owner is gone.
2006-09-12 13:21:18 +02:00
Marco Pesenti Gritti
d65e8b88e7 Handle activity removal and cleanup a bit 2006-09-12 12:19:20 +02:00
Marco Pesenti Gritti
4ae80802ce Add some more error log messages 2006-09-11 16:00:24 +02:00
Marco Pesenti Gritti
6a90ef11d3 Export the color in the env and initialize the buddy with it 2006-09-11 15:18:57 +02:00
Marco Pesenti Gritti
47cc58b1e6 Make part of the session public so that it can used by tests 2006-09-10 02:35:53 +02:00
Marco Pesenti Gritti
62674bbd91 Use a notebook to work around goocanvas bugs :/ 2006-09-10 01:33:34 +02:00
Marco Pesenti Gritti
6296a4db9e Remove some unused imports 2006-09-09 18:29:07 +02:00
Marco Pesenti Gritti
1cc21aa7cf Remove invites when accepted 2006-09-09 14:37:11 +02:00
Marco Pesenti Gritti
9d4911d1e3 Insert the invites before the activities 2006-09-09 14:11:24 +02:00
Marco Pesenti Gritti
4cca5dc9ff Use stock-missing when there is no activity icon 2006-09-09 13:25:56 +02:00
Marco Pesenti Gritti
678cab55f9 Implement a simple box group and use it for the dynamic panels 2006-09-09 11:43:52 +02:00
Marco Pesenti Gritti
dd9e09ab1c More cleanups, show my icon at the center of the screen 2006-09-09 02:34:47 +02:00
Marco Pesenti Gritti
665f83d7ef Use the colors in the new design 2006-09-09 02:08:00 +02:00
Marco Pesenti Gritti
695fb7e1c5 Fix up dimensions 2006-09-09 02:05:00 +02:00
Marco Pesenti Gritti
5fc7e1137d Fix makefile 2006-09-09 01:55:25 +02:00
Marco Pesenti Gritti
41b528284c Use CanvasView, rework to the new design, cleanup code a lot 2006-09-09 01:54:44 +02:00
Marco Pesenti Gritti
7232f0e0ea Check there is actually a current activity before getting his id 2006-09-08 18:23:16 +02:00
Marco Pesenti Gritti
bfb09abf7d Fixup friends positioning and cleanup the code 2006-09-08 18:12:08 +02:00
Marco Pesenti Gritti
f4d8e538f4 Use has_key to check environ var 2006-09-08 18:03:40 +02:00
Marco Pesenti Gritti
bfe4922808 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-09-08 18:02:01 +02:00
Dan Williams
6e558713ff Add environment variable to control dbus monitor 2006-09-08 11:47:02 -04:00
Marco Pesenti Gritti
03aa335661 Fix friends colors 2006-09-08 16:27:17 +02:00
Marco Pesenti Gritti
233051875b Bring around both colors, since multiple combinations can have
the same base color.
2006-09-08 15:09:10 +02:00
Marco Pesenti Gritti
8d27527fd9 Integrate new colors table 2006-09-08 13:53:55 +02:00
Marco Pesenti Gritti
7abb2f7387 Remove buddies when they leave 2006-09-08 12:23:33 +02:00
Marco Pesenti Gritti
4e8278d4a6 Implement clear 2006-09-08 12:15:50 +02:00
Marco Pesenti Gritti
188edf560a Correct buddies placement 2006-09-08 11:35:28 +02:00
Marco Pesenti Gritti
10f3c1bc92 More fixes 2006-09-08 10:38:45 +02:00
Dan Williams
e2306d81bd Add PropertyChanged signal for Buddy objects because color and address can change later. Also don't try to stuff None through dbus 2006-09-07 23:30:22 -04:00
Dan Williams
4c167037d4 Add Owner to buddy list 2006-09-07 23:29:28 -04:00
Dan Williams
45e37349d2 Add dbus-monitor service, but disable to reduce spew 2006-09-07 23:28:01 -04:00
Marco Pesenti Gritti
e56954cf48 Create with correct grid size 2006-09-08 02:51:10 +02:00
Marco Pesenti Gritti
6bbb20c4c7 Add padding in the constraints constructor 2006-09-08 02:20:11 +02:00
Marco Pesenti Gritti
d58936869f Bugfixes 2006-09-08 01:54:52 +02:00
Marco Pesenti Gritti
d8d80854d6 Fix up the right panel, unfinished 2006-09-08 01:13:42 +02:00
Marco Pesenti Gritti
d51a00eaec Get the top panel back 2006-09-08 00:51:45 +02:00
Marco Pesenti Gritti
7850970f27 Make the frame adapt to screen size again.
Several cleanups.
Fixup makefiles
2006-09-07 19:51:27 +02:00
Marco Pesenti Gritti
5988a89517 Write a GridModel, with correct size and layout, and use it 2006-09-07 19:03:40 +02:00
Marco Pesenti Gritti
21b19924ea Implement the grid, regress UI a bit 2006-09-07 15:11:51 +02:00
Dan Williams
ef254ce128 Create placeholder Owner object when PS starts, fill in services later 2006-09-06 10:16:49 -04:00
Marco Pesenti Gritti
f40485aad4 Handle F6 in sugar 2006-09-04 22:37:17 +02:00
Marco Pesenti Gritti
693b14f3c9 Some makefile fixes 2006-09-04 22:20:13 +02:00
Marco Pesenti Gritti
b9cc263d75 Cleanup and startup the wm before first time dialog 2006-09-04 21:49:58 +02:00
Marco Pesenti Gritti
01c4658ee0 Make conf private, expose the nick name from env 2006-09-04 21:34:54 +02:00
Marco Pesenti Gritti
995c74b116 Sort of functional invites implementation 2006-09-04 17:00:45 +02:00
Marco Pesenti Gritti
cdbd4e28b4 Start implementing invites... 2006-09-04 14:30:44 +02:00
Marco Pesenti Gritti
73b793472c fix the problem with registering services with the same stype inside different activities. 2006-09-04 13:32:31 +02:00
Marco Pesenti Gritti
58a79eb123 Get rid of default type from the activity definition.
Modify code to use activity type id instead, except
from mapping service to activity.
2006-09-02 10:54:34 +02:00
Marco Pesenti Gritti
8ffff18bc3 Correct installation path 2006-09-01 21:06:34 +02:00
Marco Pesenti Gritti
bcfe526a85 Disconnect the signals from the right object 2006-09-01 18:59:14 +02:00
Marco Pesenti Gritti
e6b839f202 Fix logic 2006-09-01 18:38:23 +02:00
Marco Pesenti Gritti
b15fb5ad50 Cleanups 2006-09-01 15:33:55 +02:00
Marco Pesenti Gritti
a6f9241e95 Refactor frame stuff naming some 2006-09-01 15:11:52 +02:00
Marco Pesenti Gritti
0ae39c93e7 Reimplement the icon item to render svg directly.
Some regressions sorry, need also to fix pygoocanvas...
2006-08-31 22:29:31 +02:00
Marco Pesenti Gritti
110d1bf8ce No more need to keep zoom level in the shell. Work around
redrawing issue.
2006-08-31 17:58:18 +02:00
Marco Pesenti Gritti
26c50e3b3d Panels doesn't take focus 2006-08-31 10:10:45 +02:00
Marco Pesenti Gritti
590608b19b Missing service getter 2006-08-30 13:14:37 +02:00
Marco Pesenti Gritti
77e689f21b Persist the friends list 2006-08-30 13:04:12 +02:00
Marco Pesenti Gritti
030ba2b56d Clicking on the friend icon in the frame add it to friends. 2006-08-30 12:22:01 +02:00
Marco Pesenti Gritti
6865148c90 More refactoring. Start implementing friends. 2006-08-30 11:46:14 +02:00
Marco Pesenti Gritti
028d22cdd7 More refactoring of the home implementation 2006-08-30 11:15:21 +02:00
Marco Pesenti Gritti
adb269709c Remove obsolete import 2006-08-30 10:55:57 +02:00
Marco Pesenti Gritti
cd0b794879 Simplify overdesigned Mesh view impl 2006-08-30 10:54:28 +02:00
Dan Williams
aea10ae900 Fix array signature for mdns call properties 2006-08-29 16:52:55 -04:00
Marco Pesenti Gritti
47af6a7b9d FIx makefile 2006-08-29 17:28:44 +02:00
Marco Pesenti Gritti
fa8ad92322 Take icon size and borders into account 2006-08-29 17:18:16 +02:00
Marco Pesenti Gritti
fddc1f56af Cleanup code a bit, fix redraw issue on startup 2006-08-29 17:12:39 +02:00
Marco Pesenti Gritti
f496a2f543 Kill unused code 2006-08-29 16:47:36 +02:00
Marco Pesenti Gritti
fcc06834bc Hook up activity activation 2006-08-29 16:29:56 +02:00
Marco Pesenti Gritti
19178464fb Hook up opening shared activity again 2006-08-29 16:17:00 +02:00
Marco Pesenti Gritti
8722255b17 Add some simple layout logic for the icons 2006-08-29 16:07:23 +02:00
Marco Pesenti Gritti
db4553184e Bigger angles radius 2006-08-29 14:47:33 +02:00
Marco Pesenti Gritti
f597375aff Improved zoom model 2006-08-29 14:39:34 +02:00
Marco Pesenti Gritti
a29230c183 Rewrite the zoom logic. Regress some stuff... will fix. 2006-08-29 11:48:20 +02:00
Marco Pesenti Gritti
f75d36055f As suggested by Eben, do not autohide the frame and show
it for 10 seconds at startup.
2006-08-29 00:30:19 +02:00
Marco Pesenti Gritti
3ac947391c Fix nast bug, don't construct multiple times! 2006-08-29 00:18:35 +02:00
Marco Pesenti Gritti
95be6c3e42 Fix some bugs, make it more solid, update on share. 2006-08-28 23:03:01 +02:00
Marco Pesenti Gritti
c630a8b11e Fix up sizing removing the work around for mb. mb should
be fixed soon (and latest svn is screwed anyway)
2006-08-28 21:52:02 +02:00
Marco Pesenti Gritti
7d6452f17a Complete presence list implementation 2006-08-28 21:38:36 +02:00
Marco Pesenti Gritti
4dbf80369b Start implementing presence on the friends panel 2006-08-28 18:40:41 +02:00
Marco Pesenti Gritti
7d01cee2ef Activate/deactivate the frame on F5 2006-08-28 16:53:29 +02:00
Marco Pesenti Gritti
3f4625f0a1 Get rid of the contextual chat. 2006-08-28 15:22:52 +02:00
Marco Pesenti Gritti
7af2ea5bbd Fix donut activity icon, implement share 2006-08-28 15:10:31 +02:00
Marco Pesenti Gritti
8d26a76a88 Add the actions buttons on the friends panel 2006-08-28 14:58:21 +02:00
Marco Pesenti Gritti
b6cf5ef31e Get the zoom level buttons to work 2006-08-28 14:36:48 +02:00
Marco Pesenti Gritti
a0127aa4df Add the top panel, unfinished. 2006-08-28 14:04:51 +02:00
Marco Pesenti Gritti
766f9d6e68 Use gproperties in IconItem, make the color optional 2006-08-28 12:44:46 +02:00
Marco Pesenti Gritti
22e290332e Remove buddies when they disappear. The canvas model / data model
separation makes this more complicated than I'd like. Maybe
it's worth to merge the two levels, I dunno.
2006-08-26 14:59:19 +02:00
Marco Pesenti Gritti
83bbe54bc8 Hook up activity colors 2006-08-26 14:17:55 +02:00
Marco Pesenti Gritti
93d489741d Automatically read the profile (lazily) 2006-08-26 13:35:03 +02:00
Marco Pesenti Gritti
a7c552c038 Get rid of env.get_nick_name, that comes from the profile now 2006-08-26 13:03:06 +02:00
Marco Pesenti Gritti
508ab2af25 Move DonutItem out of public api 2006-08-26 11:47:02 +02:00
Dan Williams
93a97660b4 Remove obsolete gtk import and code and save 1.7MiB writeable. Whee\! 2006-08-25 16:09:54 -04:00
Dan Williams
ef47f6e4c5 Fix buddy & activity visibility leaks if they are not yet valid; add Activity color attribute and don't make activity valid until we get the color 2006-08-25 14:55:19 -04:00
Marco Pesenti Gritti
6b232d97d8 Rework profiles code a bit, initialize gecko profile 2006-08-25 20:12:52 +02:00
Dan Williams
ba3d5fce8c Don't traceback when buddies have bad colors 2006-08-25 12:11:25 -04:00
Marco Pesenti Gritti
8ac55c287e Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-08-25 17:44:45 +02:00
Marco Pesenti Gritti
cbfb10d020 Keep a reference on the key grabber 2006-08-25 17:44:07 +02:00
Dan Williams
f0a4459103 Don't die when an activity doesn't have an icon 2006-08-25 11:24:39 -04:00
Marco Pesenti Gritti
7646366553 Keep the bindings private 2006-08-25 14:39:58 +02:00
Marco Pesenti Gritti
760651e3d7 Scale the home canvases to actual screen size 2006-08-25 14:08:39 +02:00
Marco Pesenti Gritti
6e920265ad Complete the keybindings stuff and use it for the home page 2006-08-25 14:03:48 +02:00
Marco Pesenti Gritti
4425e14f13 More work on global keybindings 2006-08-25 12:28:52 +02:00
Marco Pesenti Gritti
05061c5e3d Use the actual buddy color 2006-08-25 00:49:39 +02:00
Dan Williams
d2c0829165 Don't traceback when somebody doesn't advertise their color 2006-08-24 11:09:53 -04:00
Marco Pesenti Gritti
3f50668494 Add color support to the profile 2006-08-23 21:03:17 +02:00
Dan Williams
c3d0ae0359 Add Theme.py to the makefile 2006-08-23 13:35:29 -04:00
Dan Williams
eef5e5b18a Convert PS bindings instantiation into a singleton to cut resource usage 2006-08-23 11:38:56 -04:00
Dan Williams
d334b6e3bd Add a color property and access to Buddy objects 2006-08-23 11:14:46 -04:00
Dan Williams
e366753ab0 Make theme color accessors more descriptive; add mesh view zoom rects 2006-08-23 10:41:12 -04:00
Dan Williams
4eb5a61276 Actually make theme object a singleton 2006-08-23 08:13:15 -04:00
Dan Williams
3b9d3daa3b Implent color theming for Friends view 2006-08-23 08:06:45 -04:00
Dan Williams
f3435bb914 Add simple theme support to pick up color themes in the Home Window 2006-08-23 07:09:10 -04:00
Marco Pesenti Gritti
f53af6af4c Start implementing the panels. 2006-08-23 11:52:18 +02:00
Marco Pesenti Gritti
9f674ef232 Add missing files 2006-08-22 16:18:49 +02:00
Marco Pesenti Gritti
bf8f1e30ad Forgot to add these 2006-08-22 16:15:52 +02:00
Marco Pesenti Gritti
511fec421f Simple profile support. First time dialog (ugly and only nick atm). 2006-08-22 16:15:34 +02:00
Marco Pesenti Gritti
3e51b086df Create a conf module. Move activity registry out of the shell
(should only be graphical) into it.
2006-08-22 14:01:53 +02:00
Marco Pesenti Gritti
49073039e9 Run the session dbus from the emulator. The olpc run his own. 2006-08-22 10:37:24 +02:00
Marco Pesenti Gritti
da80c91081 Enable sugar emulator only if SUGAR_EMULATOR=yes is set 2006-08-21 19:37:55 +02:00
Marco Pesenti Gritti
7d6adc55a3 Fixup distcheck, release 0.19 2006-08-21 15:59:40 +02:00
Marco Pesenti Gritti
c3b7a84cbc Use olpc matchbox theme 2006-08-20 12:10:12 +02:00
Marco Pesenti Gritti
5e00d939de Fix the zooming cycle 2006-08-19 14:42:14 +02:00
Marco Pesenti Gritti
a3f62ee68f Integrate Walter color values.
(Still not fully hooked up to buddies)
2006-08-19 14:27:56 +02:00
Marco Pesenti Gritti
32a368bdbb Adapt to the new artwork stylesheets 2006-08-19 13:39:13 +02:00
Marco Pesenti Gritti
58ddb555c4 Merge demo4 branch 2006-08-19 11:56:49 +02:00
Marco Pesenti Gritti
f8c4f0bd66 Skeleton group chat activity.
Fix positioning in the activity bar.
2006-08-19 11:54:41 +02:00
Marco Pesenti Gritti
5a2653bf1e Functional mesh view 2006-08-19 11:33:58 +02:00
Marco Pesenti Gritti
0d4acb6e78 Start implementing friends/mesh 2006-08-19 11:12:25 +02:00
Marco Pesenti Gritti
de65daf548 Implement zooming levels, actual view still empty 2006-08-19 02:00:04 +02:00
Marco Pesenti Gritti
24dae31a9d Starting to create the mesh view... 2006-08-19 01:29:42 +02:00
Marco Pesenti Gritti
e5eef2e183 Back out the 0.2 delay hack 2006-08-18 19:40:05 +02:00
Dan Williams
212b9a49da Don't do anything if there's no console 2006-08-17 14:49:04 -04:00
Dan Williams
4c923db7ea Add traceback support to the session too 2006-08-17 12:02:29 -04:00
Marco Pesenti Gritti
640fff5619 Handle activity closed by removing his piece from the donut. 2006-08-17 14:42:29 +02:00
Marco Pesenti Gritti
f65d23c440 Add icon for activity to the donut.
Add signals in the shell for window open/close and use them in the task view.
2006-08-17 14:23:52 +02:00
Marco Pesenti Gritti
10f356cb22 Add fg and bg circles, fill the paths 2006-08-17 13:16:48 +02:00
Marco Pesenti Gritti
fb829989c7 Get tasks adding to work 2006-08-17 12:09:45 +02:00
Marco Pesenti Gritti
e5ed8275a1 Some work on the donut... 2006-08-17 11:47:41 +02:00
Marco Pesenti Gritti
7990bc0d31 Get activity bar and activity creation to work 2006-08-17 10:32:59 +02:00
Dan Williams
ea3b66aa0f Fix bug in get_services; self._services.values() is a list of lists of services 2006-08-16 23:07:28 -04:00
Dan Williams
3b8dbb0836 Enable traceback debugging in the PS 2006-08-16 23:06:13 -04:00
Dan Williams
6530653636 Wait for PS to start again to fix race issues with activation 2006-08-16 23:02:06 -04:00
Marco Pesenti Gritti
dae3d2be2b Some work to implement the activity bar 2006-08-16 23:20:22 +02:00
Marco Pesenti Gritti
47f25f234e Home page background 2006-08-16 22:01:43 +02:00
Marco Pesenti Gritti
a963c33078 Change emulator resolution to 800x600.
Change canvas resolution to 1200x900, scale it down in the emulator.
2006-08-16 20:34:33 +02:00
Marco Pesenti Gritti
7dddefe229 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar into demo4 2006-08-16 19:55:34 +02:00
Marco Pesenti Gritti
115eefb4c2 Implement a canvas element that can draw svg icons
with different colors.
2006-08-16 19:55:13 +02:00
Dan Williams
9ad1fe62ae Don't allow PS to be started twice 2006-08-16 12:09:43 -04:00
Dan Williams
2a50bbd3ca Fix service unregistration; the service will get cleaned up when Avahi notices that it has gone away so we don't have to delete it ourselves 2006-08-16 11:15:59 -04:00
Marco Pesenti Gritti
1cfd208f7b Do not pass the timeout argument if we are using the in-process console 2006-08-16 00:30:50 +02:00
Marco Pesenti Gritti
fa90ec41aa Merge from master
Conflicts:

	shell/HomeWindow.py
2006-08-15 13:47:21 +02:00