Commit Graph

1476 Commits

Author SHA1 Message Date
Tomeu Vizoso
91f0eb52aa Adapt to datastore API changes. 2007-07-13 13:20:44 +02:00
Simon McVittie
5ebcf5eda9 Include timestamps (with 100 us resolution) in Sugar logfiles, to allow debugging of IPC and timeouts 2007-07-11 21:30:41 +01:00
Marco Pesenti Gritti
b01dbc5e75 Integrate new colors from Walter.
Add a little parser to xocolor.py.
2007-07-11 14:15:58 +02:00
Marco Pesenti Gritti
d59cd5af83 Fix intro colors 2007-07-11 12:35:13 +02:00
Marco Pesenti Gritti
d2059c1baa Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-07-11 11:45:43 +02:00
Marco Pesenti Gritti
9dab5fffaf First go at the new intro screen, work in progress. 2007-07-11 11:45:27 +02:00
Tomeu Vizoso
bb71cd61cf #1888 Fix opening items from the clipboard. 2007-07-11 11:39:40 +02:00
Tomeu Vizoso
bbbea6167d gtk.gdk.pixbuf.get_from_drawable can return None in many occasions (patch from Reinier Heeres). 2007-07-11 11:02:43 +02:00
Morgan Collett
8fab49b64e Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-07-11 10:42:27 +02:00
Morgan Collett
66983f0d24 sugar/presence/activity.py: make Activity.leave call the PS
Needed to make buddy-left work
2007-07-11 10:38:15 +02:00
Marco Pesenti Gritti
1daa532625 Fix font size on the XO 2007-07-10 19:35:18 +02:00
Bert Freudenberg
c1fa54c0c0 bundlebuilder: MANIFEST was still included twice ... fix for real now 2007-07-10 17:06:03 +02:00
Marco Pesenti Gritti
ac082511a2 Use the new activity-stop icon. 2007-07-10 16:09:21 +02:00
Marco Pesenti Gritti
587c1347e1 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-07-10 15:19:10 +02:00
Marco Pesenti Gritti
071cc596c5 Rename close to stop and save to keep 2007-07-10 15:18:08 +02:00
Bert Freudenberg
d16a2fb44a bundlebuilder: include files only once if both default and in MANIFEST 2007-07-10 14:43:56 +02:00
Bert Freudenberg
e14288abb3 do not include setup.py in .xo bundle 2007-07-10 13:59:34 +02:00
Tomeu Vizoso
ecca1dca00 Add caching to the activity and object type registries. 2007-07-09 20:14:24 +02:00
Marco Pesenti Gritti
1ae7a908ea Fix parsing bug 2007-07-09 19:55:06 +02:00
Eduardo Silva
aa6a024368 Move code to use style instead font.py (removed) 2007-07-09 10:09:24 -04:00
Marco Pesenti Gritti
40ed24f0fe Fix tab label padding 2007-07-09 15:09:59 +02:00
Marco Pesenti Gritti
117e02601d Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-07-09 14:37:46 +02:00
Marco Pesenti Gritti
e88dae8723 Start the new approach to style and sizing.
Fix tabs sizing.
2007-07-09 14:37:21 +02:00
Tomeu Vizoso
a4f4d969fe Popdown when the toplevel of the parent item loses focus. 2007-07-09 14:26:41 +02:00
Eduardo Silva
c7d730e1ac Hide palettes on iconbutton/toolbutton clicked 2007-07-08 10:29:43 -04:00
Marco Pesenti Gritti
1d567905c8 Make maint helper add snapshot to NEWS and update NEWS.sugar 2007-07-08 16:04:21 +02:00
Marco Pesenti Gritti
8cc395cae9 Make setup.py release add version to the NEWS file.
Add the news for the release to the global NEWS.sugar.
2007-07-08 15:49:30 +02:00
Tomeu Vizoso
52fff021d0 #1930: Only take preview before closing. 2007-07-06 22:43:16 +02:00
Tomeu Vizoso
91955f16ff Add flush method. 2007-07-06 18:24:38 +02:00
Eduardo Silva
ec929eb0ad New frameinvoker 2007-07-06 10:51:18 -04:00
Marco Pesenti Gritti
739dbafa97 Improve tooltips sizing 2007-07-06 15:21:50 +02:00
Marco Pesenti Gritti
943214dee3 Actually add palette group 2007-07-06 14:58:28 +02:00
Marco Pesenti Gritti
7468faa840 Implement palette groups. Use them to not popdown frame when hover a palette. 2007-07-06 14:36:59 +02:00
Marco Pesenti Gritti
e322027996 Some setup.py release fixes 2007-07-06 03:11:55 +02:00
Marco Pesenti Gritti
de8b3b4c01 Use box_child.item now that hippo support it 2007-07-06 02:19:13 +02:00
Marco Pesenti Gritti
f1ecb99207 Complete transition to new spread layout. 2007-07-06 00:46:12 +02:00
Marco Pesenti Gritti
cc11d5ebd5 Implement items shifting, not quite working yet. 2007-07-05 23:50:22 +02:00
Marco Pesenti Gritti
483cd91645 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-07-05 22:46:13 +02:00
Marco Pesenti Gritti
bcb68e8e0e Add collisions detection 2007-07-05 22:45:58 +02:00
Dan Williams
4005151005 Add badges to CanvasIcon 2007-07-05 16:02:06 -04:00
Marco Pesenti Gritti
290a053892 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-07-05 21:24:50 +02:00
Marco Pesenti Gritti
61b8811a42 Switch to the new layout manager for the mesh view 2007-07-05 21:22:37 +02:00
Eduardo Silva
90b469e6db Add icon to buddy menu items 2007-07-05 10:56:17 -04:00
Eduardo Silva
f614131ad7 New graphics.menuitem.py file/class 2007-07-05 10:28:52 -04:00
Tomeu Vizoso
5e14781ad7 Hide the active palette if another pops up. 2007-07-05 14:16:36 +02:00
Marco Pesenti Gritti
c5ab58ed6c Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-07-05 13:38:34 +02:00
Marco Pesenti Gritti
20ea0d7bcc Add a spread layout manager. Work in progress. 2007-07-05 13:33:29 +02:00
Tomeu Vizoso
408b601c0e Set ObjectType.mime_types. 2007-07-05 11:37:51 +02:00
Tomeu Vizoso
060b740983 API change in the datastore. 2007-07-05 11:37:51 +02:00
Marco Pesenti Gritti
91654729bf Refactor the snowflake layout to use the new hippo layout managers.
Cleanup the logic.
Better test.
Make it internal.
2007-07-05 11:22:09 +02:00
Marco Pesenti Gritti
3b3a69161e Tweak some colors 2007-07-04 13:52:12 +02:00
Tomeu Vizoso
49b94a7f28 Revert "Hide active palette if zoom level changes."
Pushed by mistake.

