Commit Graph

306 Commits

Author SHA1 Message Date
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
Marco Pesenti Gritti
b1c7385204 Print traces also on stderr 2006-08-15 13:15:46 +02:00
Marco Pesenti Gritti
a6ef49b731 Make HomeWindow a canvas. Modify screen resolution to
match what Walter said.
2006-08-15 12:20:09 +02:00
Marco Pesenti Gritti
621e43563f Get rid of the initial implementation of Diana design since that's no more the plan. 2006-08-14 20:54:33 +02:00
Marco Pesenti Gritti
3d4330580c Factor out a queue from the handler and use it for exceptions too.
Send all messages in the same dbus call.
2006-08-14 12:18:58 +02:00
Marco Pesenti Gritti
8f5cd86cba Fix up .service installation 2006-08-14 01:07:40 +02:00
Marco Pesenti Gritti
6eb7117c25 Getting presence service logging to work.
Don't lose debug state when switching tab.
2006-08-13 02:57:12 +02:00
Marco Pesenti Gritti
c7c71d25a8 Use dbus activation to start the presence service 2006-08-13 00:28:38 +02:00
Marco Pesenti Gritti
e2e5bc0000 Install service files for the presence service 2006-08-13 00:06:52 +02:00
Marco Pesenti Gritti
bb60b8ad3e Cleanup environemnt setup 2006-08-12 23:35:52 +02:00
Marco Pesenti Gritti
d41c761e02 Simplify profile/nick name code. Use SUGAR_NICK_NAME env. 2006-08-12 21:34:06 +02:00
Marco Pesenti Gritti
2636bc63d0 Split the console service out of the shell, to remove dep 2006-08-12 16:19:47 +02:00
Marco Pesenti Gritti
0963329b47 Disable logging in the presence service, need to solve circular dep 2006-08-12 01:36:30 +02:00
Marco Pesenti Gritti
fc1aefc72c Use dbus-launch with the --exit-with-session. dbus not exiting still not fully solved. 2006-08-12 01:29:55 +02:00
Marco Pesenti Gritti
c5fb39875c Do not open multiple copies of the same activity 2006-08-12 00:29:32 +02:00
Marco Pesenti Gritti
9585330e43 Add a way to enable/disable displaying debug messages 2006-08-11 17:05:06 +02:00
Marco Pesenti Gritti
884eef4bd5 Show all activities output in the console, just
activate the tab for the current activity.
2006-08-11 15:21:11 +02:00
Marco Pesenti Gritti
628271959c Refactor the console stuff 2006-08-11 13:05:33 +02:00
Marco Pesenti Gritti
cb47f17b31 Move session stuff to his own package 2006-08-11 11:37:35 +02:00
Marco Pesenti Gritti
27456ff723 Remove the theme hacks. sugar-jhbuild set this up fine now. 2006-08-10 23:54:34 +02:00
Marco Pesenti Gritti
093a1981d5 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-08-10 00:57:08 +02:00
Marco Pesenti Gritti
9b12b11534 Get one-to-one chat back to work 2006-08-10 00:54:54 +02:00
Dan Williams
c095192d08 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-08-09 15:50:03 -04:00
Dan Williams
a3b81d5f0c Fix log message args 2006-08-09 15:49:50 -04:00
Marco Pesenti Gritti
f5587ac799 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-08-09 21:12:27 +02:00
Marco Pesenti Gritti
aae859f4d3 Load google as homepage. Some cleanups. 2006-08-09 21:09:24 +02:00
Dan Williams
ddddde54b1 Add ChatController.py to the makefile 2006-08-09 15:05:45 -04:00
Marco Pesenti Gritti
0dcaf314f7 Several fixes and cleanups 2006-08-09 18:29:33 +02:00
Marco Pesenti Gritti
95d9b7fe8e More work on the chat. Fix terminal api 2006-08-09 15:53:10 +02:00
Marco Pesenti Gritti
a9a65f42df Create the hosts when windows are displayed 2006-08-09 14:22:58 +02:00
Marco Pesenti Gritti
7db5479c5c It's not necessary to pass the default_type around anymore. 2006-08-09 13:01:47 +02:00
Marco Pesenti Gritti
7e85c5160e Setup the activity from the shell process, through dbus,
this simplifies things a lot...
2006-08-09 12:57:42 +02:00
Marco Pesenti Gritti
e4c4e866a5 Start refactoring to get back buddy chat to work... 2006-08-09 11:47:17 +02:00
Marco Pesenti Gritti
4d67407f6a Cleanups 2006-08-09 02:13:56 +02:00
Marco Pesenti Gritti
70485218c0 Split the factory to his own module 2006-08-09 02:02:34 +02:00
Marco Pesenti Gritti
7ab6da7278 Actually join the activity, check for duplicates in the model. 2006-08-09 01:50:35 +02:00
Marco Pesenti Gritti
c6d59fd7b4 Improve the activity api 2006-08-09 01:08:19 +02:00
Marco Pesenti Gritti
892c61e63a Publish and use title for the activities model 2006-08-08 12:08:16 +02:00
Marco Pesenti Gritti
2535a88645 Use the default service to get activity informations, instead
of Activity ps object.
2006-08-08 12:01:45 +02:00
Marco Pesenti Gritti
d919848324 Rework to not use protected API 2006-08-07 11:08:10 +02:00
Dan Williams
3117d454b9 add service unregistration 2006-08-02 10:27:09 -04:00
Marco Pesenti Gritti
2647b96433 Fix for dbus 0.61 2006-07-28 21:45:12 +02:00
Marco Pesenti Gritti
86bd6f50f0 Use dbus activation to launch factories. This breaks
p-to-p chat and ./sugar/activities. Will fix tomorrow.
2006-07-28 01:25:08 +02:00
Marco Pesenti Gritti
1d370ca8e5 Minor fixes 2006-07-27 10:35:59 +02:00
Marco Pesenti Gritti
d778d45b13 Load the current page when joining an active.
Get back page sharing to work.
2006-07-26 18:00:28 +02:00
Marco Pesenti Gritti
e1928878f9 Accidentally commented out console code... 2006-07-26 16:48:21 +02:00
Marco Pesenti Gritti
b4b4c13c90 Get one-to-one chat back to work 2006-07-26 16:45:40 +02:00
Marco Pesenti Gritti
51c08af67c Add back the ip check, ipv6 needs to be disabled in the avahi daemon
config for this to work though
2006-07-26 16:33:44 +02:00
Marco Pesenti Gritti
f5b1be244f Get private chat to show, not working yet 2006-07-26 15:38:54 +02:00
Marco Pesenti Gritti
fd6367007a Get chat to work again 2006-07-26 14:05:43 +02:00
Marco Pesenti Gritti
0947581a11 A bunch of fixes... 2006-07-26 12:57:54 +02:00
Marco Pesenti Gritti
57cc6a303c Some fixes, adapt the presence view to the new api 2006-07-26 11:44:54 +02:00
Dan Williams
4cf8e8de49 Disable Share button when activity is already shared 2006-07-26 00:19:05 -05:00
Dan Williams
cf35d9f374 Separate a service's address into source address and the service address, and explicitly set each when required 2006-07-26 00:14:09 -05:00
Dan Williams
164add907d Make shareActivity work 2006-07-25 19:04:15 -05:00
Dan Williams
e5065263a9 s/publish/share 2006-07-25 17:17:05 -05:00
Marco Pesenti Gritti
9e32bbba7a Import some missing dbus.glib imports 2006-07-25 23:00:45 +02:00
Marco Pesenti Gritti
1ef5c576c2 Do not use dbus_bindings for exceptions. Use dbus.exceptions. Thanks J5 to point it out. 2006-07-25 22:52:45 +02:00
Marco Pesenti Gritti
c094bbd8b5 Missing script 2006-07-25 18:28:51 +02:00
Dan Williams
2c790da716 Add debug logging support to the PresenceService 2006-07-24 11:48:19 -05:00
Dan Williams
7cc68303f9 Don't import gtk, just use gobject 2006-07-24 11:45:53 -05:00
Dan Williams
bfab84acc9 Poll for PS readiness rather than a hard wait time 2006-07-24 11:27:52 -05:00
Dan Williams
ba6c75725d Fix occurances of get_nick_name() -> get_name() 2006-07-24 10:57:21 -05:00
Dan Williams
f53c5326f2 Add initial non-working bits of ShareActivity 2006-07-24 10:55:42 -05:00
Marco Pesenti Gritti
7f39ed44e9 More build fixes. Add a script for presence service. 2006-07-24 16:24:39 +02:00
Marco Pesenti Gritti
7e40025966 Build fixes 2006-07-24 15:50:26 +02:00
Marco Pesenti Gritti
edb7e8fdc9 Typo 2006-07-24 15:21:58 +02:00
Marco Pesenti Gritti
d2f76cc41d More work on the new home page.
Remove obsolete import.
2006-07-24 15:11:14 +02:00
Marco Pesenti Gritti
1acd82599a Start working on Diana's home window visual design 2006-07-24 12:48:12 +02:00
Dan Williams
7c996b0011 More fixes, and convert python PS bindings to more glib style method names 2006-07-23 09:21:00 -05:00
Dan Williams
1d0b4e12b8 More PS fixes 2006-07-23 00:32:10 -05:00
Dan Williams
bca4e1ca9b Fix typo 2006-07-22 23:57:18 -05:00
Dan Williams
b63e78a174 Make the PresenceService stuff start to work 2006-07-22 23:56:40 -05:00
Dan Williams
ea264a1a83 More PS bits 2006-07-22 01:26:39 -04:00
Marco Pesenti Gritti
32bb288389 Some build fixes. pygtk.require at least one time for process. 2006-07-20 16:49:11 +02:00
Marco Pesenti Gritti
d6ec6db880 Make the console contextual to the activity and use the
window manager to activate it.
2006-07-20 12:13:47 +02:00
Marco Pesenti Gritti
87cb115aa0 Abstract activity on the shell side into an ActivityHost object.
Comment out/fix more ps borkage.
2006-07-20 11:34:06 +02:00
Marco Pesenti Gritti
53947aaaf2 Add script to launch an activity. Associate F4 in the wm to the terminal activity 2006-07-20 10:49:44 +02:00
Marco Pesenti Gritti
af54f25e0e Rename sugar-activity to sugar-activity-factory 2006-07-20 10:40:18 +02:00
Marco Pesenti Gritti
2a28ea38b1 Add a show_launcher property. Show only the web activity 2006-07-20 10:35:41 +02:00
Marco Pesenti Gritti
a06d75bd56 Port some stuff to new presence service (not tested, but I need this to at least run).
Comment out some broken code in Owner.py, Dan please take a look at this.
2006-07-20 10:12:42 +02:00
Dan Williams
766b82d467 Switch sugar/presence module over to a thin API wrapper around the PresenceService dbus API 2006-07-19 15:27:37 -04:00
Marco Pesenti Gritti
d2fdd64003 Install the new PresenceService stuff 2006-07-19 21:06:18 +02:00
Marco Pesenti Gritti
c3de9649b9 Use the new -kbdconfig option in matchbox 2006-07-19 20:58:29 +02:00
Marco Pesenti Gritti
24e078471f Update the title 2006-07-19 18:43:24 +02:00
Marco Pesenti Gritti
3151281354 Set the people window transient 2006-07-19 18:35:37 +02:00
Marco Pesenti Gritti
a33bdbc8c5 Tweak people window size 2006-07-19 18:19:00 +02:00
Marco Pesenti Gritti
e8a342c214 Do not destroy chat on close, just hide it 2006-07-19 18:16:44 +02:00
Marco Pesenti Gritti
a9cdfa0617 Add a matchbox kbdconfig 2006-07-19 17:49:34 +02:00
Marco Pesenti Gritti
c2f9d4c206 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar 2006-07-19 17:42:34 +02:00
Marco Pesenti Gritti
ae00121fbf Use matchbox to activate home and people page 2006-07-19 13:38:24 +02:00
Dan Williams
db04a3d2c9 Fix up signal decorator arguments and some undefined variables 2006-07-19 07:36:58 -04:00
Dan Williams
f413416e15 Continue to fill out presence service to the spec 2006-07-19 00:10:35 -04:00
Marco Pesenti Gritti
08a52809a6 Hint home window as desktop 2006-07-18 21:13:10 +02:00
Dan Williams
79007cfb0a Add most bits of new presence service code 2006-07-18 10:51:04 -04:00
Marco Pesenti Gritti
46d2f1c532 Get rid of pygtk.require. It doesn't make a lot of sense
and recent apps are not using it anyway.
2006-07-16 17:25:32 +02:00
Marco Pesenti Gritti
ca48a95ef1 Add some options to Xnest 2006-07-16 16:44:23 +02:00
Marco Pesenti Gritti
5ec089b829 Add support for Xnest 2006-07-16 14:22:10 +02:00
Marco Pesenti Gritti
ed303285a8 Close the socket once we are done 2006-07-15 17:07:59 +02:00
Marco Pesenti Gritti
bb2ba6da39 Typo 2006-07-15 15:43:23 +02:00
Marco Pesenti Gritti
faac100ba5 Automatically find a free display 2006-07-15 15:32:05 +02:00
Marco Pesenti Gritti
21b46a0022 Bunch of fixes, sharing should be back to work 2006-07-15 12:31:06 +02:00
Marco Pesenti Gritti
db08c3795f Read service type from the .activity file 2006-07-14 16:40:45 +02:00
Marco Pesenti Gritti
5ff09a10f7 Write a model for activities and use it in home page 2006-07-14 15:47:42 +02:00
Marco Pesenti Gritti
e079d76380 Update the task list on add/remove rather than
rebuilding every time. Note that this is _not_
the real UI. It's just some stuff I put there
because we need the functionality while we
finalize the real design and we figure out
how to implement it.
2006-07-13 11:10:27 +02:00
Marco Pesenti Gritti
cc66d7d4df Merge presence window and chat in one window 2006-07-13 10:47:36 +02:00
Marco Pesenti Gritti
02c697d862 Reuse the spawn code 2006-07-12 22:24:49 +02:00
Marco Pesenti Gritti
2bbedf988b Fix a bunch of bugs, more cleanups 2006-07-12 22:17:57 +02:00
Marco Pesenti Gritti
d12b780074 More work on session refactoring 2006-07-12 17:21:22 +02:00
Marco Pesenti Gritti
be806eb191 More cleanups and some fixes 2006-07-12 14:02:29 +02:00
Marco Pesenti Gritti
ca2b08f8b6 Cleanup and document session creation and activity registry 2006-07-12 13:20:41 +02:00
Marco Pesenti Gritti
01da885516 Lots of build fixes 2006-07-10 16:16:30 +02:00
Marco Pesenti Gritti
9f9f420863 Add tasks to the home window. A bunch of fixes. 2006-07-10 13:42:34 +02:00
Marco Pesenti Gritti
1cc14e406a More work on the window management refactor 2006-07-09 17:37:54 +02:00
Marco Pesenti Gritti
d4cb9a2714 More work on the new design 2006-07-08 15:47:51 +02:00
Marco Pesenti Gritti
0cbe559dbf Forgot to add these 2006-07-08 11:56:13 +02:00
Marco Pesenti Gritti
2999244b54 Stat refactoring the shell to use windows rather than tabs.
Initial implementation of the new activity menu
2006-07-08 11:55:33 +02:00
Marco Pesenti Gritti
10054cd505 Try to fix traceback dcbw commit introduced 2006-07-07 17:43:40 +02:00
Marco Pesenti Gritti
3c5ebf424f Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar 2006-07-07 17:18:48 +02:00
Marco Pesenti Gritti
1b6e8b4480 Ensure we are not overwflowing target position 2006-07-07 17:18:21 +02:00
Dan Williams
70965d0344 Remove merge conflict junk 2006-07-07 11:03:34 -04:00
Dan Williams
fdd2ded8d8 Merge 2006-07-07 11:02:48 -04:00
Dan Williams
8270a84e09 Fix activity double-join bug where opening a shared activity twice opened a blank tab 2006-07-07 11:00:20 -04:00
Marco Pesenti Gritti
63c93e4f2d Rewrite the wm, implement smarter sliding, "merge"
presence window and chat, activate by F1
2006-07-07 16:37:52 +02:00