This reverts commit 70e6d08f8d.
2007-07-04 12:49:21 +02:00
Tomeu Vizoso
70e6d08f8d Hide active palette if zoom level changes. 2007-07-04 12:33:12 +02:00
Tomeu Vizoso
cc2b8884c0 Be smarter when choosing one mime type from the targets offered. 2007-07-03 22:42:17 +02:00
Marco Pesenti Gritti
ddecddcb42 Remove unused methods from the activity services. Cleanups. 2007-07-03 20:55:46 +02:00
Tomeu Vizoso
4df052e5de Return None when no element is active and use theme: for marking icons from the theme. 2007-07-03 17:08:36 +02:00
Tomeu Vizoso
13885e621b Add get_unique_values() func to the datastore. 2007-07-03 17:07:48 +02:00
Marco Pesenti Gritti
502239631e Just warn about missing NEWS 2007-07-02 17:31:39 +02:00
Marco Pesenti Gritti
0926382f69 Typo 2007-07-02 16:50:05 +02:00
Marco Pesenti Gritti
7024f93a43 Move the zoom levels inside the model 2007-07-02 14:34:41 +02:00
Tomeu Vizoso
2471a55e7f Reposition palette after expanding it. 2007-07-02 12:39:16 +02:00
Tomeu Vizoso
bd27488f0d Implement secondary state of palettes. 2007-07-02 12:05:42 +02:00
Tomeu Vizoso
29ccfcf9b3 Remove old popup classes. 2007-07-01 13:05:06 +02:00
Tomeu Vizoso
86f31ee1db Take out forgotten print. 2007-07-01 13:04:48 +02:00
Tomeu Vizoso
aa5d6af260 Two more small palette fixes. 2007-07-01 12:31:23 +02:00
Tomeu Vizoso
92ec6f72d8 Restore CanvasIcon prelighting. 2007-07-01 11:33:12 +02:00
Tomeu Vizoso
84c94ecabe Restrict palette positioning to screen height/width - 1 grid cell. 2007-07-01 11:25:35 +02:00
Tomeu Vizoso
3ca87cd46d Some palette improvements and add palette support to CanvasIcon. 2007-07-01 11:05:14 +02:00
Marco Pesenti Gritti
983d494d38 Include NEWS in the xo 2007-06-29 22:52:25 +02:00
Marco Pesenti Gritti
1d4112a882 Set glib program name and application name.
Better way of importing ltihooks.
Several cleanups.
2007-06-29 22:11:28 +02:00
Tomeu Vizoso
a609da166b Don't create so many objects until we have differential versioning support in the datastore. 2007-06-29 20:24:22 +02:00
Marco Pesenti Gritti
d7a8c5430e Make notification work from outside the shell process 2007-06-29 19:05:10 +02:00
Marco Pesenti Gritti
f825c108da Use size request to position the palette. 2007-06-29 14:56:12 +02:00
Marco Pesenti Gritti
893ffe92da Refactor palette positioning API and implementation 2007-06-29 14:45:04 +02:00
Marco Pesenti Gritti
c1ecedeb79 Add a command to automatically do releases. 2007-06-29 01:53:57 +02:00
Marco Pesenti Gritti
0d6760b194 Do not fail is lang is not set 2007-06-28 22:40:37 +02:00
Marco Pesenti Gritti
03ef9c034e Translate the default activity toolbar 2007-06-28 15:55:33 +02:00
Marco Pesenti Gritti
51c66de817 Do not allow to close the journal 2007-06-28 12:03:12 +02:00
Marco Pesenti Gritti
faed9162ab Ooops do not start the popup animation on constructor. 2007-06-28 11:54:12 +02:00
Tomeu Vizoso
2ccf9c0b16 Added umount method to datastore.py. 2007-06-28 10:43:38 +02:00
John (J5) Palmieri
9cdd9058da add process title setting to activities
* they now will show up as Activity Name <id> in the process list
     truncated to 15 characters though
2007-06-27 17:12:32 -04:00
Tomeu Vizoso
381df08442 Added radiotoolbutton.py. 2007-06-27 14:48:03 +02:00
Marco Pesenti Gritti
69ba74ddc2 Cleanup 2007-06-27 12:32:03 +02:00
Marco Pesenti Gritti
db99620d93 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-06-27 11:42:14 +02:00
Marco Pesenti Gritti
2507104875 Fix traceback 2007-06-27 11:41:41 +02:00
Tomeu Vizoso
5771482281 Added palette support to toggletoolbutton.py. 2007-06-27 11:36:28 +02:00
Tomeu Vizoso
e894bb54a6 Added mount() and mounts() methods to datastore. 2007-06-27 11:36:05 +02:00
Tomeu Vizoso
4f748dba9b Added some methods to Palette. 2007-06-26 18:19:26 +02:00
Marco Pesenti Gritti
3b9e2c1e7e Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:

	sugar/graphics/palette.py
2007-06-26 14:55:58 +02:00
Marco Pesenti Gritti
3eaeebc60e Lots of palette refactoring. 2007-06-26 14:55:16 +02:00
Eduardo Silva
3ba64aa200 Palette: realize() 2007-06-26 08:28:31 -04:00
Tomeu Vizoso
0f49e6d7a8 Add current-toolbar-changed signal to Toolbox. 2007-06-26 12:28:42 +02:00
Marco Pesenti Gritti
5c3c7be966 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-06-26 10:44:14 +02:00
Marco Pesenti Gritti
2b463a2013 Merge new translations when updating the .pot. 2007-06-26 10:43:49 +02:00
Tomeu Vizoso
888148c6e6 Allow for providing a ComboBox when instantiating a ToolComboBox. 2007-06-25 16:32:38 +02:00
Tomeu Vizoso
4b3c374455 ComboBox: allow for values other than int and for using absolute paths in icon_names. 2007-06-25 15:33:10 +02:00
Marco Pesenti Gritti
e0793ef199 Heavy refactoring of palette activation. Not fully
implemented yet.
2007-06-25 14:31:43 +02:00
Marco Pesenti Gritti
400cbc29e5 More cleanups 2007-06-25 11:55:36 +02:00
Marco Pesenti Gritti
6d8b196abe Remove is_tooltip property 2007-06-25 11:41:33 +02:00
Marco Pesenti Gritti
d92bb7a4ef Some palette code cleanups. 2007-06-25 11:39:51 +02:00
Marco Pesenti Gritti
537556b605 Typo 2007-06-25 11:29:46 +02:00
Marco Pesenti Gritti
cae4e52b7c More LGPL headers 2007-06-24 14:57:57 +02:00
Marco Pesenti Gritti
2fcca4d656 Add a bunch of copyrights 2007-06-24 14:52:46 +02:00
Marco Pesenti Gritti
99e8077f59 Implement fix-copyright and fix some of them 2007-06-24 14:43:48 +02:00
Tomeu Vizoso
4c24cde923 Added/corrected some license headers. 2007-06-24 13:10:53 +02:00
Marco Pesenti Gritti
90c0ace5c0 Add a license checker.
Remove obsolete testint infrastructure.
2007-06-24 12:05:52 +02:00
Tomeu Vizoso
e894c8a2e4 Added a basic version of the journal object chooser. 2007-06-22 21:47:30 +02:00
Tomeu Vizoso
f9d03b698f Add delete method to the datastore wrapper. 2007-06-22 17:01:13 +02:00
Tomeu Vizoso
c1d4f3ce7a Add keep-in-journal button to the activity toolbar. 2007-06-22 14:11:39 +02:00
Marco Pesenti Gritti
9a77a6e251 Kill old hippo canvas toolbar impl 2007-06-21 22:53:26 +02:00
Marco Pesenti Gritti
c94995148e Refactor translation system a bit 2007-06-21 17:23:32 +02:00
Marco Pesenti Gritti
6f4af67856 Default to the source directory name as bundle name,
allow to override in setup.py.
2007-06-21 14:54:09 +02:00
Marco Pesenti Gritti
3892764634 Add a CanvasEntry which allows to set the background color. 2007-06-21 13:45:35 +02:00
Tomeu Vizoso
427e9a00d7 Add extension to files that come into the clipboard without one. 2007-06-21 13:07:11 +02:00
Eduardo Silva
5616aface3 Toolbutton: don't try to show the palette when it doesn't exist 2007-06-20 20:33:09 -04:00
Marco Pesenti Gritti
c91bbd18cc Move SugarKeyGrabber in the lib. Keep it private.
We can't install libraries in datadir.
2007-06-20 15:22:12 +02:00
Marco Pesenti Gritti
61314c9705 Don't make all .py executable please... 2007-06-20 12:31:54 +02:00
Bert Freudenberg
bd86aee0d4 use activity_id in service name
- construct service name from activity id instead of X window id
- cleanup unused declarations in activityfactory.py
- remove obsolete _dbus_name_owner_changed_cb()
- see http://dev.laptop.org/ticket/1767
- cleared by marcopg
2007-06-20 11:52:29 +02:00
Eduardo Silva
9283a5cc80 Palette: widget and canvas invoker support 2007-06-19 16:02:25 -04:00
Marco Pesenti Gritti
f7b6a0c0af Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-06-19 15:54:05 +02:00
Marco Pesenti Gritti
737a8b3932 Cleanup activity closing 2007-06-19 15:51:56 +02:00
Tomeu Vizoso
99369114cb Set title on change. Fixes #1715. 2007-06-18 20:38:20 +02:00
Marco Pesenti Gritti
3552b92428 Create the locale dir if it does not exist. 2007-06-18 10:05:11 +02:00
Tomeu Vizoso
1afe9273a1 Add an option for saving clipboard objects to the Journal. 2007-06-17 20:55:16 +02:00
Tomeu Vizoso
d4323957a1 Change preview image size. 2007-06-17 14:25:13 +02:00
Tomeu Vizoso
f0e18ba785 Support for previews in the journal. 2007-06-15 18:03:17 +02:00
Tomeu Vizoso
6c0885b490 Check type of bundle path by os.path.isdir(). 2007-06-15 16:48:53 +02:00
Tomeu Vizoso
cb9dd212e9 Add to Bundle facilities for dealing with not-yet-installed bundles. 2007-06-15 11:36:08 +02:00
Eduardo Silva
a3fb02bc95 moving graphics/notebook.py to LGPL 2007-06-14 16:04:55 -04:00
Eduardo Silva
72d81af716 moving graphics/palette.py to LGPL 2007-06-14 16:04:25 -04:00
Eduardo Silva
a590186e78 Fix missed objecttype makefile entry 2007-06-13 17:59:31 -04:00
Tomeu Vizoso
8e9c0b640b Change from GPL to LGPL. 2007-06-13 12:21:49 +02:00
Tomeu Vizoso
b320ea36cf Some activity registry fixes. Thanks cjb. 2007-06-13 11:50:05 +02:00
Marco Pesenti Gritti
5cf263537f Put some border around the combo 2007-06-13 00:43:30 +02:00
Marco Pesenti Gritti
f5bb269849 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-06-13 00:37:10 +02:00
Marco Pesenti Gritti
4e8bacc009 Really add it 2007-06-13 00:36:35 +02:00
Marco Pesenti Gritti
9645d31f1b Add a toolcombobox 2007-06-13 00:35:53 +02:00
Tomeu Vizoso
22689ed1da Several fixes for the object type registry and the activity registry. 2007-06-12 21:57:49 +02:00
Tomeu Vizoso
29e68376e9 Tell git to ignore sugar/_sugarext.c. 2007-06-10 12:12:47 +02:00
Eduardo Silva
fde3159002 Palette positioning/closing fixes 2007-06-06 17:21:33 -04:00
Eduardo Silva
dee7537462 Palette: speed up 2007-06-06 00:51:01 -04:00
Eduardo Silva
f79d5a63db Palette: tooltip fix 2007-06-05 22:43:42 -04:00
Dan Williams
d849f573c5 Add network.py to makefile 2007-06-05 07:53:07 -04:00
Marc Maurer
88011ed22d Add set_current_toolbar 2007-06-04 23:53:40 +02:00
Tomeu Vizoso
a9600516fb Take screenshot and save it to the journal (<alt>1). 2007-06-04 18:35:05 +01:00
Marco Pesenti Gritti
283a3f4c97 Better snapshot script 2007-06-04 13:09:41 +02:00
Marco Pesenti Gritti
b2980d7bd6 Restore get_id/get_service_name, didn't realize they was used by subclasses. 2007-06-03 22:12:47 +02:00
Eduardo Silva
aab18a866d Palette: Tooltip support 2007-06-02 00:33:41 -04:00
Marco Pesenti Gritti
e707f1b1cc Hrm how my icon name changes did get reverted... 2007-06-01 21:26:18 +02:00
Marco Pesenti Gritti
2b7ffe41d9 Make bundle_id and activity_id window properties to
avoid races.
2007-06-01 21:21:30 +02:00
Marco Pesenti Gritti
5cc9a8c424 Bindings to set activity_id and bundle_id hints 2007-06-01 20:38:30 +02:00
Eduardo Silva
0014ea0da0 Palette: Automatic positioning 2007-06-01 00:08:24 -04:00
Marco Pesenti Gritti
fc53bf8667 Support icons inside the activity 2007-05-31 11:30:16 +02:00
Eduardo Silva
dd00dda41f Palette fixes 2007-05-30 13:29:29 -04:00
Tomeu Vizoso
527e22ba5d Get one line back :) 2007-05-29 23:25:47 +02:00
Konrad Kleine
7b4333dc4e Bug 590# fixed (codestyle issues) 2007-05-29 21:29:14 +02:00
Konrad Kleine
76d3e78302 Bug #590 fixed.
All logfiles will be backed up to ~./sugar/default/logs/old .
You can adjust the backup directory and the number of backup
versions.

You can also adjust the file suffix for the backup files.

Konrad Kleine
2007-05-29 21:28:59 +02:00
Eduardo Silva
b1ed24498c Palette: event improves 2007-05-29 12:27:54 -04:00
Tomeu Vizoso
c35db7acf8 Some refactoring of the DataStore API. 2007-05-29 15:53:58 +02:00
Marco Pesenti Gritti
53d64a0536 Use the commit id for the snapshot name 2007-05-29 14:16:49 +02:00
Tomeu Vizoso
8915657a08 Take out one try..except block. 2007-05-28 16:25:36 +02:00
Eduardo Silva
d2aaebac38 Palette updates 2007-05-28 01:05:31 -04:00
Marco Pesenti Gritti
11437e3484 Add mime matching to the registry. 2007-05-27 20:43:31 +02:00
Marco Pesenti Gritti
42fef182f4 Refactor the bundle registry. Move it inside
the shell and expose the parts that should be
public to the shell dbus service.
2007-05-27 20:24:10 +02:00
Simon McVittie
cb84d5f8fd Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-24 19:05:58 +01:00
Simon McVittie
b33dd7cfab sugar.presence.presenceservice: Add get_buddy_by_telepathy_handle() 2007-05-24 19:04:35 +01:00
Marco Pesenti Gritti
46e957ee7d Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-24 19:50:33 +02:00
Dan Williams
8b33ad68be re-add network.py; it's deletion was unintentional 2007-05-24 13:57:11 -04:00
Marco Pesenti Gritti
5f912f0330 Avoid to reparse the activity registry on each activity start, hrm! 2007-05-24 19:50:17 +02:00
Eduardo Silva
c40a12a136 New Palette widget 2007-05-24 13:37:48 -04:00
Simon McVittie
2b9cb92953 Revert "sugar.presence.presenceservice: Add get_buddy_by_telepathy_handle()"
This reverts commit c6ac2873c8 because
the necessary API isn't committed in PS yet.
2007-05-24 17:48:43 +01:00
Marco Pesenti Gritti
9786385baa Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-24 17:54:15 +02:00
Marco Pesenti Gritti
98c5c0734e Add API to get the mime types 2007-05-24 17:53:57 +02:00
Simon McVittie
677eb1629c Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-24 12:26:28 +01:00
Marco Pesenti Gritti
27a3644dab Hook up mime.get_for_file 2007-05-24 12:30:42 +02:00
Marco Pesenti Gritti
2145de1039 Hook up get_from_file_name 2007-05-24 12:08:05 +02:00
Marco Pesenti Gritti
f3d9d5e334 Remove the obsolete p2p code 2007-05-23 12:37:15 +02:00
Marco Pesenti Gritti
c202b6be43 Import xdgmime and start hooking it up 2007-05-23 11:55:21 +02:00
Tomeu Vizoso
ffebebcd7d Set icon size on the combobox. 2007-05-22 18:25:29 +02:00
Tomeu Vizoso
87d59ae13b Avoid crashing in atexit. 2007-05-22 18:24:56 +02:00
Marco Pesenti Gritti
1cb7700136 Rename interface name to org.laptop 2007-05-22 14:49:28 +02:00
Tomeu Vizoso
1dc104126d Adapt to new DataStore API. 2007-05-22 14:03:31 +02:00
Marco Pesenti Gritti
490b939eb9 Import the AddressEntry 2007-05-21 17:53:47 +02:00
Marco Pesenti Gritti
0ddbf7e9ab Add the AddressEntry object to sugar 2007-05-21 17:36:08 +02:00
Marco Pesenti Gritti
d560489d0f Browser leftover 2007-05-21 12:58:05 +02:00
Marco Pesenti Gritti
17b3142776 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:

	configure.ac
2007-05-21 12:47:28 +02:00
Simon McVittie
66c5e882f3 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-21 11:30:38 +01:00
Simon McVittie
8c8dffe662 Merge commit 'origin' into submit 2007-05-21 11:27:47 +01:00
Marco Pesenti Gritti
42f7eeedc8 Drop the browser stuff, it will be replaced by hulahop. 2007-05-21 11:06:52 +02:00
Tomeu Vizoso
11c89d86c9 Put dates to work correctly on the journal, create a new journal entry when resuming a past entry. 2007-05-20 12:38:08 +02:00
Tomeu Vizoso
5d4b9b1dfa Set the activity icon on new journal entries. 2007-05-19 20:06:36 +02:00
Tomeu Vizoso
abec4df66e Don't try to display an icon without file name. 2007-05-19 11:19:56 +02:00
Simon McVittie
ccc224e76f sugar.presence.presenceservice: Use absolute imports 2007-05-18 15:33:21 +01:00
Simon McVittie
29cc39968d Don't rely on dbus importing the exceptions module - import it explicitly.
Also divide up imports in a PEP8-compliant way.
2007-05-18 15:31:32 +01:00
Simon McVittie
c6ac2873c8 sugar.presence.presenceservice: Add get_buddy_by_telepathy_handle() 2007-05-18 15:24:58 +01:00
Marco Pesenti Gritti
6c671fb7fe Size the toolbox to 1 grid cell 2007-05-18 14:00:29 +02:00
Marco Pesenti Gritti
b958a515d5 Draw the background of the toolbox hbox 2007-05-18 13:32:50 +02:00
Bert Freudenberg
6dd2f7109c Find executable in bundle (approved by marcopg, fix for #1362) 2007-05-17 13:18:56 +02:00
Simon McVittie
cd0a2b3ecd Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2007-05-17 11:31:57 +01:00
Tomeu Vizoso
3a1d514e9f Save to the journal when switching to another activity. 2007-05-16 21:30:49 +02:00