Merge lp:~cairo-dock-team/cairo-dock-plug-ins/ubuntu into lp:ubuntu/maverick/cairo-dock-plug-ins
- ubuntu
- Merge into maverick
Status: | Superseded |
---|---|
Proposed branch: | lp:~cairo-dock-team/cairo-dock-plug-ins/ubuntu |
Merge into: | lp:ubuntu/maverick/cairo-dock-plug-ins |
Diff against target: |
122408 lines (+46114/-35437) 262 files modified
Animated-icons/data/messages (+0/-192) CMakeLists.txt (+28/-15) Cairo-Penguin/data/Cairo-Penguin.conf.in (+2/-2) Cairo-Penguin/data/messages (+0/-28) Cairo-Penguin/src/applet-notifications.c (+4/-5) Clipper/data/Clipper.conf.in (+3/-5) Clipper/data/messages (+0/-146) Clipper/src/applet-init.c (+4/-1) Clipper/src/applet-notifications.c (+6/-4) Dbus/data/messages (+0/-26) Dbus/src/applet-dbus.c (+14/-15) Dbus/src/interface-applet-methods.c (+2/-2) Dbus/src/interface-applet-signals.c (+1/-1) Doncky/data/messages (+0/-140) Folders/data/Folders.conf.in (+9/-8) Folders/data/messages (+0/-124) Folders/src/applet-config.c (+13/-4) Folders/src/applet-notifications.c (+37/-27) GMenu/data/messages (+0/-114) GMenu/src/applet-menu.c (+14/-2) GMenu/src/applet-notifications.c (+8/-75) GMenu/src/applet-util.c (+1/-1) Indicator-applet/indicator-applet.c (+1/-1) MeMenu/data/messages (+0/-86) MeMenu/src/applet-me.c (+4/-4) MeMenu/src/applet-menu.c (+1/-1) Messaging-Menu/data/messages (+0/-90) Messaging-Menu/src/applet-menu.c (+4/-4) Messaging-Menu/src/applet-messaging.c (+3/-3) Network-Monitor/data/Network-Monitor.conf.in (+2/-2) Network-Monitor/data/messages (+0/-258) RSSreader/data/messages (+0/-204) RSSreader/src/applet-notifications.c (+3/-3) Remote-Control/CMakeLists.txt (+2/-0) Remote-Control/data/CMakeLists.txt (+11/-0) Remote-Control/data/Remote-Control.conf.in (+14/-0) Remote-Control/data/arrows.svg (+289/-0) Remote-Control/src/CMakeLists.txt (+40/-0) Remote-Control/src/applet-config.c (+51/-0) Remote-Control/src/applet-config.h (+30/-0) Remote-Control/src/applet-icon-finder.c (+257/-0) Remote-Control/src/applet-icon-finder.h (+40/-0) Remote-Control/src/applet-init.c (+66/-0) Remote-Control/src/applet-init.h (+31/-0) Remote-Control/src/applet-notifications.c (+480/-0) Remote-Control/src/applet-notifications.h (+45/-0) Remote-Control/src/applet-session.c (+154/-0) Remote-Control/src/applet-session.h (+38/-0) Remote-Control/src/applet-struct.h (+51/-0) Scooby-Do/data/CMakeLists.txt (+0/-1) Scooby-Do/data/Scooby-Do.conf.in (+0/-3) Scooby-Do/data/arrows.svg (+0/-289) Scooby-Do/data/messages (+0/-118) Scooby-Do/src/applet-appli-finder.h (+0/-2) Scooby-Do/src/applet-config.c (+0/-9) Scooby-Do/src/applet-draw.c (+3/-50) Scooby-Do/src/applet-icon-finder.c (+9/-209) Scooby-Do/src/applet-icon-finder.h (+0/-1) Scooby-Do/src/applet-init.c (+10/-16) Scooby-Do/src/applet-notifications.c (+85/-364) Scooby-Do/src/applet-notifications.h (+0/-4) Scooby-Do/src/applet-search.c (+1/-1) Scooby-Do/src/applet-session.c (+51/-53) Scooby-Do/src/applet-session.h (+3/-5) Scooby-Do/src/applet-struct.h (+2/-33) Status-Notifier/CMakeLists.txt (+0/-12) Status-Notifier/data/Status-Notifier.conf.in (+28/-38) Status-Notifier/data/messages (+0/-100) Status-Notifier/src/CMakeLists.txt (+9/-11) Status-Notifier/src/applet-config.c (+3/-3) Status-Notifier/src/applet-draw.c (+242/-0) Status-Notifier/src/applet-draw.h (+41/-0) Status-Notifier/src/applet-host.c (+549/-574) Status-Notifier/src/applet-host.h (+9/-3) Status-Notifier/src/applet-init.c (+36/-12) Status-Notifier/src/applet-item.c (+669/-0) Status-Notifier/src/applet-item.h (+40/-0) Status-Notifier/src/applet-notifications.c (+106/-61) Status-Notifier/src/applet-struct.h (+35/-24) System-Monitor/data/System-Monitor.conf.in (+1/-1) System-Monitor/data/messages (+0/-208) System-Monitor/src/applet-config.c (+0/-7) System-Monitor/src/applet-init.c (+21/-5) System-Monitor/src/applet-monitor.c (+5/-5) System-Monitor/src/applet-monitor.h (+1/-1) System-Monitor/src/applet-notifications.c (+5/-3) System-Monitor/src/applet-struct.h (+12/-2) Toons/data/Toons.conf.in (+1/-1) Toons/data/messages (+0/-106) Toons/src/applet-notifications.c (+0/-10) Xgamma/data/messages (+0/-98) Xgamma/src/applet-notifications.c (+3/-1) alsaMixer/data/CMakeLists.txt (+1/-0) alsaMixer/data/emblem-mute.svg (+461/-0) alsaMixer/data/messages (+0/-146) alsaMixer/src/applet-notifications.c (+7/-4) clock/data/clock.conf.in (+3/-0) clock/data/messages (+0/-162) clock/src/CMakeLists.txt (+2/-1) clock/src/applet-backend-default.c (+34/-6) clock/src/applet-backend-ical.c (+5/-3) clock/src/applet-calendar.c (+91/-0) clock/src/applet-calendar.h (+2/-0) clock/src/applet-config.c (+3/-0) clock/src/applet-draw.c (+25/-396) clock/src/applet-draw.h (+0/-12) clock/src/applet-init.c (+3/-7) clock/src/applet-notifications.c (+9/-4) clock/src/applet-struct.h (+12/-1) clock/src/applet-timer.c (+506/-0) clock/src/applet-timer.h (+35/-0) compiz-icon/data/compiz-icon.conf.in (+1/-3) compiz-icon/data/messages (+0/-196) compiz-icon/src/applet-notifications.c (+13/-9) copyright (+24/-9) debian/changelog (+33/-0) debian/control (+2/-1) debian/copyright (+10/-3) desklet-rendering/src/rendering-desklet-slide.c (+3/-4) desklet-rendering/src/rendering-desklet-viewport.c (+412/-430) desklet-rendering/src/rendering-desklet-viewport.h (+22/-19) desklet-rendering/src/rendering-init.c (+3/-1) dialog-rendering/data/messages (+0/-50) dialog-rendering/src/applet-decorator-tooltip.c (+2/-2) dnd2share/data/messages (+0/-158) dnd2share/src/applet-notifications.c (+84/-70) dock-rendering/data/messages (+0/-114) dock-rendering/src/rendering-3D-plane.c (+38/-98) dock-rendering/src/rendering-caroussel.c (+2/-2) dock-rendering/src/rendering-commons.c (+2/-2) dock-rendering/src/rendering-curve.c (+4/-2) dock-rendering/src/rendering-diapo-simple.c (+154/-101) dock-rendering/src/rendering-init.c (+1/-1) dock-rendering/src/rendering-panel.c (+5/-3) dock-rendering/src/rendering-parabole.c (+4/-2) dock-rendering/src/rendering-rainbow.c (+14/-12) drop-indicator/data/messages (+0/-20) dustbin/data/messages (+0/-110) dustbin/src/applet-config.c (+0/-1) dustbin/src/applet-init.c (+3/-3) dustbin/src/applet-notifications.c (+70/-25) dustbin/src/applet-struct.h (+5/-1) dustbin/src/applet-trashes-manager.c (+13/-4) gvfs-integration/cairo-dock-gio-vfs.c (+9/-3) icon-effect/data/messages (+0/-218) illusion/data/messages (+0/-84) kde-integration/src/applet-vfs.c (+2/-1) keyboard-indicator/data/messages (+0/-114) keyboard-indicator/src/applet-notifications.c (+14/-9) logout/data/messages (+0/-102) logout/src/applet-notifications.c (+6/-4) mail/data/mail.conf.in (+3/-3) mail/data/messages (+0/-136) mail/src/cd-mail-applet-accounts.c (+8/-8) mail/src/cd-mail-applet-etpan.c (+1/-1) mail/src/cd-mail-applet-notifications.c (+32/-12) motion-blur/data/messages (+0/-6) musicPlayer/data/messages (+0/-190) musicPlayer/data/musicPlayer.conf.in (+2/-2) musicPlayer/src/CMakeLists.txt (+2/-0) musicPlayer/src/applet-config.c (+1/-1) musicPlayer/src/applet-cover.c (+1/-0) musicPlayer/src/applet-draw.c (+5/-5) musicPlayer/src/applet-gmusicbrowser.c (+43/-0) musicPlayer/src/applet-gmusicbrowser.h (+32/-0) musicPlayer/src/applet-init.c (+2/-0) musicPlayer/src/applet-mpris.c (+1/-1) musicPlayer/src/applet-notifications.c (+29/-9) musicPlayer/src/applet-rhythmbox.c (+1/-1) musicPlayer/src/applet-struct.h (+1/-0) netspeed/data/messages (+0/-150) netspeed/data/netspeed.conf.in (+2/-2) netspeed/src/applet-init.c (+10/-4) netspeed/src/applet-netspeed.c (+39/-23) netspeed/src/applet-netspeed.h (+2/-0) netspeed/src/applet-notifications.c (+7/-1) po/ar.po (+973/-1050) po/cairo-dock.pot (+865/-954) po/cs.po (+1387/-1288) po/de.po (+1225/-1205) po/en.po (+1302/-1201) po/es.po (+1425/-1371) po/et.po (+7581/-0) po/fr.po (+1065/-1514) po/hu.po (+1019/-1103) po/it.po (+1199/-1113) po/ja.po (+1272/-1180) po/nl.po (+1420/-1365) po/pt.po (+1174/-1216) po/pt_BR.po (+1363/-1350) po/ru.po (+1287/-1204) po/sk.po (+1363/-1323) po/sr.po (+7544/-0) po/sv.po (+995/-1049) po/tr.po (+917/-1012) po/uk.po (+1194/-1112) po/zh_CN.po (+1290/-1203) po/zh_TW.po (+1885/-1909) powermanager/data/messages (+0/-198) powermanager/data/powermanager.conf.in (+4/-6) powermanager/src/powermanager-dbus.c (+5/-1) powermanager/src/powermanager-draw.c (+31/-2) powermanager/src/powermanager-draw.h (+3/-1) powermanager/src/powermanager-init.c (+7/-1) powermanager/src/powermanager-menu-functions.c (+3/-2) quick-browser/data/messages (+0/-124) quick-browser/src/applet-menu.c (+1/-1) quick-browser/src/applet-notifications.c (+0/-2) shortcuts/data/messages (+0/-134) shortcuts/data/shortcuts.conf.in (+3/-4) shortcuts/src/applet-bookmarks.c (+4/-4) shortcuts/src/applet-drives.c (+9/-9) shortcuts/src/applet-load-icons.c (+7/-7) shortcuts/src/applet-notifications.c (+22/-19) show-mouse/data/messages (+0/-36) show-mouse/data/show_mouse.conf.in (+1/-1) showDesktop/data/messages (+0/-128) showDesktop/src/applet-notifications.c (+10/-4) slider/data/messages (+0/-158) slider/src/applet-notifications.c (+14/-10) stack/data/messages (+0/-138) stack/data/stack.conf.in (+6/-9) stack/src/applet-config.c (+2/-2) stack/src/applet-notifications.c (+24/-17) stacks/CMakeLists.txt (+0/-14) stacks/data/CMakeLists.txt (+0/-7) stacks/data/messages (+0/-118) stacks/data/stacks.conf.in (+0/-118) stacks/src/CMakeLists.txt (+0/-75) stacks/src/applet-config.c (+0/-64) stacks/src/applet-config.h (+0/-30) stacks/src/applet-init.c (+0/-77) stacks/src/applet-init.h (+0/-31) stacks/src/applet-load-icons.c (+0/-383) stacks/src/applet-load-icons.h (+0/-33) stacks/src/applet-notifications.c (+0/-56) stacks/src/applet-notifications.h (+0/-37) stacks/src/applet-stacks.c (+0/-148) stacks/src/applet-stacks.h (+0/-34) stacks/src/applet-struct.h (+0/-48) switcher/data/messages (+0/-148) switcher/src/applet-desktops.c (+1/-1) switcher/src/applet-draw.c (+1/-1) switcher/src/applet-notifications.c (+17/-20) systray/data/messages (+0/-92) template/data/messages (+0/-100) template/data/template.conf.in (+3/-4) template/src/applet-init.c (+1/-1) terminal/data/messages (+0/-114) terminal/src/terminal-menu-functions.c (+5/-4) terminal/src/terminal-widget.c (+16/-10) tomboy/data/messages (+0/-144) tomboy/data/tomboy.conf.in (+1/-1) tomboy/src/tomboy-notifications.c (+29/-12) weather/data/messages (+0/-128) weather/data/weather.conf.in (+2/-2) weather/src/applet-notifications.c (+7/-5) weblets/data/messages (+0/-118) weblets/src/applet-notifications.c (+4/-1) wifi/data/messages (+0/-190) wifi/data/wifi.conf.in (+1/-1) wifi/src/applet-notifications.c (+4/-2) |
To merge this branch: | bzr merge lp:~cairo-dock-team/cairo-dock-plug-ins/ubuntu |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cairo-Dock Devs | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2010-09-16.
Commit message
Description of the change
- 15. By Matthieu Baerts
-
* New Upstream Version (LP: #638529)
* Fixed a few bugs on LP:
- Fixed a crash in rainbow view when the cone is completely opened
- Installed in lib directory by default even in 64bits arch
- Status-Notifier: fixed few bugs
- Clock applet:
- Notify of missed tasks (moved some functions to a new file)
- Fixed a little memory leak
- Removed some 'g_print' (LP: #500677: xsession-errors log)
* Updated translations - 16. By Matthieu Baerts
-
Status-Notifier: Fixed a typo
- 17. By Matthieu Baerts
-
- Fixed a crash in rainbow view if the subdock is empty
* debian/control
- Updated the version of cairo-dock-dev and cairo-dock-core - 18. By Didier Roche-Tolomelli
-
debian/control: depends on latest libindicator-dev (LP: #637692)
- 19. By Matthieu Baerts
-
* New Upstream Version (LP: #653702)
* Fixed a few bugs:
- All .mo files aren't installed into the right directory (LP: #653336)
- Dbus: Fixed a crash when exiting Cairo-Dock
- Indicator: Some modifications needed for the latest
version of libindicator
- RSSreader: Prevented a crash if myDrawContext != NULL
- Clock: Prevented a crash if myDrawContext != NULL
- Switcher:
- Prevented a crash if myDrawContext != NULL
- Fixed a crash if the plugin is launched much time before the WM
- musicPlayer:
- Used the right image set from the config panel
- MPRIS plugin: fixed a bug with the tracknumber
- Systray: not drawn outside the screen.
- tomboy: not popup a dialogue inside the screen
- xfce-integration: displayed a window when logout applet is launched
* debian/control:
- Updated the version of cairo-dock-dev and cairo-dock-core - 20. By Matthieu Baerts
-
* debian/control:
- Replaced libwebkit-dev by libwebkitgtk-dev (LP: #704032)
* No change rebuild for libindicator1 > libindicator2 transition
* No change rebuild for libdbusmenu-gtk1 > libdbusmenu-gtk2 transition - 21. By Matthieu Baerts
-
* New Upstream Version (LP: #723995)
* Added debian/source/ format: 3.0
* debian/cairo-dock- plug-ins. install:
- Added new files (interfaces for python, ruby, vala and mono)
* debian/control:
- Added new dependences for new applets (sensors and zeitgeist)
and new interfaces (python, valac, ruby and mono)
- Updated the version of cairo-dock build-dependences
* debian/rules:
- Added a new CMake flag to install python interface in debian/tmp
* Updated debian/watch
Unmerged revisions
- 21. By Matthieu Baerts
-
* New Upstream Version (LP: #723995)
* Added debian/source/ format: 3.0
* debian/cairo-dock- plug-ins. install:
- Added new files (interfaces for python, ruby, vala and mono)
* debian/control:
- Added new dependences for new applets (sensors and zeitgeist)
and new interfaces (python, valac, ruby and mono)
- Updated the version of cairo-dock build-dependences
* debian/rules:
- Added a new CMake flag to install python interface in debian/tmp
* Updated debian/watch - 20. By Matthieu Baerts
-
* debian/control:
- Replaced libwebkit-dev by libwebkitgtk-dev (LP: #704032)
* No change rebuild for libindicator1 > libindicator2 transition
* No change rebuild for libdbusmenu-gtk1 > libdbusmenu-gtk2 transition - 19. By Matthieu Baerts
-
* New Upstream Version (LP: #653702)
* Fixed a few bugs:
- All .mo files aren't installed into the right directory (LP: #653336)
- Dbus: Fixed a crash when exiting Cairo-Dock
- Indicator: Some modifications needed for the latest
version of libindicator
- RSSreader: Prevented a crash if myDrawContext != NULL
- Clock: Prevented a crash if myDrawContext != NULL
- Switcher:
- Prevented a crash if myDrawContext != NULL
- Fixed a crash if the plugin is launched much time before the WM
- musicPlayer:
- Used the right image set from the config panel
- MPRIS plugin: fixed a bug with the tracknumber
- Systray: not drawn outside the screen.
- tomboy: not popup a dialogue inside the screen
- xfce-integration: displayed a window when logout applet is launched
* debian/control:
- Updated the version of cairo-dock-dev and cairo-dock-core - 18. By Didier Roche-Tolomelli
-
debian/control: depends on latest libindicator-dev (LP: #637692)
- 17. By Matthieu Baerts
-
- Fixed a crash in rainbow view if the subdock is empty
* debian/control
- Updated the version of cairo-dock-dev and cairo-dock-core - 16. By Matthieu Baerts
-
Status-Notifier: Fixed a typo
- 15. By Matthieu Baerts
-
* New Upstream Version (LP: #638529)
* Fixed a few bugs on LP:
- Fixed a crash in rainbow view when the cone is completely opened
- Installed in lib directory by default even in 64bits arch
- Status-Notifier: fixed few bugs
- Clock applet:
- Notify of missed tasks (moved some functions to a new file)
- Fixed a little memory leak
- Removed some 'g_print' (LP: #500677: xsession-errors log)
* Updated translations - 14. By Matthieu Baerts
-
* New Upstream Version (LP: #632054)
* Fixed a few bugs on LP:
- LP: #616176 Dust Bin Hang and Incorrect Configuration
- LP: #604034 Change terminal tab's name lost the color
- LP: #582452 GMenu does not contain any applications
* Fixed a few bugs on glx-dock forum:
- Fixed support of GMusicBrowser.
- AlsaMixer has no emblem.
- Status-Notifier doesn't be drawed into the dock.
* Updated translations
* debian/control:
- Added cairo-dock-core as build-depends in order to prevent
some builds errors. - 13. By Didier Roche-Tolomelli
-
fix versionning
- 12. By Fabounet
-
applied Matttbe's patch on changelog and control files
Preview Diff
1 | === removed file 'Animated-icons/data/messages' |
2 | --- Animated-icons/data/messages 2010-08-07 01:43:25 +0000 |
3 | +++ Animated-icons/data/messages 1970-01-01 00:00:00 +0000 |
4 | @@ -1,192 +0,0 @@ |
5 | -_("Global") |
6 | - |
7 | -_("Animations are triggered when hovering an icon only in OpenGL mode.") |
8 | - |
9 | -_("when hovering over an icon") |
10 | - |
11 | -_("Effects used:") |
12 | - |
13 | -_("Bounce") |
14 | - |
15 | -_("Rotate") |
16 | - |
17 | -_("Blink") |
18 | - |
19 | -_("Pulse") |
20 | - |
21 | -_("Wobbly") |
22 | - |
23 | -_("Wave") |
24 | - |
25 | -_("Spot") |
26 | - |
27 | -_("when clicking on an launcher") |
28 | - |
29 | -_("Effects used on launcher:") |
30 | - |
31 | -_("Bounce") |
32 | - |
33 | -_("Rotate") |
34 | - |
35 | -_("Blink") |
36 | - |
37 | -_("Pulse") |
38 | - |
39 | -_("Wobbly") |
40 | - |
41 | -_("Wave") |
42 | - |
43 | -_("Number of times the animation will play:") |
44 | - |
45 | -_("when clicking on an application") |
46 | - |
47 | -_("Effects used on applications:") |
48 | - |
49 | -_("Bounce") |
50 | - |
51 | -_("Rotate") |
52 | - |
53 | -_("Blink") |
54 | - |
55 | -_("Pulse") |
56 | - |
57 | -_("Wobbly") |
58 | - |
59 | -_("Wave") |
60 | - |
61 | -_("Number of times the animation will play:") |
62 | - |
63 | -_("when clicking on an applet") |
64 | - |
65 | -_("Effects used on applets:") |
66 | - |
67 | -_("Bounce") |
68 | - |
69 | -_("Rotate") |
70 | - |
71 | -_("Blink") |
72 | - |
73 | -_("Pulse") |
74 | - |
75 | -_("Wobbly") |
76 | - |
77 | -_("Wave") |
78 | - |
79 | -_("Number of times the animation will play:") |
80 | - |
81 | -_("Rotation") |
82 | - |
83 | -_("In ms.") |
84 | - |
85 | -_("Duration of the animation:") |
86 | - |
87 | -_("Repeat while icon is pointed to?") |
88 | - |
89 | -_("Type of mesh:") |
90 | - |
91 | -_("Normal") |
92 | - |
93 | -_("Cube") |
94 | - |
95 | -_("Capsule") |
96 | - |
97 | -_("Colour of the sheen:") |
98 | - |
99 | -_("Spot") |
100 | - |
101 | -_("In ms.") |
102 | - |
103 | -_("Duration of the animation:") |
104 | - |
105 | -_("Repeat while icon is pointed to?") |
106 | - |
107 | -_("Spot") |
108 | - |
109 | -_("Leave empty to use the default one.") |
110 | - |
111 | -_("Image for the spotlight:") |
112 | - |
113 | -_("Leave empty to use the default one.") |
114 | - |
115 | -_("Image for the front spotlight:") |
116 | - |
117 | -_("Spot colour:") |
118 | - |
119 | -_("Halo colour:") |
120 | - |
121 | -_("Rays") |
122 | - |
123 | -_("st color of gradation :") |
124 | - |
125 | -_("nd color of gradation :") |
126 | - |
127 | -_("Random colours?") |
128 | - |
129 | -_("Number of rays:") |
130 | - |
131 | -_("Ray size:") |
132 | - |
133 | -_("Ray speed:") |
134 | - |
135 | -_("Wobbly") |
136 | - |
137 | -_("Initial stretch:") |
138 | - |
139 | -_("Horizontal stretch") |
140 | - |
141 | -_("Vertical stretch") |
142 | - |
143 | -_("Corner stretch") |
144 | - |
145 | -_("Spring constant:") |
146 | - |
147 | -_("Friction:") |
148 | - |
149 | -_("Number of points on the grid in each direction:") |
150 | - |
151 | -_("Wave") |
152 | - |
153 | -_("In ms.") |
154 | - |
155 | -_("Duration of the animation:") |
156 | - |
157 | -_("Repeat while icon is pointed to?") |
158 | - |
159 | -_("Wave width:") |
160 | - |
161 | -_("Wave amplitude:") |
162 | - |
163 | -_("Pulse") |
164 | - |
165 | -_("In ms.") |
166 | - |
167 | -_("Pulse duration:") |
168 | - |
169 | -_("Repeat while icon is pointed to?") |
170 | - |
171 | -_("Pulse max zoom:") |
172 | - |
173 | -_("Pulse follows icon shape?") |
174 | - |
175 | -_("Bounce") |
176 | - |
177 | -_("In ms.") |
178 | - |
179 | -_("Bounce duration:") |
180 | - |
181 | -_("Repeat while icon is pointed to?") |
182 | - |
183 | -_("When bouncing, resize the icon by:") |
184 | - |
185 | -_("the lower the value, the more it will flatten.") |
186 | - |
187 | -_("How much the icon will flatten when hitting the ground:") |
188 | - |
189 | -_("Blink") |
190 | - |
191 | -_("In ms.") |
192 | - |
193 | -_("Blink duration:") |
194 | - |
195 | -_("Repeat while icon is pointed to?") |
196 | - |
197 | |
198 | === modified file 'CMakeLists.txt' |
199 | --- CMakeLists.txt 2010-08-07 01:43:25 +0000 |
200 | +++ CMakeLists.txt 2010-09-16 01:10:06 +0000 |
201 | @@ -10,7 +10,7 @@ |
202 | ########### project ############### |
203 | |
204 | project ("cairo-dock-plugins") |
205 | -set (VERSION "2.2.0-0beta4") |
206 | +set (VERSION "2.2.0-1") |
207 | |
208 | add_definitions (-std=c99 -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) #-Wunreachable-code -Wno-unused-parameter -Wall |
209 | if (NOT ${CMAKE_BUILD_TYPE}) |
210 | @@ -23,7 +23,7 @@ |
211 | set (CPACK_SOURCE_GENERATOR "TGZ") |
212 | set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}") |
213 | set (CPACK_SOURCE_IGNORE_FILES |
214 | - "/build/;/.bzr/;bzrignore$;/misc/;/en_GB.po$;~$;${CPACK_SOURCE_IGNORE_FILES}") |
215 | + "/build/;/.bzr/;bzrignore$;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}") |
216 | include (CPack) |
217 | |
218 | add_custom_target( dist |
219 | @@ -62,12 +62,10 @@ |
220 | endif() |
221 | set (GETTEXT_PLUGINS "cairo-dock-plugins") |
222 | |
223 | -if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND "${LIB_SUFFIX}" STREQUAL "" AND "${FORCE_NOT_LIB64}" STREQUAL "" ) |
224 | - set (libdir lib64/cairo-dock) |
225 | -elseif( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT "${FORCE_NOT_LIB64}" STREQUAL "" ) |
226 | - set (libdir lib${LIB_SUFFIX}/cairo-dock) |
227 | +if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT "${FORCE_LIB64}" STREQUAL "") # 64bits and force install in lib64 |
228 | + set (libdir ${prefix}/lib64) |
229 | else() |
230 | - set (libdir lib${LIB_SUFFIX}/cairo-dock) |
231 | + set (libdir ${prefix}/lib${LIB_SUFFIX}) |
232 | endif() |
233 | |
234 | if (NOT "${pluginsdir}" STREQUAL "${CMAKE_INSTALL_PREFIX}/${libdir}") |
235 | @@ -509,12 +507,17 @@ |
236 | |
237 | ############# STATUS NOTIFIER ################# |
238 | if ("${enable-status-notifier}" STREQUAL "yes") |
239 | - set (GETTEXT_STATUS_NOTIFIER ${GETTEXT_PLUGINS}) |
240 | - set (VERSION_STATUS_NOTIFIER "0.0.1") |
241 | - set (PACKAGE_STATUS_NOTIFIER "cd-status-notifier") |
242 | - set (status_notifierdatadir "${pluginsdatadir}/Status-Notifier") |
243 | - configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Status-Notifier/data/Status-Notifier.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Status-Notifier/data/Status-Notifier.conf) |
244 | - add_subdirectory (Status-Notifier) |
245 | + pkg_check_modules (STATUS_NOTIFIER dbusmenu-gtk) |
246 | + if ("${STATUS_NOTIFIER_FOUND}" STREQUAL "") |
247 | + message (STATUS "Could not find Status-Notifier libs; Cairo-Dock won't be built with Status-Notifier support.") |
248 | + else() |
249 | + set (GETTEXT_STATUS_NOTIFIER ${GETTEXT_PLUGINS}) |
250 | + set (VERSION_STATUS_NOTIFIER "0.1.0") |
251 | + set (PACKAGE_STATUS_NOTIFIER "cd-status-notifier") |
252 | + set (status_notifierdatadir "${pluginsdatadir}/Status-Notifier") |
253 | + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Status-Notifier/data/Status-Notifier.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Status-Notifier/data/Status-Notifier.conf) |
254 | + add_subdirectory (Status-Notifier) |
255 | + endif() |
256 | endif() |
257 | |
258 | ############# SWITCHER ################# |
259 | @@ -527,7 +530,7 @@ |
260 | |
261 | ############# SYSTEM MONITOR ################# |
262 | set (GETTEXT_SYSTEM_MONITOR ${GETTEXT_PLUGINS}) |
263 | -set (VERSION_SYSTEM_MONITOR "1.0.4") |
264 | +set (VERSION_SYSTEM_MONITOR "1.0.5") |
265 | set (PACKAGE_SYSTEM_MONITOR "cd-system-monitor") |
266 | set (system_monitordatadir "${pluginsdatadir}/System-monitor") |
267 | configure_file (${CMAKE_CURRENT_SOURCE_DIR}/System-Monitor/data/System-Monitor.conf.in ${CMAKE_CURRENT_BINARY_DIR}/System-Monitor/data/System-Monitor.conf) |
268 | @@ -554,7 +557,7 @@ |
269 | add_subdirectory (terminal) |
270 | endif() |
271 | |
272 | -############# OY ################# |
273 | +############# TOMBOY ################# |
274 | set (GETTEXT_TOMBOY ${GETTEXT_PLUGINS}) |
275 | set (VERSION_TOMBOY "1.3.0") |
276 | set (PACKAGE_TOMBOY "cd-tomboy") |
277 | @@ -631,3 +634,13 @@ |
278 | endif() |
279 | |
280 | add_subdirectory (po) |
281 | + |
282 | +############# REMOTE_CONTROL ################# |
283 | +if ("${enable_remote_control}" STREQUAL "yes") |
284 | + set (GETTEXT_REMOTE_CONTROL ${GETTEXT_PLUGINS}) |
285 | + set (VERSION_REMOTE_CONTROL "0.0.1") |
286 | + set (PACKAGE_REMOTE_CONTROL "cd-Remote-Control") |
287 | + set (remote_controldatadir "${pluginsdatadir}/Remote-Control") |
288 | + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Remote-Control/data/Remote-Control.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Remote-Control/data/Remote-Control.conf) |
289 | + add_subdirectory (Remote-Control) |
290 | +endif() |
291 | |
292 | === modified file 'Cairo-Penguin/data/Cairo-Penguin.conf.in' |
293 | --- Cairo-Penguin/data/Cairo-Penguin.conf.in 2010-08-07 01:43:25 +0000 |
294 | +++ Cairo-Penguin/data/Cairo-Penguin.conf.in 2010-09-16 01:10:06 +0000 |
295 | @@ -7,7 +7,7 @@ |
296 | icon size = 0;0 |
297 | |
298 | #s Icon name for busy penguin: |
299 | -name = Tux |
300 | +name = |
301 | |
302 | #d Name of the dock it belongs to: |
303 | dock name = |
304 | @@ -26,7 +26,7 @@ |
305 | theme = Classic |
306 | |
307 | #i Delay between animation changes : |
308 | -#{in seconds. |
309 | +#{in seconds.} |
310 | change delay = 8 |
311 | |
312 | #e[0;1] Penguin transparency: |
313 | |
314 | === removed file 'Cairo-Penguin/data/messages' |
315 | --- Cairo-Penguin/data/messages 2010-08-07 01:43:25 +0000 |
316 | +++ Cairo-Penguin/data/messages 1970-01-01 00:00:00 +0000 |
317 | @@ -1,28 +0,0 @@ |
318 | -_("Icon") |
319 | - |
320 | -_("Set to 0 to use the default applet size") |
321 | - |
322 | -_("Icon size for busy penguin:") |
323 | - |
324 | -_("Icon name for busy penguin:") |
325 | - |
326 | -_("Name of the dock it belongs to:") |
327 | - |
328 | -_("Applet's Handbook") |
329 | - |
330 | -_("Configuration") |
331 | - |
332 | -_("Choose one of the available themes:") |
333 | - |
334 | -_("in seconds.") |
335 | - |
336 | -_("Delay between animation changes :") |
337 | - |
338 | -_("Penguin transparency:") |
339 | - |
340 | -_("Let the penguin wander everywhere in the dock?") |
341 | - |
342 | -_("in pixels.") |
343 | - |
344 | -_("Ground offset:") |
345 | - |
346 | |
347 | === modified file 'Cairo-Penguin/src/applet-notifications.c' |
348 | --- Cairo-Penguin/src/applet-notifications.c 2010-08-07 01:43:25 +0000 |
349 | +++ Cairo-Penguin/src/applet-notifications.c 2010-09-16 01:10:06 +0000 |
350 | @@ -105,7 +105,7 @@ |
351 | { |
352 | PenguinAnimation *pAnimation = penguin_get_current_animation (); |
353 | if(pAnimation == NULL) |
354 | - return CAIRO_DOCK_LET_PASS_NOTIFICATION; |
355 | + CD_APPLET_LEAVE (CAIRO_DOCK_LET_PASS_NOTIFICATION); |
356 | |
357 | if ((myConfig.bFree && pClickedContainer == myContainer && myDock->container.iMouseX > (myDock->container.iWidth - myDock->fFlatDockWidth) / 2 + myData.iCurrentPositionX && myDock->container.iMouseX < (myDock->container.iWidth - myDock->fFlatDockWidth) / 2 + myData.iCurrentPositionX + pAnimation->iFrameWidth && myDock->container.iMouseY > myContainer->iHeight - myData.iCurrentPositionY - pAnimation->iFrameHeight && myDock->container.iMouseY < myContainer->iHeight - myData.iCurrentPositionY) || (! myConfig.bFree && pClickedIcon == myIcon)) |
358 | { |
359 | @@ -113,15 +113,14 @@ |
360 | { |
361 | cd_debug ("%s\n", myApplet->cConfFilePath); |
362 | cairo_dock_notify (CAIRO_DOCK_BUILD_ICON_MENU, myIcon, myContainer, CD_APPLET_MY_MENU); |
363 | - return CAIRO_DOCK_INTERCEPT_NOTIFICATION; |
364 | + CD_APPLET_LEAVE (CAIRO_DOCK_INTERCEPT_NOTIFICATION); |
365 | } |
366 | |
367 | GtkWidget *pMenuItem, *image; |
368 | |
369 | CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU); |
370 | |
371 | - GtkWidget *pModuleSubMenu = CD_APPLET_ADD_SUB_MENU (D_("Hey, you there!"), CD_APPLET_MY_MENU); |
372 | - //GtkWidget *pModuleSubMenu = CD_APPLET_CREATE_MY_SUB_MENU (); |
373 | + GtkWidget *pModuleSubMenu = CD_APPLET_CREATE_MY_SUB_MENU (); |
374 | if (penguin_is_resting (pAnimation)) |
375 | { |
376 | CD_APPLET_ADD_IN_MENU(D_("Wake up"), _wake_up, pModuleSubMenu); |
377 | @@ -170,7 +169,7 @@ |
378 | else if (iRandom == 1 && ! myConfig.bFree) |
379 | { |
380 | CD_APPLET_ANIMATE_MY_ICON ("bounce", 3); |
381 | - myData.pDialog = cairo_dock_show_temporary_dialog ("Olllééééé !", myIcon, myContainer, 2500); |
382 | + myData.pDialog = cairo_dock_show_temporary_dialog ("Olll����� !", myIcon, myContainer, 2500); |
383 | } |
384 | else |
385 | { |
386 | |
387 | === modified file 'Clipper/data/Clipper.conf.in' |
388 | --- Clipper/data/Clipper.conf.in 2010-08-07 01:43:25 +0000 |
389 | +++ Clipper/data/Clipper.conf.in 2010-09-16 01:10:06 +0000 |
390 | @@ -59,9 +59,6 @@ |
391 | #b Should be visible on all desktops? |
392 | sticky=true |
393 | |
394 | - |
395 | - |
396 | - |
397 | #F[Decorations;gtk-orientation-portrait] |
398 | frame_deco= |
399 | |
400 | @@ -95,6 +92,7 @@ |
401 | #e+[0;1] Foreground tansparency: |
402 | fg alpha = 1 |
403 | |
404 | + |
405 | #[gtk-preferences] |
406 | [Configuration] |
407 | |
408 | @@ -132,7 +130,7 @@ |
409 | shortkey = <Control>F8 |
410 | |
411 | #b Pop-up menus at mouse position? |
412 | -menu on mouse = true |
413 | +menu on mouse = false |
414 | |
415 | |
416 | #F[Actions;gtk-execute] |
417 | @@ -140,7 +138,7 @@ |
418 | |
419 | #b Enable actions? |
420 | #{If some actions are associated with an item, they will be proposed when the item is created.} |
421 | -enable actions = true |
422 | +enable actions = false |
423 | |
424 | #b Replay actions? |
425 | #{Display actions when selecting an item in the history.} |
426 | |
427 | === removed file 'Clipper/data/messages' |
428 | --- Clipper/data/messages 2010-08-07 01:43:25 +0000 |
429 | +++ Clipper/data/messages 1970-01-01 00:00:00 +0000 |
430 | @@ -1,146 +0,0 @@ |
431 | -_("Icon") |
432 | - |
433 | -_("Set to 0 to use the default applet size") |
434 | - |
435 | -_("Desired icon size for this applet") |
436 | - |
437 | -_("Name of the icon as it will appear in its caption in the dock:") |
438 | - |
439 | -_("Leave empty to use the default one.") |
440 | - |
441 | -_("Image filename:") |
442 | - |
443 | -_("Name of the dock it belongs to:") |
444 | - |
445 | -_("Applet's Handbook") |
446 | - |
447 | -_("Desklet") |
448 | - |
449 | -_("Position") |
450 | - |
451 | -_("If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.") |
452 | - |
453 | -_("Lock position?") |
454 | - |
455 | -_("Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.") |
456 | - |
457 | -_("Desklet dimensions (width x height):") |
458 | - |
459 | -_("Depending on your WindowManager, you may be able to move this with ALT + left-click.") |
460 | - |
461 | -_("Desklet position (x, y):") |
462 | - |
463 | -_("You can quickly rotate the desklet with the mouse, by dragging the little buttons on its left and top sides.") |
464 | - |
465 | -_("Rotation:") |
466 | - |
467 | -_("Visibility") |
468 | - |
469 | -_("Is detached from the dock") |
470 | - |
471 | -_("for CompizFusion's \"widget layer\", set behaviour in Compiz to: (class=Cairo-dock & type=utility)") |
472 | - |
473 | -_("Visibility:") |
474 | - |
475 | -_("Normal") |
476 | - |
477 | -_("Keep above") |
478 | - |
479 | -_("Keep below") |
480 | - |
481 | -_("Keep on widget layer") |
482 | - |
483 | -_("Reserve space") |
484 | - |
485 | -_("Should be visible on all desktops?") |
486 | - |
487 | -_("Decorations") |
488 | - |
489 | -_("Choose 'Custom decorations' to define your own decorations below.") |
490 | - |
491 | -_("Choose a decoration theme for this desklet:") |
492 | - |
493 | -_("Image to be displayed below drawings, e.g. a frame. Leave empty for no image.") |
494 | - |
495 | -_("Background image:") |
496 | - |
497 | -_("Background transparency:") |
498 | - |
499 | -_("in pixels. Use this to adjust the left position of drawings.") |
500 | - |
501 | -_("Left offset:") |
502 | - |
503 | -_("in pixels. Use this to adjust the top position of drawings.") |
504 | - |
505 | -_("Top offset:") |
506 | - |
507 | -_("in pixels. Use this to adjust the right position of drawings.") |
508 | - |
509 | -_("Right offset:") |
510 | - |
511 | -_("in pixels. Use this to adjust the bottom position of drawings.") |
512 | - |
513 | -_("Bottom offset:") |
514 | - |
515 | -_("Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.") |
516 | - |
517 | -_("Foreground image:") |
518 | - |
519 | -_("Foreground tansparency:") |
520 | - |
521 | -_("Configuration") |
522 | - |
523 | -_("Items") |
524 | - |
525 | -_("Clipboard items are those you get with CTRL+c. Selection items are those you get by selecting some text with the mouse.") |
526 | - |
527 | -_("Which items should be remembered?") |
528 | - |
529 | -_("None") |
530 | - |
531 | -_("Clipboard") |
532 | - |
533 | -_("Selection") |
534 | - |
535 | -_("Both") |
536 | - |
537 | -_("Number of items:") |
538 | - |
539 | -_("Remember items between 2 sessions ?") |
540 | - |
541 | -_("It is especially useful if you often select text with the mouse and don't want to loose your clipboard items due to too many items in the selection.") |
542 | - |
543 | -_("Separate clipboard and selection?") |
544 | - |
545 | -_("If so, number of selection items:") |
546 | - |
547 | -_("When you click on an item, its content will become accessible with CTRL+v") |
548 | - |
549 | -_("Paste into Clipboard?") |
550 | - |
551 | -_("When you click on an item, its content will become accessible with the middle-click") |
552 | - |
553 | -_("Paste into Selection?") |
554 | - |
555 | -_("Shortkey to pop-up the items menu:") |
556 | - |
557 | -_("Pop-up menus at mouse position?") |
558 | - |
559 | -_("Actions") |
560 | - |
561 | -_("If some actions are associated with an item, they will be proposed when the item is created.") |
562 | - |
563 | -_("Enable actions?") |
564 | - |
565 | -_("Display actions when selecting an item in the history.") |
566 | - |
567 | -_("Replay actions?") |
568 | - |
569 | -_("in seconds.") |
570 | - |
571 | -_("Duration of the action menu:") |
572 | - |
573 | -_("Persistent items") |
574 | - |
575 | -_("A list of persistent items which can be accessed with middle-click:") |
576 | - |
577 | |
578 | === modified file 'Clipper/src/applet-init.c' |
579 | --- Clipper/src/applet-init.c 2010-08-07 01:43:25 +0000 |
580 | +++ Clipper/src/applet-init.c 2010-09-16 01:10:06 +0000 |
581 | @@ -26,7 +26,7 @@ |
582 | #include "applet-init.h" |
583 | |
584 | |
585 | -CD_APPLET_DEFINITION (N_("Clipper"), |
586 | +CD_APPLET_DEFINE_BEGIN ("Clipper", |
587 | 1, 6, 3, |
588 | CAIRO_DOCK_CATEGORY_APPLET_ACCESSORY, |
589 | N_("This applet keeps a trace of the clipboard and mouse selection,\n" |
590 | @@ -35,6 +35,9 @@ |
591 | "Left-click to popup the clipboard and mouse selection history,\n" |
592 | "Drop text on the icon to create persistent items, and middle-clck to recall them."), |
593 | "Fabrice Rey (Fabounet)") |
594 | + CD_APPLET_DEFINE_COMMON_APPLET_INTERFACE |
595 | + CD_APPLET_REDEFINE_TITLE (N_("Clipboard history")) |
596 | +CD_APPLET_DEFINE_END |
597 | |
598 | |
599 | //\___________ Here is where you initiate your applet. myConfig is already set at this point, and also myIcon, myContainer, myDock, myDesklet (and myDrawContext if you're in dock mode). The macro CD_APPLET_MY_CONF_FILE and CD_APPLET_MY_KEY_FILE can give you access to the applet's conf-file and its corresponding key-file (also available during reload). If you're in desklet mode, myDrawContext is still NULL, and myIcon's buffers has not been filled, because you may not need them then (idem when reloading). |
600 | |
601 | === modified file 'Clipper/src/applet-notifications.c' |
602 | --- Clipper/src/applet-notifications.c 2010-08-07 01:43:25 +0000 |
603 | +++ Clipper/src/applet-notifications.c 2010-09-16 01:10:06 +0000 |
604 | @@ -35,7 +35,7 @@ |
605 | else |
606 | { |
607 | GtkWidget *pMenu = cd_clipper_build_items_menu (); |
608 | - cairo_dock_popup_menu_on_container (pMenu, myContainer); |
609 | + cairo_dock_popup_menu_on_icon (pMenu, myIcon, myContainer); |
610 | } |
611 | CD_APPLET_ON_CLICK_END |
612 | |
613 | @@ -85,9 +85,11 @@ |
614 | CD_APPLET_LEAVE(); |
615 | } |
616 | CD_APPLET_ON_BUILD_MENU_BEGIN |
617 | + // Sub-Menu |
618 | GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU (); |
619 | - CD_APPLET_ADD_IN_MENU_WITH_STOCK ("Clear clipboard History", "gtk-clear", _cd_clipper_clear_history, pSubMenu); |
620 | - CD_APPLET_ADD_IN_MENU_WITH_STOCK ("Paste all copied items", "gtk-paste", _cd_clipper_paste_all, pSubMenu); |
621 | + CD_APPLET_ADD_IN_MENU_WITH_STOCK ("Clear clipboard History", GTK_STOCK_CLEAR, _cd_clipper_clear_history, pSubMenu); |
622 | + CD_APPLET_ADD_IN_MENU_WITH_STOCK ("Paste all copied items", GTK_STOCK_PASTE, _cd_clipper_paste_all, pSubMenu); |
623 | + CD_APPLET_ADD_SEPARATOR_IN_MENU (pSubMenu); |
624 | CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu); |
625 | CD_APPLET_ON_BUILD_MENU_END |
626 | |
627 | @@ -101,7 +103,7 @@ |
628 | else |
629 | { |
630 | GtkWidget *pMenu = cd_clipper_build_persistent_items_menu (); |
631 | - cairo_dock_popup_menu_on_container (pMenu, myContainer); |
632 | + cairo_dock_popup_menu_on_icon (pMenu, myIcon, myContainer); |
633 | } |
634 | CD_APPLET_ON_MIDDLE_CLICK_END |
635 | |
636 | |
637 | === removed file 'Dbus/data/messages' |
638 | --- Dbus/data/messages 2010-08-07 01:43:25 +0000 |
639 | +++ Dbus/data/messages 1970-01-01 00:00:00 +0000 |
640 | @@ -1,26 +0,0 @@ |
641 | -_("Configuration") |
642 | - |
643 | -_("Let external applications pop up dialogs in the dock?") |
644 | - |
645 | -_("Let external applications reboot the dock?") |
646 | - |
647 | -_("Let external applications quit the dock?") |
648 | - |
649 | -_("Let external applications show/hide desklets?") |
650 | - |
651 | -_("Let external applications reload applets?") |
652 | - |
653 | -_("Let external applications show/hide docks?") |
654 | - |
655 | -_("Let extern applications add launchers to the docks?") |
656 | - |
657 | -_("Let external applications modify the labels of icons?") |
658 | - |
659 | -_("Let extern applications modify the quick-infos on icons?") |
660 | - |
661 | -_("Let extern applications modify the icons' image?") |
662 | - |
663 | -_("Let extern applications animate icons?") |
664 | - |
665 | -_("Let extern applications register new module?") |
666 | - |
667 | |
668 | === modified file 'Dbus/src/applet-dbus.c' |
669 | --- Dbus/src/applet-dbus.c 2010-08-07 01:43:25 +0000 |
670 | +++ Dbus/src/applet-dbus.c 2010-09-16 01:10:06 +0000 |
671 | @@ -146,7 +146,7 @@ |
672 | gchar *cUserPackagesDir = g_strdup_printf ("%s/%s", g_cCairoDockDataDir, CD_DBUS_APPLETS_FOLDER); |
673 | gchar *cDistantPackagesDir = g_strdup_printf ("%s/%d.%d.%d", CD_DBUS_APPLETS_FOLDER, g_iMajorVersion, g_iMinorVersion, g_iMicroVersion); |
674 | gchar *cPath = cairo_dock_get_package_path (cModuleName, cSharePackagesDir, cUserPackagesDir, cDistantPackagesDir, CAIRO_DOCK_UPDATED_PACKAGE); |
675 | - g_print ("*** update of the applet '%s' -> got '%s'\n", cModuleName, cPath); |
676 | + cd_debug ("*** update of the applet '%s' -> got '%s'\n", cModuleName, cPath); |
677 | g_free (cPath); |
678 | g_free (cSharePackagesDir); |
679 | g_free (cUserPackagesDir); |
680 | @@ -161,7 +161,7 @@ |
681 | |
682 | if (pModule->pInstancesList != NULL) // applet active => on la recharge. |
683 | { |
684 | - g_print ("*** applet '%s' is active, reload it\n", cModuleName); |
685 | + cd_debug ("*** applet '%s' is active, reload it", cModuleName); |
686 | CairoDockModuleInstance *pModuleInstance = pModule->pInstancesList->data; |
687 | Icon *pIcon = pModuleInstance->pIcon; |
688 | CairoContainer *pContainer = pModuleInstance->pContainer; |
689 | @@ -193,15 +193,15 @@ |
690 | //cairo_dock_free_task (pUpdateTask); |
691 | return TRUE; |
692 | } |
693 | -static void _check_update_theme (const gchar *cModuleName, CairoDockPackage *pPackage, gpointer data) |
694 | +static void _check_update_package (const gchar *cModuleName, CairoDockPackage *pPackage, gpointer data) |
695 | { |
696 | - g_print ("*** %s (%s, %d)\n", __func__, cModuleName, pPackage->iType); |
697 | + cd_message ("*** %s (%s, %d)", __func__, cModuleName, pPackage->iType); |
698 | if (pPackage->iType == CAIRO_DOCK_UPDATED_PACKAGE) |
699 | { |
700 | gchar *cUserDirPath = g_strdup_printf ("%s/%s/%s", g_cCairoDockDataDir, CD_DBUS_APPLETS_FOLDER, cModuleName); |
701 | if (g_file_test (cUserDirPath, G_FILE_TEST_EXISTS)) |
702 | { |
703 | - g_print ("*** the applet '%s' needs to be updated\n", cModuleName); |
704 | + cd_message ("*** the applet '%s' needs to be updated", cModuleName); |
705 | CairoDockTask *pUpdateTask = cairo_dock_new_task_full (0, (CairoDockGetDataAsyncFunc) _get_package_path, (CairoDockUpdateSyncFunc) _apply_package_update, (GFreeFunc) g_free, g_strdup (cModuleName)); |
706 | myData.pUpdateTasksList = g_list_prepend (myData.pUpdateTasksList, pUpdateTask); |
707 | cairo_dock_launch_task (pUpdateTask); |
708 | @@ -212,7 +212,7 @@ |
709 | { |
710 | if (pThemesTable != NULL) |
711 | { |
712 | - g_hash_table_foreach (pThemesTable, (GHFunc) _check_update_theme, NULL); |
713 | + g_hash_table_foreach (pThemesTable, (GHFunc) _check_update_package, NULL); |
714 | } |
715 | cairo_dock_free_task (myData.pGetListTask); |
716 | myData.pGetListTask = NULL; |
717 | @@ -240,11 +240,10 @@ |
718 | g_idle_add ((GSourceFunc) _cd_dbus_launch_third_party_applets, NULL); // on les lance avec un delai, car si l'applet DBus est lancee au demarrage du dock, on est dans la fonction cairo_dock_activate_modules_from_list(), et donc si on enregistre des applets pendant ce temps, le dock risque de recharger certaines des applets distantes (celles qui seront actives en conf et qui viendront apres DBus). |
719 | |
720 | // on telecharge en tache de fond la liste des applets. |
721 | - gchar *cSharePackagesDir = g_strdup_printf ("%s/%s", MY_APPLET_SHARE_DATA_DIR, CD_DBUS_APPLETS_FOLDER); |
722 | + const gchar *cSharePackagesDir = NULL; // MY_APPLET_SHARE_DATA_DIR"/"CD_DBUS_APPLETS_FOLDER; |
723 | gchar *cUserPackagesDir = g_strdup_printf ("%s/%s", g_cCairoDockDataDir, CD_DBUS_APPLETS_FOLDER); |
724 | gchar *cDistantPackagesDir = g_strdup_printf ("%s/%d.%d.%d", CD_DBUS_APPLETS_FOLDER, g_iMajorVersion, g_iMinorVersion, g_iMicroVersion); |
725 | myData.pGetListTask = cairo_dock_list_packages_async (cSharePackagesDir, cUserPackagesDir, cDistantPackagesDir, (CairoDockGetPackagesFunc) _on_got_list, NULL); |
726 | - g_free (cSharePackagesDir); |
727 | g_free (cUserPackagesDir); |
728 | g_free (cDistantPackagesDir); |
729 | } |
730 | @@ -345,7 +344,7 @@ |
731 | { |
732 | if (! myConfig.bEnableNewModule) |
733 | return FALSE; |
734 | - g_print ("%s (%s)\n", __func__, cModuleName); |
735 | + cd_message ("%s (%s)", __func__, cModuleName); |
736 | |
737 | //\____________ on cree et on enregistre un nouveau module s'il n'existe pas deja. |
738 | CairoDockModule *pModule = cairo_dock_find_module_from_name (cModuleName); |
739 | @@ -435,7 +434,7 @@ |
740 | gpointer invocation_hint G_GNUC_UNUSED, |
741 | gpointer marshal_data) |
742 | { |
743 | - g_print ("%s ()\n", __func__); |
744 | + //g_print ("%s ()\n", __func__); |
745 | typedef void (*GMarshalFunc_VOID__INT_STRING) (gpointer data1, |
746 | gint arg_1, |
747 | gchar *arg_2, |
748 | @@ -469,7 +468,7 @@ |
749 | gpointer invocation_hint G_GNUC_UNUSED, |
750 | gpointer marshal_data) |
751 | { |
752 | - g_print ("%s ()\n", __func__); |
753 | + //g_print ("%s ()\n", __func__); |
754 | typedef void (*GMarshalFunc_VOID__BOOLEAN_STRING) (gpointer data1, |
755 | gboolean arg_1, |
756 | gchar *arg_2, |
757 | @@ -503,7 +502,7 @@ |
758 | gpointer invocation_hint G_GNUC_UNUSED, |
759 | gpointer marshal_data) |
760 | { |
761 | - g_print ("%s ()\n", __func__); |
762 | + //g_print ("%s ()\n", __func__); |
763 | typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1, |
764 | gchar *arg_1, |
765 | gchar *arg_2, |
766 | @@ -537,7 +536,7 @@ |
767 | gpointer invocation_hint G_GNUC_UNUSED, |
768 | gpointer marshal_data) |
769 | { |
770 | - g_print ("%s ()\n", __func__); |
771 | + //g_print ("%s ()\n", __func__); |
772 | typedef void (*GMarshalFunc_VOID__VALUE) (gpointer data1, |
773 | GValue *arg_1, |
774 | gpointer data2); |
775 | @@ -569,7 +568,7 @@ |
776 | gpointer invocation_hint G_GNUC_UNUSED, |
777 | gpointer marshal_data) |
778 | { |
779 | - g_print ("%s ()\n", __func__); |
780 | + //g_print ("%s ()\n", __func__); |
781 | typedef void (*GMarshalFunc_VOID__INT_VALUE) (gpointer data1, |
782 | gint arg_1, |
783 | GValue *arg_2, |
784 | @@ -603,7 +602,7 @@ |
785 | gpointer invocation_hint G_GNUC_UNUSED, |
786 | gpointer marshal_data) |
787 | { |
788 | - g_print ("%s ()\n", __func__); |
789 | + //g_print ("%s ()\n", __func__); |
790 | typedef void (*GMarshalFunc_VOID__VALUE_STRING) (gpointer data1, |
791 | GValue *arg_1, |
792 | gchar *arg_2, |
793 | |
794 | === modified file 'Dbus/src/interface-applet-methods.c' |
795 | --- Dbus/src/interface-applet-methods.c 2010-08-07 01:43:25 +0000 |
796 | +++ Dbus/src/interface-applet-methods.c 2010-09-16 01:10:06 +0000 |
797 | @@ -1145,7 +1145,7 @@ |
798 | } |
799 | if (! cShortkeys[i]) // raccourci non trouve dans la nouvelle liste => on l'enleve |
800 | { |
801 | - g_print (" shortkey '%s' not wanted anymore\n", key); |
802 | + //g_print (" shortkey '%s' not wanted anymore\n", key); |
803 | cd_keybinder_unbind (key, (CDBindkeyHandler) cd_dbus_applet_emit_on_shortkey); |
804 | pDbusApplet->pShortkeyList = g_list_delete_link (pDbusApplet->pShortkeyList, sk); |
805 | } |
806 | @@ -1165,7 +1165,7 @@ |
807 | } |
808 | if (! sk) // raccourci non encore lie => on lie. |
809 | { |
810 | - g_print (" shortkey '%s' wanted\n", cShortkey); |
811 | + //g_print (" shortkey '%s' wanted\n", cShortkey); |
812 | bCouldBind = cd_keybinder_bind (cShortkey, (CDBindkeyHandler) cd_dbus_applet_emit_on_shortkey, pDbusApplet); |
813 | if (bCouldBind) |
814 | pDbusApplet->pShortkeyList = g_list_prepend (pDbusApplet->pShortkeyList, g_strdup (cShortkey)); |
815 | |
816 | === modified file 'Dbus/src/interface-applet-signals.c' |
817 | --- Dbus/src/interface-applet-signals.c 2010-08-07 01:43:25 +0000 |
818 | +++ Dbus/src/interface-applet-signals.c 2010-09-16 01:10:06 +0000 |
819 | @@ -632,7 +632,7 @@ |
820 | } |
821 | |
822 | const gchar *cText = gtk_entry_get_text (GTK_ENTRY (pEntry)); |
823 | - g_print (" -> %s\n", cText); |
824 | + //g_print (" -> %s\n", cText); |
825 | g_value_set_string (&v, cText); |
826 | _emit_answer_dialog (pDbusApplet, pDialog, iClickedButton, &v); |
827 | } |
828 | |
829 | === removed file 'Doncky/data/messages' |
830 | --- Doncky/data/messages 2010-08-07 01:43:25 +0000 |
831 | +++ Doncky/data/messages 1970-01-01 00:00:00 +0000 |
832 | @@ -1,140 +0,0 @@ |
833 | -_("Icon") |
834 | - |
835 | -_("Set to 0 to use the default applet size") |
836 | - |
837 | -_("Desired icon size for this applet") |
838 | - |
839 | -_("Name of the icon as it will appear in its caption in the dock:") |
840 | - |
841 | -_("Leave empty to use the default one.") |
842 | - |
843 | -_("Image filename:") |
844 | - |
845 | -_("Name of the dock it belongs to:") |
846 | - |
847 | -_("Desklet") |
848 | - |
849 | -_("Position") |
850 | - |
851 | -_("If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.") |
852 | - |
853 | -_("Lock position?") |
854 | - |
855 | -_("Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.") |
856 | - |
857 | -_("Desklet dimensions (width x height):") |
858 | - |
859 | -_("Depending on your WindowManager, you may be able to move this with ALT + left-click.") |
860 | - |
861 | -_("Desklet position (x, y):") |
862 | - |
863 | -_("You can quickly rotate the desklet with the mouse, by dragging the little buttons on its left and top sides.") |
864 | - |
865 | -_("Rotation:") |
866 | - |
867 | -_("Visibility") |
868 | - |
869 | -_("Is detached from the dock") |
870 | - |
871 | -_("for CompizFusion's \"widget layer\", set behaviour in Compiz to: (class=Cairo-dock & type=utility)") |
872 | - |
873 | -_("Visibility:") |
874 | - |
875 | -_("Normal") |
876 | - |
877 | -_("Keep above") |
878 | - |
879 | -_("Keep below") |
880 | - |
881 | -_("Keep on widget layer") |
882 | - |
883 | -_("Reserve space") |
884 | - |
885 | -_("Should be visible on all desktops?") |
886 | - |
887 | -_("Decorations") |
888 | - |
889 | -_("Choose 'Custom decorations' to define your own decorations below.") |
890 | - |
891 | -_("Choose a decoration theme for this desklet:") |
892 | - |
893 | -_("Image to be displayed below drawings, e.g. a frame. Leave empty for no image.") |
894 | - |
895 | -_("Background image:") |
896 | - |
897 | -_("Background transparency:") |
898 | - |
899 | -_("in pixels. Use this to adjust the left position of drawings.") |
900 | - |
901 | -_("Left offset:") |
902 | - |
903 | -_("in pixels. Use this to adjust the top position of drawings.") |
904 | - |
905 | -_("Top offset:") |
906 | - |
907 | -_("in pixels. Use this to adjust the right position of drawings.") |
908 | - |
909 | -_("Right offset:") |
910 | - |
911 | -_("in pixels. Use this to adjust the bottom position of drawings.") |
912 | - |
913 | -_("Bottom offset:") |
914 | - |
915 | -_("Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.") |
916 | - |
917 | -_("Foreground image:") |
918 | - |
919 | -_("Foreground tansparency:") |
920 | - |
921 | -_("Configuration") |
922 | - |
923 | -_("Leave empty to use the default one.") |
924 | - |
925 | -_("Specify the xml file to be used :") |
926 | - |
927 | -_("Appearance") |
928 | - |
929 | -_("Text") |
930 | - |
931 | -_("Font to be used by default if none is specify in the .xml") |
932 | - |
933 | -_("Default Font:") |
934 | - |
935 | -_("Color to be used by default if none is specify in the .xml") |
936 | - |
937 | -_("Default colour:") |
938 | - |
939 | -_("Margin to be used on left, right and top of the desklet") |
940 | - |
941 | -_("Margin all around the desklet:") |
942 | - |
943 | -_("Use this to increase the space between the lines") |
944 | - |
945 | -_("Space between lines:") |
946 | - |
947 | -_("Background") |
948 | - |
949 | -_("You can have more attractive backgrounds using the Desklet decorations") |
950 | - |
951 | -_("Display a simple background?") |
952 | - |
953 | -_("first colour of the gradation") |
954 | - |
955 | -_("Background first colour :") |
956 | - |
957 | -_("second colour of the gradation") |
958 | - |
959 | -_("Background second colour:") |
960 | - |
961 | -_("Set the radius corner to 0 for no radius") |
962 | - |
963 | -_("Background radius corner:") |
964 | - |
965 | -_("Set the thickness to 0 for no border") |
966 | - |
967 | -_("Border thickness:") |
968 | - |
969 | -_("Border colour") |
970 | - |
971 | -_("Border colour :") |
972 | - |
973 | |
974 | === modified file 'Folders/data/Folders.conf.in' |
975 | --- Folders/data/Folders.conf.in 2010-08-07 01:43:25 +0000 |
976 | +++ Folders/data/Folders.conf.in 2010-09-16 01:10:06 +0000 |
977 | @@ -11,6 +11,12 @@ |
978 | #{Let empty to use the name of the folder.} |
979 | name = |
980 | |
981 | +#d Name of the dock it belongs to: |
982 | +dock name = |
983 | + |
984 | +#v |
985 | +sep_icon= |
986 | + |
987 | #Y[Use an image;1;1;Draw sub-dock's content as emblems;0;0;Draw sub-dock's content as stack;0;0;Draw sub-dock's content inside a box;0;0] How to render the icon : |
988 | view type = 3 |
989 | |
990 | @@ -18,9 +24,6 @@ |
991 | #{Leave empty to use the default one.} |
992 | image file = |
993 | |
994 | -#d Name of the dock it belongs to: |
995 | -dock name = |
996 | - |
997 | icon = |
998 | order= |
999 | |
1000 | @@ -29,6 +32,7 @@ |
1001 | #A |
1002 | handbook=Folders |
1003 | |
1004 | + |
1005 | #[gtk-convert] |
1006 | [Desklet] |
1007 | |
1008 | @@ -39,9 +43,9 @@ |
1009 | #{If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.} |
1010 | locked = false |
1011 | |
1012 | -#j+[48;512] Desklet dimensions (width x height): |
1013 | +#j+[96;640] Desklet dimensions (width x height): |
1014 | #{Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.} |
1015 | -size = 256;196 |
1016 | +size = 400;200 |
1017 | |
1018 | #i[-2048;2048] Desklet position (x, y): |
1019 | #{Depending on your WindowManager, you may be able to move this with ALT + left-click.} |
1020 | @@ -64,9 +68,6 @@ |
1021 | #b Should be visible on all desktops? |
1022 | sticky=true |
1023 | |
1024 | - |
1025 | - |
1026 | - |
1027 | #F[Decorations;gtk-orientation-portrait] |
1028 | frame_deco= |
1029 | |
1030 | |
1031 | === removed file 'Folders/data/messages' |
1032 | --- Folders/data/messages 2010-08-07 01:43:25 +0000 |
1033 | +++ Folders/data/messages 1970-01-01 00:00:00 +0000 |
1034 | @@ -1,124 +0,0 @@ |
1035 | -_("Icon") |
1036 | - |
1037 | -_("Set to 0 to use the default applet size") |
1038 | - |
1039 | -_("Desired icon size for this applet") |
1040 | - |
1041 | -_("Let empty to use the name of the folder.") |
1042 | - |
1043 | -_("Name of the icon as it will appear in its caption in the dock:") |
1044 | - |
1045 | -_("How to render the icon :") |
1046 | - |
1047 | -_("Use an image") |
1048 | - |
1049 | -_("Draw sub-dock's content as emblems") |
1050 | - |
1051 | -_("Draw sub-dock's content as stack") |
1052 | - |
1053 | -_("Draw sub-dock's content inside a box") |
1054 | - |
1055 | -_("Leave empty to use the default one.") |
1056 | - |
1057 | -_("Image filename:") |
1058 | - |
1059 | -_("Name of the dock it belongs to:") |
1060 | - |
1061 | -_("Applet's Handbook") |
1062 | - |
1063 | -_("Desklet") |
1064 | - |
1065 | -_("Position") |
1066 | - |
1067 | -_("If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.") |
1068 | - |
1069 | -_("Lock position?") |
1070 | - |
1071 | -_("Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.") |
1072 | - |
1073 | -_("Desklet dimensions (width x height):") |
1074 | - |
1075 | -_("Depending on your WindowManager, you may be able to move this with ALT + left-click.") |
1076 | - |
1077 | -_("Desklet position (x, y):") |
1078 | - |
1079 | -_("You can quickly rotate the desklet with the mouse, by dragging the little buttons on its left and top sides.") |
1080 | - |
1081 | -_("Rotation:") |
1082 | - |
1083 | -_("Visibility") |
1084 | - |
1085 | -_("Is detached from the dock") |
1086 | - |
1087 | -_("for CompizFusion's \"widget layer\", set behaviour in Compiz to: (class=Cairo-dock & type=utility)") |
1088 | - |
1089 | -_("Visibility:") |
1090 | - |
1091 | -_("Normal") |
1092 | - |
1093 | -_("Keep above") |
1094 | - |
1095 | -_("Keep below") |
1096 | - |
1097 | -_("Keep on widget layer") |
1098 | - |
1099 | -_("Reserve space") |
1100 | - |
1101 | -_("Should be visible on all desktops?") |
1102 | - |
1103 | -_("Decorations") |
1104 | - |
1105 | -_("Choose 'Custom decorations' to define your own decorations below.") |
1106 | - |
1107 | -_("Choose a decoration theme for this desklet:") |
1108 | - |
1109 | -_("Image to be displayed below drawings, e.g. a frame. Leave empty for no image.") |
1110 | - |
1111 | -_("Background image:") |
1112 | - |
1113 | -_("Background transparency:") |
1114 | - |
1115 | -_("in pixels. Use this to adjust the left position of drawings.") |
1116 | - |
1117 | -_("Left offset:") |
1118 | - |
1119 | -_("in pixels. Use this to adjust the top position of drawings.") |
1120 | - |
1121 | -_("Top offset:") |
1122 | - |
1123 | -_("in pixels. Use this to adjust the right position of drawings.") |
1124 | - |
1125 | -_("Right offset:") |
1126 | - |
1127 | -_("in pixels. Use this to adjust the bottom position of drawings.") |
1128 | - |
1129 | -_("Bottom offset:") |
1130 | - |
1131 | -_("Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.") |
1132 | - |
1133 | -_("Foreground image:") |
1134 | - |
1135 | -_("Foreground tansparency:") |
1136 | - |
1137 | -_("Configuration") |
1138 | - |
1139 | -_("Folder's path:") |
1140 | - |
1141 | -_("Maximum number of files to list:") |
1142 | - |
1143 | -_("Sort files by :") |
1144 | - |
1145 | -_("Name") |
1146 | - |
1147 | -_("Date") |
1148 | - |
1149 | -_("Size") |
1150 | - |
1151 | -_("Sort folders before files?") |
1152 | - |
1153 | -_("Show hidden files?") |
1154 | - |
1155 | -_("Leave empty to use default sub-dock view.") |
1156 | - |
1157 | -_("Sub-dock view name:") |
1158 | - |
1159 | |
1160 | === modified file 'Folders/src/applet-config.c' |
1161 | --- Folders/src/applet-config.c 2010-08-07 01:43:25 +0000 |
1162 | +++ Folders/src/applet-config.c 2010-09-16 01:10:06 +0000 |
1163 | @@ -30,11 +30,20 @@ |
1164 | myConfig.cDefaultTitle = CD_CONFIG_GET_STRING ("Icon", "name"); |
1165 | myConfig.cImageFile = CD_CONFIG_GET_STRING ("Icon", "image file"); |
1166 | myConfig.cDirPath = CD_CONFIG_GET_STRING ("Configuration", "dir path"); |
1167 | - if (myConfig.cDirPath && *myConfig.cDirPath == '/') |
1168 | + if (myConfig.cDirPath) |
1169 | { |
1170 | - gchar *tmp = myConfig.cDirPath; |
1171 | - myConfig.cDirPath = g_filename_to_uri (myConfig.cDirPath, NULL, NULL); |
1172 | - g_free (tmp); |
1173 | + if (*myConfig.cDirPath == '~') |
1174 | + { |
1175 | + gchar *tmp = myConfig.cDirPath; |
1176 | + myConfig.cDirPath = g_strdup_printf ("%s/%s", g_getenv ("HOME"), myConfig.cDirPath); |
1177 | + g_free (tmp); |
1178 | + } |
1179 | + if (*myConfig.cDirPath == '/') |
1180 | + { |
1181 | + gchar *tmp = myConfig.cDirPath; |
1182 | + myConfig.cDirPath = g_filename_to_uri (myConfig.cDirPath, NULL, NULL); |
1183 | + g_free (tmp); |
1184 | + } |
1185 | } |
1186 | myConfig.cRenderer = CD_CONFIG_GET_STRING ("Configuration", "renderer"); |
1187 | //myConfig.iNbIcons = CD_CONFIG_GET_INTEGER ("Configuration", "nb icons"); |
1188 | |
1189 | === modified file 'Folders/src/applet-notifications.c' |
1190 | --- Folders/src/applet-notifications.c 2010-08-07 01:43:25 +0000 |
1191 | +++ Folders/src/applet-notifications.c 2010-09-16 01:10:06 +0000 |
1192 | @@ -47,14 +47,14 @@ |
1193 | D_("Empty or unreadable folder.")); |
1194 | } |
1195 | else |
1196 | - return CAIRO_DOCK_LET_PASS_NOTIFICATION; // on laisse passer la notification (pour ouvrir le sous-dock au clic). |
1197 | + CD_APPLET_LEAVE (CAIRO_DOCK_LET_PASS_NOTIFICATION); // on laisse passer la notification (pour ouvrir le sous-dock au clic). |
1198 | } |
1199 | else if (CD_APPLET_CLICKED_ICON != NULL) |
1200 | { |
1201 | - g_print ("clic on %s\n", CD_APPLET_CLICKED_ICON->cBaseURI); |
1202 | + //g_print ("clic on %s\n", CD_APPLET_CLICKED_ICON->cBaseURI); |
1203 | if (CD_APPLET_CLICKED_ICON->iVolumeID == -1) |
1204 | { |
1205 | - g_print ("folder\n"); |
1206 | + //g_print ("folder\n"); |
1207 | |
1208 | /// lister le repertoire dans un thread. |
1209 | |
1210 | @@ -257,13 +257,13 @@ |
1211 | gtk_widget_destroy (pFileChooserDialog); |
1212 | } |
1213 | |
1214 | -static void _cd_folders_new_file (GtkMenuItem *pMenuItem, CairoDockModuleInstance *myApplet) |
1215 | +static inline void _create_new_file (CairoDockModuleInstance *myApplet, gboolean bFolder) |
1216 | { |
1217 | gchar *cNewName = cairo_dock_show_demand_and_wait (D_("Enter a file name:"), myIcon, myContainer, NULL); |
1218 | if (cNewName != NULL && *cNewName != '\0') |
1219 | { |
1220 | gchar *cURI = g_strdup_printf ("%s/%s", myConfig.cDirPath, cNewName); |
1221 | - gboolean bSuccess = cairo_dock_fm_create_file (cURI, FALSE); // FALSE <=> file |
1222 | + gboolean bSuccess = cairo_dock_fm_create_file (cURI, bFolder); |
1223 | if (! bSuccess) |
1224 | { |
1225 | cd_warning ("couldn't create this file.\nCheck that you have writing rights, and that the new name does not already exist."); |
1226 | @@ -271,10 +271,18 @@ |
1227 | } |
1228 | } |
1229 | } |
1230 | +static void _cd_folders_new_file (GtkMenuItem *pMenuItem, CairoDockModuleInstance *myApplet) |
1231 | +{ |
1232 | + _create_new_file (myApplet, FALSE); |
1233 | +} |
1234 | +static void _cd_folders_new_folder (GtkMenuItem *pMenuItem, CairoDockModuleInstance *myApplet) |
1235 | +{ |
1236 | + _create_new_file (myApplet, TRUE); |
1237 | +} |
1238 | |
1239 | static void _cd_folders_open_folder (GtkMenuItem *pMenuItem, CairoDockModuleInstance *myApplet) |
1240 | { |
1241 | - |
1242 | + cairo_dock_fm_launch_uri (myConfig.cDirPath); |
1243 | } |
1244 | |
1245 | static void _cd_folders_launch_with (GtkMenuItem *pMenuItem, gpointer *app) |
1246 | @@ -308,21 +316,30 @@ |
1247 | data[1] = CD_APPLET_CLICKED_CONTAINER; |
1248 | data[2] = myApplet; |
1249 | |
1250 | - GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU (); |
1251 | - CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu); |
1252 | - |
1253 | - if (CD_APPLET_CLICKED_ICON != NULL && CD_APPLET_CLICKED_ICON != myIcon) // clic sur un des fichiers |
1254 | - { |
1255 | + if (CD_APPLET_CLICKED_ICON == myIcon || CD_APPLET_CLICKED_ICON == NULL) // click on main icon or on the container. |
1256 | + { |
1257 | + GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU (); |
1258 | + CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Open the folder (middle-click)"), GTK_STOCK_OPEN, _cd_folders_open_folder, CD_APPLET_MY_MENU, myApplet); |
1259 | + CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU); |
1260 | + CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu); |
1261 | + } |
1262 | + else // clic on a file. |
1263 | + { |
1264 | + CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Rename this file"), GTK_STOCK_SAVE_AS, _cd_folders_rename_file, CD_APPLET_MY_MENU, data); |
1265 | + CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Delete this file"), GTK_STOCK_REMOVE, _cd_folders_delete_file, CD_APPLET_MY_MENU, data); |
1266 | + CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Move this file"), GTK_STOCK_JUMP_TO, _cd_folders_move_file, CD_APPLET_MY_MENU, data); |
1267 | + |
1268 | GList *pApps = cairo_dock_fm_list_apps_for_file (CD_APPLET_CLICKED_ICON->cBaseURI); |
1269 | if (pApps != NULL) |
1270 | { |
1271 | + CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU); |
1272 | GtkWidget *pSubMenu = CD_APPLET_ADD_SUB_MENU_WITH_IMAGE (D_("Open with"), CD_APPLET_MY_MENU, GTK_STOCK_OPEN); |
1273 | |
1274 | cd_folders_free_apps_list (myApplet); |
1275 | |
1276 | GList *a; |
1277 | gchar **pAppInfo; |
1278 | - gchar *cIconPath; |
1279 | + gchar *cIconPath; |
1280 | gpointer *app; |
1281 | for (a = pApps; a != NULL; a = a->next) |
1282 | { |
1283 | @@ -333,7 +350,7 @@ |
1284 | app[1] = CD_APPLET_CLICKED_CONTAINER; |
1285 | app[2] = myApplet; |
1286 | app[3] = g_strdup (pAppInfo[1]); |
1287 | - g_print (" + %s (%s ; %s)\n", pAppInfo[0], pAppInfo[1], pAppInfo[2]); |
1288 | + //g_print (" + %s (%s ; %s)\n", pAppInfo[0], pAppInfo[1], pAppInfo[2]); |
1289 | myData.pAppList = g_list_prepend (myData.pAppList, app); |
1290 | |
1291 | if (pAppInfo[2] != NULL) |
1292 | @@ -347,21 +364,14 @@ |
1293 | g_list_free (pApps); |
1294 | } |
1295 | else |
1296 | - g_print ("no apps list for '%s'\n", CD_APPLET_CLICKED_ICON->cBaseURI); |
1297 | - |
1298 | - CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Delete this file"), GTK_STOCK_REMOVE, _cd_folders_delete_file, CD_APPLET_MY_MENU, data); |
1299 | - |
1300 | - CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Rename this file"), GTK_STOCK_EDIT, _cd_folders_rename_file, CD_APPLET_MY_MENU, data); |
1301 | - |
1302 | - CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Move this file"), GTK_STOCK_JUMP_TO, _cd_folders_move_file, CD_APPLET_MY_MENU, data); |
1303 | - |
1304 | + //g_print ("no apps list for '%s'\n", CD_APPLET_CLICKED_ICON->cBaseURI); |
1305 | + |
1306 | + CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU); |
1307 | CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Properties"), GTK_STOCK_PROPERTIES, _cd_folders_show_file_properties, CD_APPLET_MY_MENU, data); |
1308 | |
1309 | + CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU); |
1310 | CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Create a new file"), GTK_STOCK_NEW, _cd_folders_new_file, CD_APPLET_MY_MENU, myApplet); |
1311 | - } |
1312 | - else |
1313 | - { |
1314 | - CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Open the folder (middle-click)"), GTK_STOCK_OPEN, _cd_folders_open_folder, CD_APPLET_MY_MENU, myApplet); |
1315 | + CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Create a new folder"), GTK_STOCK_NEW, _cd_folders_new_folder, CD_APPLET_MY_MENU, myApplet); |
1316 | } |
1317 | |
1318 | if (CD_APPLET_CLICKED_ICON != NULL && CD_APPLET_CLICKED_ICON != myIcon) |
1319 | @@ -371,7 +381,7 @@ |
1320 | |
1321 | gboolean cd_folders_on_drop_data (gpointer data, const gchar *cReceivedData, Icon *icon, double fOrder, CairoContainer *pContainer) |
1322 | { |
1323 | - g_print ("Folders received '%s'\n", cReceivedData); |
1324 | + //g_print ("Folders received '%s'\n", cReceivedData); |
1325 | |
1326 | if (fOrder == CAIRO_DOCK_LAST_ORDER) // lachage sur une icone. |
1327 | return CAIRO_DOCK_LET_PASS_NOTIFICATION; |
1328 | @@ -384,7 +394,7 @@ |
1329 | |
1330 | if (g_file_test (cPath, G_FILE_TEST_IS_DIR)) |
1331 | { |
1332 | - g_print (" ajout d'un repertoire...\n"); |
1333 | + //g_print (" ajout d'un repertoire...\n"); |
1334 | CairoDockModule *pModule = cairo_dock_find_module_from_name ("Folders"); |
1335 | g_return_val_if_fail (pModule != NULL, CAIRO_DOCK_LET_PASS_NOTIFICATION); |
1336 | |
1337 | |
1338 | === removed file 'GMenu/data/messages' |
1339 | --- GMenu/data/messages 2010-08-07 01:43:25 +0000 |
1340 | +++ GMenu/data/messages 1970-01-01 00:00:00 +0000 |
1341 | @@ -1,114 +0,0 @@ |
1342 | -_("Icon") |
1343 | - |
1344 | -_("Set to 0 to use the default applet size") |
1345 | - |
1346 | -_("Desired icon size for this applet") |
1347 | - |
1348 | -_("Name of the icon as it will appear in its caption in the dock:") |
1349 | - |
1350 | -_("Leave empty to use the default one.") |
1351 | - |
1352 | -_("Image filename:") |
1353 | - |
1354 | -_("Name of the dock it belongs to:") |
1355 | - |
1356 | -_("Applet's Handbook") |
1357 | - |
1358 | -_("Desklet") |
1359 | - |
1360 | -_("Position") |
1361 | - |
1362 | -_("If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.") |
1363 | - |
1364 | -_("Lock position?") |
1365 | - |
1366 | -_("Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.") |
1367 | - |
1368 | -_("Desklet dimensions (width x height):") |
1369 | - |
1370 | -_("Depending on your WindowManager, you may be able to move this with ALT + left-click.") |
1371 | - |
1372 | -_("Desklet position (x, y):") |
1373 | - |
1374 | -_("You can quickly rotate the desklet with the mouse, by dragging the little buttons on its left and top sides.") |
1375 | - |
1376 | -_("Rotation:") |
1377 | - |
1378 | -_("Visibility") |
1379 | - |
1380 | -_("Is detached from the dock") |
1381 | - |
1382 | -_("for CompizFusion's \"widget layer\", set behaviour in Compiz to: (class=Cairo-dock & type=utility)") |
1383 | - |
1384 | -_("Visibility:") |
1385 | - |
1386 | -_("Normal") |
1387 | - |
1388 | -_("Keep above") |
1389 | - |
1390 | -_("Keep below") |
1391 | - |
1392 | -_("Keep on widget layer") |
1393 | - |
1394 | -_("Reserve space") |
1395 | - |
1396 | -_("Should be visible on all desktops?") |
1397 | - |
1398 | -_("Decorations") |
1399 | - |
1400 | -_("Choose 'Custom decorations' to define your own decorations below.") |
1401 | - |
1402 | -_("Choose a decoration theme for this desklet:") |
1403 | - |
1404 | -_("Image to be displayed below drawings, e.g. a frame. Leave empty for no image.") |
1405 | - |
1406 | -_("Background image:") |
1407 | - |
1408 | -_("Background transparency:") |
1409 | - |
1410 | -_("in pixels. Use this to adjust the left position of drawings.") |
1411 | - |
1412 | -_("Left offset:") |
1413 | - |
1414 | -_("in pixels. Use this to adjust the top position of drawings.") |
1415 | - |
1416 | -_("Top offset:") |
1417 | - |
1418 | -_("in pixels. Use this to adjust the right position of drawings.") |
1419 | - |
1420 | -_("Right offset:") |
1421 | - |
1422 | -_("in pixels. Use this to adjust the bottom position of drawings.") |
1423 | - |
1424 | -_("Bottom offset:") |
1425 | - |
1426 | -_("Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.") |
1427 | - |
1428 | -_("Foreground image:") |
1429 | - |
1430 | -_("Foreground tansparency:") |
1431 | - |
1432 | -_("Configuration") |
1433 | - |
1434 | -_("Display icons in the menu?") |
1435 | - |
1436 | -_("Shortkey to show/hide the menu:") |
1437 | - |
1438 | -_("Shortkey to show/hide the quick-launch dialog:") |
1439 | - |
1440 | -_("Leave empty to use the default one.") |
1441 | - |
1442 | -_("Command to use for configuring the menu:") |
1443 | - |
1444 | -_("Recent documents") |
1445 | - |
1446 | -_("Show recent documents?") |
1447 | - |
1448 | -_("Leave blank if filter is not needed.") |
1449 | - |
1450 | -_("Only show files that are under this folder or its sub-folder:") |
1451 | - |
1452 | -_("in days. Set 0 if unsued.") |
1453 | - |
1454 | -_("Only show files whose last modification date is less than ;") |
1455 | - |
1456 | |
1457 | === modified file 'GMenu/src/applet-menu.c' |
1458 | --- GMenu/src/applet-menu.c 2010-08-07 01:43:25 +0000 |
1459 | +++ GMenu/src/applet-menu.c 2010-09-16 01:10:06 +0000 |
1460 | @@ -690,8 +690,20 @@ |
1461 | GtkWidget * create_main_menu (CairoDockModuleInstance *myApplet) |
1462 | { |
1463 | GtkWidget *main_menu; |
1464 | - |
1465 | - main_menu = create_applications_menu ("applications.menu", NULL, NULL); |
1466 | + |
1467 | + // workaround pour KDE, qui ne loupe pas une occasion de se distinguer. |
1468 | + const gchar *cMenuFileName = NULL; |
1469 | + if (! g_file_test ("/etc/xdg/menus/applications.menu", G_FILE_TEST_EXISTS)) // on pourrait aussi aller lire le start-here.menu, mais je suis pas sur que ce soit standard. |
1470 | + { |
1471 | + if (g_file_test ("/etc/xdg/menus/kde-applications.menu", G_FILE_TEST_EXISTS)) |
1472 | + cMenuFileName = "kde-applications.menu"; |
1473 | + else if (g_file_test ("/etc/xdg/menus/xfce-applications.menu", G_FILE_TEST_EXISTS)) |
1474 | + cMenuFileName = "xfce-applications.menu"; |
1475 | + } |
1476 | + if (cMenuFileName == NULL) |
1477 | + cMenuFileName = "applications.menu"; |
1478 | + |
1479 | + main_menu = create_applications_menu (cMenuFileName, NULL, NULL); |
1480 | |
1481 | g_object_set_data (G_OBJECT (main_menu), |
1482 | "panel-menu-append-callback", |
1483 | |
1484 | === modified file 'GMenu/src/applet-notifications.c' |
1485 | --- GMenu/src/applet-notifications.c 2010-08-07 01:43:25 +0000 |
1486 | +++ GMenu/src/applet-notifications.c 2010-09-16 01:10:06 +0000 |
1487 | @@ -30,7 +30,7 @@ |
1488 | { |
1489 | if (myData.pMenu != NULL) |
1490 | { |
1491 | - cairo_dock_popup_menu_on_container (myData.pMenu, myContainer); |
1492 | + cairo_dock_popup_menu_on_icon (myData.pMenu, myIcon, myContainer); |
1493 | } |
1494 | } |
1495 | |
1496 | @@ -48,79 +48,8 @@ |
1497 | } |
1498 | |
1499 | //\___________ Define here the action to be taken when the user left-clicks on your icon or on its subdock or your desklet. The icon and the container that were clicked are available through the macros CD_APPLET_CLICKED_ICON and CD_APPLET_CLICKED_CONTAINER. CD_APPLET_CLICKED_ICON may be NULL if the user clicked in the container but out of icons. |
1500 | -static void _on_activate_item (GtkWidget *pMenuItem, gpointer *data); |
1501 | -static void _fill_menu_with_dir (gchar *cDirPath, GtkWidget *pMenu) |
1502 | -{ |
1503 | - GError *erreur = NULL; |
1504 | - GDir *dir = g_dir_open (cDirPath, 0, &erreur); |
1505 | - if (erreur != NULL) |
1506 | - { |
1507 | - return ; |
1508 | - } |
1509 | - |
1510 | - const gchar *cFileName; |
1511 | - gchar *cPath; |
1512 | - gpointer *data; |
1513 | - GtkWidget *pMenuItem; |
1514 | - do |
1515 | - { |
1516 | - cFileName = g_dir_read_name (dir); |
1517 | - if (cFileName == NULL) |
1518 | - break ; |
1519 | - |
1520 | - cPath = g_strdup_printf ("%s/%s", cDirPath, cFileName); |
1521 | - pMenuItem = gtk_menu_item_new_with_label (cFileName); |
1522 | - data = g_new (gpointer, 2); |
1523 | - data[0] = cPath; |
1524 | - |
1525 | - gtk_menu_shell_append (GTK_MENU_SHELL (pMenu), pMenuItem); |
1526 | - g_signal_connect (G_OBJECT (pMenuItem), "activate", G_CALLBACK(_on_activate_item), data); |
1527 | - |
1528 | - if (g_file_test (cPath, G_FILE_TEST_IS_DIR)) |
1529 | - { |
1530 | - GtkWidget *pSubMenu = gtk_menu_new (); |
1531 | - gtk_menu_item_set_submenu (GTK_MENU_ITEM (pMenuItem), pSubMenu); |
1532 | - data[1] = pSubMenu; |
1533 | - } |
1534 | - } |
1535 | - while (1); |
1536 | - g_dir_close (dir); |
1537 | -} |
1538 | -static void _on_activate_item (GtkWidget *pMenuItem, gpointer *data) |
1539 | -{ |
1540 | - gchar *cPath = data[0]; |
1541 | - cd_debug ("%s (%s)\n", __func__, cPath); |
1542 | - |
1543 | - if (g_file_test (cPath, G_FILE_TEST_IS_DIR)) |
1544 | - { |
1545 | - cd_debug ("c'est un repertoire\n"); |
1546 | - GtkWidget *pSubMenu = data[1]; |
1547 | - _fill_menu_with_dir (cPath, pSubMenu); |
1548 | - gtk_widget_show_all (pSubMenu); |
1549 | - } |
1550 | - else |
1551 | - { |
1552 | - cairo_dock_fm_launch_uri (cPath); |
1553 | - } |
1554 | -} |
1555 | CD_APPLET_ON_CLICK_BEGIN |
1556 | cd_menu_show_menu (); |
1557 | - |
1558 | - /*gchar *cDirPath = g_getenv ("HOME"); |
1559 | - GtkWidget *pMenu = gtk_menu_new (); |
1560 | - |
1561 | - _fill_menu_with_dir (cDirPath, pMenu); |
1562 | - |
1563 | - gtk_widget_show_all (pMenu); |
1564 | - |
1565 | - gtk_menu_popup (GTK_MENU (pMenu), |
1566 | - NULL, |
1567 | - NULL, |
1568 | - NULL, |
1569 | - NULL, |
1570 | - 1, |
1571 | - gtk_get_current_event_time ());*/ |
1572 | - |
1573 | CD_APPLET_ON_CLICK_END |
1574 | |
1575 | |
1576 | @@ -143,10 +72,14 @@ |
1577 | } |
1578 | CD_APPLET_ON_BUILD_MENU_BEGIN |
1579 | GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU (); |
1580 | + CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Quick launch (Middle-click)"), GTK_STOCK_EXECUTE, cd_menu_show_hide_quick_launch, CD_APPLET_MY_MENU); |
1581 | + CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU); |
1582 | + CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Configure menu"), GTK_STOCK_PREFERENCES, _cd_menu_configure_menu, CD_APPLET_MY_MENU); |
1583 | + |
1584 | + CD_APPLET_ADD_SEPARATOR_IN_MENU (pSubMenu); |
1585 | + CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Clear recent"), GTK_STOCK_CLEAR, cd_menu_clear_recent, CD_APPLET_MY_MENU); |
1586 | + |
1587 | CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu); |
1588 | - CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Quick launch"), GTK_STOCK_EXECUTE, cd_menu_show_hide_quick_launch, pSubMenu); |
1589 | - CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Configure menu"), GTK_STOCK_PREFERENCES, _cd_menu_configure_menu, pSubMenu); |
1590 | - CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Clear recent"), GTK_STOCK_CLEAR, cd_menu_clear_recent, pSubMenu); |
1591 | CD_APPLET_ON_BUILD_MENU_END |
1592 | |
1593 | |
1594 | |
1595 | === modified file 'GMenu/src/applet-util.c' |
1596 | --- GMenu/src/applet-util.c 2010-08-07 01:43:25 +0000 |
1597 | +++ GMenu/src/applet-util.c 2010-09-16 01:10:06 +0000 |
1598 | @@ -188,7 +188,7 @@ |
1599 | else |
1600 | cCommandExpanded = g_strdup (cCommand); |
1601 | #endif //CD_EXPAND_FIELD_CODES |
1602 | - g_print ("cCommandExpanded : %s\n", cCommandExpanded); |
1603 | + //g_print ("cCommandExpanded : %s\n", cCommandExpanded); |
1604 | return cCommandExpanded; |
1605 | } |
1606 | static void _launch_from_file (const gchar *cDesktopFilePath) |
1607 | |
1608 | === modified file 'Indicator-applet/indicator-applet.c' |
1609 | --- Indicator-applet/indicator-applet.c 2010-08-07 01:43:25 +0000 |
1610 | +++ Indicator-applet/indicator-applet.c 2010-09-16 01:10:06 +0000 |
1611 | @@ -164,7 +164,7 @@ |
1612 | _cd_indicator_make_menu (pIndicator); |
1613 | if (pIndicator->pMenu != NULL) |
1614 | { |
1615 | - cairo_dock_popup_menu_on_container (GTK_WIDGET (pIndicator->pMenu), myContainer); |
1616 | + cairo_dock_popup_menu_on_icon (GTK_WIDGET (pIndicator->pMenu), myIcon, myContainer); |
1617 | return TRUE; |
1618 | } |
1619 | return FALSE; |
1620 | |
1621 | === removed file 'MeMenu/data/messages' |
1622 | --- MeMenu/data/messages 2010-08-07 01:43:25 +0000 |
1623 | +++ MeMenu/data/messages 1970-01-01 00:00:00 +0000 |
1624 | @@ -1,86 +0,0 @@ |
1625 | -_("Icon") |
1626 | - |
1627 | -_("Set to 0 to use the default applet size") |
1628 | - |
1629 | -_("Desired icon size for this applet") |
1630 | - |
1631 | -_("Name of the dock it belongs to:") |
1632 | - |
1633 | -_("Applet's Handbook") |
1634 | - |
1635 | -_("Desklet") |
1636 | - |
1637 | -_("Position") |
1638 | - |
1639 | -_("If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.") |
1640 | - |
1641 | -_("Lock position?") |
1642 | - |
1643 | -_("Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.") |
1644 | - |
1645 | -_("Desklet dimensions (width x height):") |
1646 | - |
1647 | -_("Depending on your WindowManager, you may be able to move this with ALT + left-click.") |
1648 | - |
1649 | -_("Desklet position (x, y):") |
1650 | - |
1651 | -_("You can quickly rotate the desklet with the mouse, by dragging the little buttons on its left and top sides.") |
1652 | - |
1653 | -_("Rotation:") |
1654 | - |
1655 | -_("Visibility") |
1656 | - |
1657 | -_("Is detached from the dock") |
1658 | - |
1659 | -_("for CompizFusion's \"widget layer\", set behaviour in Compiz to: (class=Cairo-dock & type=utility)") |
1660 | - |
1661 | -_("Visibility:") |
1662 | - |
1663 | -_("Normal") |
1664 | - |
1665 | -_("Keep above") |
1666 | - |
1667 | -_("Keep below") |
1668 | - |
1669 | -_("Keep on widget layer") |
1670 | - |
1671 | -_("Reserve space") |
1672 | - |
1673 | -_("Should be visible on all desktops?") |
1674 | - |
1675 | -_("Decorations") |
1676 | - |
1677 | -_("Choose 'Custom decorations' to define your own decorations below.") |
1678 | - |
1679 | -_("Choose a decoration theme for this desklet:") |
1680 | - |
1681 | -_("Image to be displayed below drawings, e.g. a frame. Leave empty for no image.") |
1682 | - |
1683 | -_("Background image:") |
1684 | - |
1685 | -_("Background transparency:") |
1686 | - |
1687 | -_("in pixels. Use this to adjust the left position of drawings.") |
1688 | - |
1689 | -_("Left offset:") |
1690 | - |
1691 | -_("in pixels. Use this to adjust the top position of drawings.") |
1692 | - |
1693 | -_("Top offset:") |
1694 | - |
1695 | -_("in pixels. Use this to adjust the right position of drawings.") |
1696 | - |
1697 | -_("Right offset:") |
1698 | - |
1699 | -_("in pixels. Use this to adjust the bottom position of drawings.") |
1700 | - |
1701 | -_("Bottom offset:") |
1702 | - |
1703 | -_("Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.") |
1704 | - |
1705 | -_("Foreground image:") |
1706 | - |
1707 | -_("Foreground tansparency:") |
1708 | - |
1709 | -_("Configuration") |
1710 | - |
1711 | |
1712 | === modified file 'MeMenu/src/applet-me.c' |
1713 | --- MeMenu/src/applet-me.c 2010-08-07 01:43:25 +0000 |
1714 | +++ MeMenu/src/applet-me.c 2010-09-16 01:10:06 +0000 |
1715 | @@ -46,14 +46,14 @@ |
1716 | static void |
1717 | username_cb (DBusGProxy * proxy, const char * username, GError *error, CairoDockModuleInstance *myApplet) |
1718 | { |
1719 | - g_print (" + new username: '%s'\n", username); |
1720 | + //g_print (" + new username: '%s'\n", username); |
1721 | CD_APPLET_SET_NAME_FOR_MY_ICON (username); // username peut etre NULL ou vide, c'est pas genant. |
1722 | } |
1723 | |
1724 | static void |
1725 | username_changed (DBusGProxy * proxy, gchar * username, CairoDockModuleInstance *myApplet) |
1726 | { |
1727 | - g_print ("Changing username: '%s'\n", username); |
1728 | + //g_print ("Changing username: '%s'\n", username); |
1729 | |
1730 | return username_cb(proxy, username, NULL, myApplet); |
1731 | } |
1732 | @@ -63,7 +63,7 @@ |
1733 | { |
1734 | g_return_if_fail(icons != NULL); |
1735 | g_return_if_fail(icons[0] != '\0'); |
1736 | - g_print (" + new icon: '%s'\n", icons); |
1737 | + //g_print (" + new icon: '%s'\n", icons); |
1738 | |
1739 | cd_indicator_set_icon (myData.pIndicator, icons); |
1740 | CD_APPLET_REDRAW_MY_ICON; |
1741 | @@ -74,7 +74,7 @@ |
1742 | static void |
1743 | status_icon_changed (DBusGProxy * proxy, gchar * icon, CairoDockModuleInstance *myApplet) |
1744 | { |
1745 | - g_print ("Changing status icon: '%s'\n", icon); |
1746 | + //g_print ("Changing status icon: '%s'\n", icon); |
1747 | |
1748 | return status_icon_cb(proxy, icon, NULL, myApplet); |
1749 | } |
1750 | |
1751 | === modified file 'MeMenu/src/applet-menu.c' |
1752 | --- MeMenu/src/applet-menu.c 2010-08-07 01:43:25 +0000 |
1753 | +++ MeMenu/src/applet-menu.c 2010-09-16 01:10:06 +0000 |
1754 | @@ -56,7 +56,7 @@ |
1755 | g_value_init (&value, G_TYPE_STRING); |
1756 | g_value_set_static_string (&value, gtk_entry_get_text (entry)); |
1757 | |
1758 | - g_print ("user typed: %s\n", g_value_get_string (&value)); |
1759 | + //g_print ("user typed: %s\n", g_value_get_string (&value)); |
1760 | dbusmenu_menuitem_handle_event (mi, "send", &value, gtk_get_current_event_time()); |
1761 | } |
1762 | |
1763 | |
1764 | === removed file 'Messaging-Menu/data/messages' |
1765 | --- Messaging-Menu/data/messages 2010-08-07 01:43:25 +0000 |
1766 | +++ Messaging-Menu/data/messages 1970-01-01 00:00:00 +0000 |
1767 | @@ -1,90 +0,0 @@ |
1768 | -_("Icon") |
1769 | - |
1770 | -_("Set to 0 to use the default applet size") |
1771 | - |
1772 | -_("Desired icon size for this applet") |
1773 | - |
1774 | -_("Name of the icon as it will appear in its caption in the dock:") |
1775 | - |
1776 | -_("Name of the dock it belongs to:") |
1777 | - |
1778 | -_("Applet's Handbook") |
1779 | - |
1780 | -_("Desklet") |
1781 | - |
1782 | -_("Position") |
1783 | - |
1784 | -_("If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.") |
1785 | - |
1786 | -_("Lock position?") |
1787 | - |
1788 | -_("Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.") |
1789 | - |
1790 | -_("Desklet dimensions (width x height):") |
1791 | - |
1792 | -_("Depending on your WindowManager, you may be able to move this with ALT + left-click.") |
1793 | - |
1794 | -_("Desklet position (x, y):") |
1795 | - |
1796 | -_("You can quickly rotate the desklet with the mouse, by dragging the little buttons on its left and top sides.") |
1797 | - |
1798 | -_("Rotation:") |
1799 | - |
1800 | -_("Visibility") |
1801 | - |
1802 | -_("Is detached from the dock") |
1803 | - |
1804 | -_("for CompizFusion's \"widget layer\", set behaviour in Compiz to: (class=Cairo-dock & type=utility)") |
1805 | - |
1806 | -_("Visibility:") |
1807 | - |
1808 | -_("Normal") |
1809 | - |
1810 | -_("Keep above") |
1811 | - |
1812 | -_("Keep below") |
1813 | - |
1814 | -_("Keep on widget layer") |
1815 | - |
1816 | -_("Reserve space") |
1817 | - |
1818 | -_("Should be visible on all desktops?") |
1819 | - |
1820 | -_("Decorations") |
1821 | - |
1822 | -_("Choose 'Custom decorations' to define your own decorations below.") |
1823 | - |
1824 | -_("Choose a decoration theme for this desklet:") |
1825 | - |
1826 | -_("Image to be displayed below drawings, e.g. a frame. Leave empty for no image.") |
1827 | - |
1828 | -_("Background image:") |
1829 | - |
1830 | -_("Background transparency:") |
1831 | - |
1832 | -_("in pixels. Use this to adjust the left position of drawings.") |
1833 | - |
1834 | -_("Left offset:") |
1835 | - |
1836 | -_("in pixels. Use this to adjust the top position of drawings.") |
1837 | - |
1838 | -_("Top offset:") |
1839 | - |
1840 | -_("in pixels. Use this to adjust the right position of drawings.") |
1841 | - |
1842 | -_("Right offset:") |
1843 | - |
1844 | -_("in pixels. Use this to adjust the bottom position of drawings.") |
1845 | - |
1846 | -_("Bottom offset:") |
1847 | - |
1848 | -_("Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.") |
1849 | - |
1850 | -_("Foreground image:") |
1851 | - |
1852 | -_("Foreground tansparency:") |
1853 | - |
1854 | -_("Configuration") |
1855 | - |
1856 | -_("Animation of the icon when one of the application demands your attention :") |
1857 | - |
1858 | |
1859 | === modified file 'Messaging-Menu/src/applet-menu.c' |
1860 | --- Messaging-Menu/src/applet-menu.c 2010-08-07 01:43:25 +0000 |
1861 | +++ Messaging-Menu/src/applet-menu.c 2010-09-16 01:10:06 +0000 |
1862 | @@ -67,7 +67,7 @@ |
1863 | static gboolean |
1864 | new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) |
1865 | { |
1866 | - g_print ("%s ()\n", __func__); |
1867 | + //g_print ("%s ()\n", __func__); |
1868 | GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new()); |
1869 | |
1870 | gint padding = 4; |
1871 | @@ -86,7 +86,7 @@ |
1872 | gtk_widget_show(icon); |
1873 | |
1874 | /* Application name in a label */ |
1875 | - g_print (" name : %s\n", dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME)); |
1876 | + //g_print (" name : %s\n", dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME)); |
1877 | GtkWidget * label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME)); |
1878 | gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); |
1879 | gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, padding); |
1880 | @@ -131,7 +131,7 @@ |
1881 | static void |
1882 | indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, indicator_item_t * mi_data) |
1883 | { |
1884 | - g_print ("%s (%s)\n", __func__, prop); |
1885 | + //g_print ("%s (%s)\n", __func__, prop); |
1886 | if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_LABEL)) { |
1887 | /* Set the main label */ |
1888 | gtk_label_set_text(GTK_LABEL(mi_data->label), g_value_get_string(value)); |
1889 | @@ -180,7 +180,7 @@ |
1890 | static gboolean |
1891 | new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) |
1892 | { |
1893 | - g_print ("%s ()\n", __func__); |
1894 | + //g_print ("%s ()\n", __func__); |
1895 | g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE); |
1896 | g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE); |
1897 | /* Note: not checking parent, it's reasonable for it to be NULL */ |
1898 | |
1899 | === modified file 'Messaging-Menu/src/applet-messaging.c' |
1900 | --- Messaging-Menu/src/applet-messaging.c 2010-08-07 01:43:25 +0000 |
1901 | +++ Messaging-Menu/src/applet-messaging.c 2010-09-16 01:10:06 +0000 |
1902 | @@ -38,7 +38,7 @@ |
1903 | static void |
1904 | attention_changed_cb (DBusGProxy * proxy, gboolean dot, CairoDockModuleInstance *myApplet) |
1905 | { |
1906 | - g_print ("%s (attention : %d)\n", __func__, dot); |
1907 | + //g_print ("%s (attention : %d)\n", __func__, dot); |
1908 | if (dot) |
1909 | { |
1910 | cd_indicator_set_icon (myData.pIndicator, "indicator-messages-new"); |
1911 | @@ -58,7 +58,7 @@ |
1912 | static void |
1913 | icon_changed_cb (DBusGProxy * proxy, gboolean hidden, CairoDockModuleInstance *myApplet) |
1914 | { |
1915 | - g_print ("%s (hidden : %d)\n", __func__, hidden); |
1916 | + //g_print ("%s (hidden : %d)\n", __func__, hidden); |
1917 | if (hidden) |
1918 | { |
1919 | myIcon->fAlpha = .5; |
1920 | @@ -116,7 +116,7 @@ |
1921 | |
1922 | void cd_messaging_on_disconnect (CairoDockModuleInstance *myApplet) |
1923 | { |
1924 | - g_print ("disconnected\n"); |
1925 | + //g_print ("disconnected\n"); |
1926 | cd_indicator_set_icon (myData.pIndicator, DEFAULT_ICON); // If we're disconnecting, go back to offline. |
1927 | } |
1928 | |
1929 | |
1930 | === modified file 'Network-Monitor/data/Network-Monitor.conf.in' |
1931 | --- Network-Monitor/data/Network-Monitor.conf.in 2010-08-07 01:43:25 +0000 |
1932 | +++ Network-Monitor/data/Network-Monitor.conf.in 2010-09-16 01:10:06 +0000 |
1933 | @@ -140,7 +140,7 @@ |
1934 | #X[Gauge;gtk-dialog-info] |
1935 | frame_gauge= |
1936 | |
1937 | -#h+[@gaugesdir@;gauges;gauges] Choose one of the available themes:/ |
1938 | +#h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/ |
1939 | theme = turbo-night-fuel |
1940 | |
1941 | #X[Graph;gtk-dialog-info] |
1942 | @@ -179,7 +179,7 @@ |
1943 | #X[Gauge;gtk-dialog-info] |
1944 | frame_gauge= |
1945 | |
1946 | -#h+[@gaugesdir@;gauges;gauges] Choose one of the available themes:/ |
1947 | +#h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/ |
1948 | theme = turbo-night-fuel |
1949 | |
1950 | |
1951 | |
1952 | === removed file 'Network-Monitor/data/messages' |
1953 | --- Network-Monitor/data/messages 2010-08-07 01:43:25 +0000 |
1954 | +++ Network-Monitor/data/messages 1970-01-01 00:00:00 +0000 |
1955 | @@ -1,258 +0,0 @@ |
1956 | -_("Icon") |
1957 | - |
1958 | -_("Set to 0 to use the default applet size") |
1959 | - |
1960 | -_("Desired icon size for this applet") |
1961 | - |
1962 | -_("Leave empty to use the connection name.") |
1963 | - |
1964 | -_("Name of the icon as it will appear in its caption in the dock:") |
1965 | - |
1966 | -_("Name of the dock it belongs to:") |
1967 | - |
1968 | -_("Always display the icon, even when the dock is hidden?") |
1969 | - |
1970 | -_("Applet's Handbook") |
1971 | - |
1972 | -_("Desklet") |
1973 | - |
1974 | -_("Position") |
1975 | - |
1976 | -_("If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.") |
1977 | - |
1978 | -_("Lock position?") |
1979 | - |
1980 | -_("Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.") |
1981 | - |
1982 | -_("Desklet dimensions (width x height):") |
1983 | - |
1984 | -_("Depending on your WindowManager, you may be able to move this with ALT + left-click.") |
1985 | - |
1986 | -_("Desklet position (x, y):") |
1987 | - |
1988 | -_("You can quickly rotate the desklet with the mouse, by dragging the little buttons on its left and top sides.") |
1989 | - |
1990 | -_("Rotation:") |
1991 | - |
1992 | -_("Visibility") |
1993 | - |
1994 | -_("Is detached from the dock") |
1995 | - |
1996 | -_("for CompizFusion's \"widget layer\", set behaviour in Compiz to: (class=Cairo-dock & type=utility)") |
1997 | - |
1998 | -_("Visibility:") |
1999 | - |
2000 | -_("Normal") |
2001 | - |
2002 | -_("Keep above") |
2003 | - |
2004 | -_("Keep below") |
2005 | - |
2006 | -_("Keep on widget layer") |
2007 | - |
2008 | -_("Reserve space") |
2009 | - |
2010 | -_("Should be visible on all desktops?") |
2011 | - |
2012 | -_("Decorations") |
2013 | - |
2014 | -_("Choose 'Custom decorations' to define your own decorations below.") |
2015 | - |
2016 | -_("Choose a decoration theme for this desklet:") |
2017 | - |
2018 | -_("Image to be displayed below drawings, e.g. a frame. Leave empty for no image.") |
2019 | - |
2020 | -_("Background image:") |
2021 | - |
2022 | -_("Background transparency:") |
2023 | - |
2024 | -_("in pixels. Use this to adjust the left position of drawings.") |
2025 | - |
2026 | -_("Left offset:") |
2027 | - |
2028 | -_("in pixels. Use this to adjust the top position of drawings.") |
2029 | - |
2030 | -_("Top offset:") |
2031 | - |
2032 | -_("in pixels. Use this to adjust the right position of drawings.") |
2033 | - |
2034 | -_("Right offset:") |
2035 | - |
2036 | -_("in pixels. Use this to adjust the bottom position of drawings.") |
2037 | - |
2038 | -_("Bottom offset:") |
2039 | - |
2040 | -_("Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.") |
2041 | - |
2042 | -_("Foreground image:") |
2043 | - |
2044 | -_("Foreground tansparency:") |
2045 | - |
2046 | -_("Configuration") |
2047 | - |
2048 | -_("Parameters") |
2049 | - |
2050 | -_("You can quickly switch to the other mode by scrolling on the icon.") |
2051 | - |
2052 | -_("Info displayed by the icon:") |
2053 | - |
2054 | -_("Wifi signal") |
2055 | - |
2056 | -_("Connexion speed") |
2057 | - |
2058 | -_("By default the first active interface is used.") |
2059 | - |
2060 | -_("Connection interface to monitor:") |
2061 | - |
2062 | -_("Display numeric values:") |
2063 | - |
2064 | -_("No") |
2065 | - |
2066 | -_("On icon") |
2067 | - |
2068 | -_("On label") |
2069 | - |
2070 | -_("You need OpenGL for this option. Set it to 0 means not used, 1 means the movement is continue.") |
2071 | - |
2072 | -_("Fluidity of the transition animation between 2 values:") |
2073 | - |
2074 | -_("Animation of the icon when connecting:") |
2075 | - |
2076 | -_("Allow you to overwrite applet's default command line and launch your preferred wireless configuration interface.") |
2077 | - |
2078 | -_("User command to show Wireless Configuration:") |
2079 | - |
2080 | -_("Leave empty to use the default.") |
2081 | - |
2082 | -_("User command to display a system monitor:") |
2083 | - |
2084 | -_("Net Speed") |
2085 | - |
2086 | -_("Choose the style of the display: ") |
2087 | - |
2088 | -_("Gauge") |
2089 | - |
2090 | -_("Graph") |
2091 | - |
2092 | -_("Gauge") |
2093 | - |
2094 | -_("Choose one of the available themes:") |
2095 | - |
2096 | -_("Graph") |
2097 | - |
2098 | -_("Type of graphic :") |
2099 | - |
2100 | -_("Line") |
2101 | - |
2102 | -_("Plain") |
2103 | - |
2104 | -_("Bar") |
2105 | - |
2106 | -_("Circle") |
2107 | - |
2108 | -_("Plain Circle") |
2109 | - |
2110 | -_("It's the colour of the graphic for high quality signal.") |
2111 | - |
2112 | -_("High value's colour :") |
2113 | - |
2114 | -_("It's the colour of the graphic for low quality signal.") |
2115 | - |
2116 | -_("Low value's colour :") |
2117 | - |
2118 | -_("Background colour of the graphic :") |
2119 | - |
2120 | -_("Parameters") |
2121 | - |
2122 | -_("in seconds.") |
2123 | - |
2124 | -_("Delays between net speed checks:") |
2125 | - |
2126 | -_("Wifi") |
2127 | - |
2128 | -_("Choose the style of the display:") |
2129 | - |
2130 | -_("Gauge") |
2131 | - |
2132 | -_("Graph") |
2133 | - |
2134 | -_("Icons") |
2135 | - |
2136 | -_("Gauge") |
2137 | - |
2138 | -_("Choose one of the available themes:") |
2139 | - |
2140 | -_("Graph") |
2141 | - |
2142 | -_("Type of graphic :") |
2143 | - |
2144 | -_("Line") |
2145 | - |
2146 | -_("Plain") |
2147 | - |
2148 | -_("Bar") |
2149 | - |
2150 | -_("Circle") |
2151 | - |
2152 | -_("Plain Circle") |
2153 | - |
2154 | -_("It's the colour of the graphic for high quality signal.") |
2155 | - |
2156 | -_("High value's colour :") |
2157 | - |
2158 | -_("It's the colour of the graphic for low quality signal.") |
2159 | - |
2160 | -_("Low value's colour :") |
2161 | - |
2162 | -_("Background colour of the graphic :") |
2163 | - |
2164 | -_("Icons") |
2165 | - |
2166 | -_("Effect to apply on the icon according to strength :") |
2167 | - |
2168 | -_("None") |
2169 | - |
2170 | -_("Zoom") |
2171 | - |
2172 | -_("Transparency") |
2173 | - |
2174 | -_("Draw Bar") |
2175 | - |
2176 | -_("Leave empty to use the default icon.") |
2177 | - |
2178 | -_("Name of the image for the 'No signal' icon :") |
2179 | - |
2180 | -_("Leave empty to use the default icon.") |
2181 | - |
2182 | -_("Name of the image for the 'Very low' icon :") |
2183 | - |
2184 | -_("Leave empty to use the default icon.") |
2185 | - |
2186 | -_("Name of the image for the 'Low' icon :") |
2187 | - |
2188 | -_("Leave empty to use the default icon.") |
2189 | - |
2190 | -_("Name of the image for the 'Middle' icon :") |
2191 | - |
2192 | -_("Leave empty to use the default icon.") |
2193 | - |
2194 | -_("Name of an image for the 'Good' icon :") |
2195 | - |
2196 | -_("Leave empty to use the default icon.") |
2197 | - |
2198 | -_("Name of the image for the 'Excellent' icon :") |
2199 | - |
2200 | -_("Leave empty to use the default icon.") |
2201 | - |
2202 | -_("Name of the image for the 'Not connected' icon :") |
2203 | - |
2204 | -_("Leave empty to use the default icon.") |
2205 | - |
2206 | -_("Name of the image for the 'Wired connection' icon :") |
2207 | - |
2208 | -_("Parameters") |
2209 | - |
2210 | -_("in seconds. if you don't have Network-Manager.") |
2211 | - |
2212 | -_("Delays between wifi signal checks:") |
2213 | - |
2214 | |
2215 | === removed file 'RSSreader/data/messages' |
2216 | --- RSSreader/data/messages 2010-08-07 01:43:25 +0000 |
2217 | +++ RSSreader/data/messages 1970-01-01 00:00:00 +0000 |
2218 | @@ -1,204 +0,0 @@ |
2219 | -_("Icon") |
2220 | - |
2221 | -_("Set to 0 to use the default applet size") |
2222 | - |
2223 | -_("Desired icon size for this applet") |
2224 | - |
2225 | -_("Leave empty to use the title of the RSS feed.") |
2226 | - |
2227 | -_("Name of the icon as it will appear in its caption in the dock:") |
2228 | - |
2229 | -_("Leave empty to use the default one.") |
2230 | - |
2231 | -_("Image filename:") |
2232 | - |
2233 | -_("Name of the dock it belongs to:") |
2234 | - |
2235 | -_("Applet's Handbook") |
2236 | - |
2237 | -_("Desklet") |
2238 | - |
2239 | -_("Position") |
2240 | - |
2241 | -_("If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.") |
2242 | - |
2243 | -_("Lock position?") |
2244 | - |
2245 | -_("Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.") |
2246 | - |
2247 | -_("Desklet dimensions (width x height):") |
2248 | - |
2249 | -_("Depending on your WindowManager, you may be able to move this with ALT + left-click.") |
2250 | - |
2251 | -_("Desklet position (x, y):") |
2252 | - |
2253 | -_("You can quickly rotate the desklet with the mouse, by dragging the little buttons on its left and top sides.") |
2254 | - |
2255 | -_("Rotation:") |
2256 | - |
2257 | -_("Visibility") |
2258 | - |
2259 | -_("Is detached from the dock") |
2260 | - |
2261 | -_("for CompizFusion's \"widget layer\", set behaviour in Compiz to: (class=Cairo-dock & type=utility)") |
2262 | - |
2263 | -_("Visibility:") |
2264 | - |
2265 | -_("Normal") |
2266 | - |
2267 | -_("Keep above") |
2268 | - |
2269 | -_("Keep below") |
2270 | - |
2271 | -_("Keep on widget layer") |
2272 | - |
2273 | -_("Reserve space") |
2274 | - |
2275 | -_("Should be visible on all desktops?") |
2276 | - |
2277 | -_("Decorations") |
2278 | - |
2279 | -_("Choose 'Custom decorations' to define your own decorations below.") |
2280 | - |
2281 | -_("Choose a decoration theme for this desklet:") |
2282 | - |
2283 | -_("Image to be displayed below drawings, e.g. a frame. Leave empty for no image.") |
2284 | - |
2285 | -_("Background image:") |
2286 | - |
2287 | -_("Background transparency:") |
2288 | - |
2289 | -_("in pixels. Use this to adjust the left position of drawings.") |
2290 | - |
2291 | -_("Left offset:") |
2292 | - |
2293 | -_("in pixels. Use this to adjust the top position of drawings.") |
2294 | - |
2295 | -_("Top offset:") |
2296 | - |
2297 | -_("in pixels. Use this to adjust the right position of drawings.") |
2298 | - |
2299 | -_("Right offset:") |
2300 | - |
2301 | -_("in pixels. Use this to adjust the bottom position of drawings.") |
2302 | - |
2303 | -_("Bottom offset:") |
2304 | - |
2305 | -_("Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.") |
2306 | - |
2307 | -_("Foreground image:") |
2308 | - |
2309 | -_("Foreground tansparency:") |
2310 | - |
2311 | -_("Configuration") |
2312 | - |
2313 | -_("RSS Feed") |
2314 | - |
2315 | -_("Enter a valid atom/rss feed") |
2316 | - |
2317 | -_("URL:") |
2318 | - |
2319 | -_("RSS login (optional):") |
2320 | - |
2321 | -_("RSS password (optional):") |
2322 | - |
2323 | -_("Behaviour") |
2324 | - |
2325 | -_("In minutes.") |
2326 | - |
2327 | -_("Refresh time:") |
2328 | - |
2329 | -_("Notify about feed updates:") |
2330 | - |
2331 | -_("No") |
2332 | - |
2333 | -_("Icon animation") |
2334 | - |
2335 | -_("Dialog bubble") |
2336 | - |
2337 | -_("Icon animation + Dialog bubble") |
2338 | - |
2339 | -_("Let empty to use the default notification animation.") |
2340 | - |
2341 | -_("Animation of the icon:") |
2342 | - |
2343 | -_("In seconds. Set to 0 for infinite time (need to click on dialog to close it).") |
2344 | - |
2345 | -_("Duration of the notification:") |
2346 | - |
2347 | -_("Leave empty to use the default one.") |
2348 | - |
2349 | -_("Open the feed with the following program:") |
2350 | - |
2351 | -_("Appearance") |
2352 | - |
2353 | -_("Title") |
2354 | - |
2355 | -_("Font to be used for the title") |
2356 | - |
2357 | -_("Title font:") |
2358 | - |
2359 | -_("Colour to be used for the title") |
2360 | - |
2361 | -_("Title colour:") |
2362 | - |
2363 | -_("Alignment of the title:") |
2364 | - |
2365 | -_("left") |
2366 | - |
2367 | -_("right") |
2368 | - |
2369 | -_("Text") |
2370 | - |
2371 | -_("Font to be used for the feed lines") |
2372 | - |
2373 | -_("Feed lines font:") |
2374 | - |
2375 | -_("Colour to be used for the feed lines") |
2376 | - |
2377 | -_("Feed lines colour:") |
2378 | - |
2379 | -_("Left margin for the feed lines:") |
2380 | - |
2381 | -_("Space between 2 feed lines:") |
2382 | - |
2383 | -_("Logo") |
2384 | - |
2385 | -_("The default logo is the applet's icon") |
2386 | - |
2387 | -_("Display the logo?") |
2388 | - |
2389 | -_("Adjust to increase/decrease the logo's size") |
2390 | - |
2391 | -_("Logo size:") |
2392 | - |
2393 | -_("normal") |
2394 | - |
2395 | -_("big") |
2396 | - |
2397 | -_("Background") |
2398 | - |
2399 | -_("You can have more attractive backgrounds using the Desklet decorations") |
2400 | - |
2401 | -_("Display a simple background?") |
2402 | - |
2403 | -_("first colour of the gradation") |
2404 | - |
2405 | -_("Background first colour :") |
2406 | - |
2407 | -_("second colour of the gradation") |
2408 | - |
2409 | -_("Background second colour:") |
2410 | - |
2411 | -_("Set the radius corner to 0 for no radius") |
2412 | - |
2413 | -_("Background radius corner:") |
2414 | - |
2415 | -_("Set the thickness to 0 for no border") |
2416 | - |
2417 | -_("Border thickness:") |
2418 | - |
2419 | -_("Border colour") |
2420 | - |
2421 | -_("Border colour :") |
2422 | - |
2423 | |
2424 | === modified file 'RSSreader/src/applet-notifications.c' |
2425 | --- RSSreader/src/applet-notifications.c 2010-08-07 01:43:25 +0000 |
2426 | +++ RSSreader/src/applet-notifications.c 2010-09-16 01:10:06 +0000 |
2427 | @@ -137,13 +137,13 @@ |
2428 | } |
2429 | CD_APPLET_ON_SCROLL_BEGIN |
2430 | if (! myDesklet) |
2431 | - return CAIRO_DOCK_LET_PASS_NOTIFICATION; |
2432 | + CD_APPLET_LEAVE (CAIRO_DOCK_LET_PASS_NOTIFICATION); |
2433 | |
2434 | myData.iFirstDisplayedItem += (CD_APPLET_SCROLL_UP ? -1 : 1); |
2435 | if (myData.iFirstDisplayedItem < 0) // on a scrolle trop haut. |
2436 | { |
2437 | myData.iFirstDisplayedItem = 0; |
2438 | - return CAIRO_DOCK_LET_PASS_NOTIFICATION; |
2439 | + CD_APPLET_LEAVE (CAIRO_DOCK_LET_PASS_NOTIFICATION); |
2440 | } |
2441 | else |
2442 | { |
2443 | @@ -151,7 +151,7 @@ |
2444 | if (myData.iFirstDisplayedItem > n - 1) // on a scrolle trop bas. |
2445 | { |
2446 | myData.iFirstDisplayedItem = n - 1; |
2447 | - return CAIRO_DOCK_LET_PASS_NOTIFICATION; |
2448 | + CD_APPLET_LEAVE (CAIRO_DOCK_LET_PASS_NOTIFICATION); |
2449 | } |
2450 | } |
2451 | if (myData.iSidRedrawIdle == 0) // on planifie un redessin pour quand la boucle principale sera accessible, de facon a éviter de la surcharger en cas de scroll rapide. |
2452 | |
2453 | === added directory 'Remote-Control' |
2454 | === added file 'Remote-Control/CMakeLists.txt' |
2455 | --- Remote-Control/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
2456 | +++ Remote-Control/CMakeLists.txt 2010-09-16 01:10:06 +0000 |
2457 | @@ -0,0 +1,2 @@ |
2458 | +add_subdirectory(src) |
2459 | +add_subdirectory(data) |
2460 | |
2461 | === added directory 'Remote-Control/data' |
2462 | === added file 'Remote-Control/data/CMakeLists.txt' |
2463 | --- Remote-Control/data/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
2464 | +++ Remote-Control/data/CMakeLists.txt 2010-09-16 01:10:06 +0000 |
2465 | @@ -0,0 +1,11 @@ |
2466 | +########### subdirs if any ############### |
2467 | + |
2468 | + |
2469 | +########### install files ############### |
2470 | + |
2471 | +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Remote-Control.conf |
2472 | + preview.jpg |
2473 | + icon.png |
2474 | + arrows.svg |
2475 | + DESTINATION ${remote_controldatadir}) |
2476 | + |
2477 | |
2478 | === added file 'Remote-Control/data/Remote-Control.conf.in' |
2479 | --- Remote-Control/data/Remote-Control.conf.in 1970-01-01 00:00:00 +0000 |
2480 | +++ Remote-Control/data/Remote-Control.conf.in 2010-09-16 01:10:06 +0000 |
2481 | @@ -0,0 +1,14 @@ |
2482 | +#!en;@VERSION_REMOTE_CONTROL@ |
2483 | + |
2484 | +#[gtk-preferences] |
2485 | +[Configuration] |
2486 | + |
2487 | +#k Shortkey to trigger the applet: |
2488 | +shortkey = <Control>F9 |
2489 | + |
2490 | +#a+ Animation of the current icon : |
2491 | +animation=pulse |
2492 | + |
2493 | +#I[0;2000] Duration of the stop animation : |
2494 | +#{In ms.} |
2495 | +stop duration = 800 |
2496 | |
2497 | === added file 'Remote-Control/data/arrows.svg' |
2498 | --- Remote-Control/data/arrows.svg 1970-01-01 00:00:00 +0000 |
2499 | +++ Remote-Control/data/arrows.svg 2010-09-16 01:10:06 +0000 |
2500 | @@ -0,0 +1,289 @@ |
2501 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
2502 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
2503 | +<svg |
2504 | + xmlns:dc="http://purl.org/dc/elements/1.1/" |
2505 | + xmlns:cc="http://creativecommons.org/ns#" |
2506 | + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
2507 | + xmlns:svg="http://www.w3.org/2000/svg" |
2508 | + xmlns="http://www.w3.org/2000/svg" |
2509 | + xmlns:xlink="http://www.w3.org/1999/xlink" |
2510 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
2511 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
2512 | + width="128" |
2513 | + height="128" |
2514 | + id="svg2391" |
2515 | + sodipodi:version="0.32" |
2516 | + inkscape:version="0.46" |
2517 | + version="1.0" |
2518 | + sodipodi:docname="arrows.svg" |
2519 | + inkscape:output_extension="org.inkscape.output.svg.inkscape"> |
2520 | + <defs |
2521 | + id="defs2393"> |
2522 | + <linearGradient |
2523 | + id="linearGradient2076"> |
2524 | + <stop |
2525 | + id="stop2078" |
2526 | + offset="0.0000000" |
2527 | + style="stop-color:#afd9ed;stop-opacity:1.0000000;" /> |
2528 | + <stop |
2529 | + id="stop2080" |
2530 | + offset="1.0000000" |
2531 | + style="stop-color:#cfc3db;stop-opacity:1.0000000;" /> |
2532 | + </linearGradient> |
2533 | + <linearGradient |
2534 | + gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)" |
2535 | + gradientUnits="userSpaceOnUse" |
2536 | + id="linearGradient2082" |
2537 | + x1="12.615197" |
2538 | + x2="48.374069" |
2539 | + xlink:href="#linearGradient2076" |
2540 | + y1="25.909756" |
2541 | + y2="62.720371" /> |
2542 | + <linearGradient |
2543 | + id="linearGradient2088"> |
2544 | + <stop |
2545 | + id="stop2090" |
2546 | + offset="0.0000000" |
2547 | + style="stop-color:#87a8b7;stop-opacity:1.0000000;" /> |
2548 | + <stop |
2549 | + id="stop2092" |
2550 | + offset="1.0000000" |
2551 | + style="stop-color:#7f718e;stop-opacity:1.0000000;" /> |
2552 | + </linearGradient> |
2553 | + <linearGradient |
2554 | + gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)" |
2555 | + gradientUnits="userSpaceOnUse" |
2556 | + id="linearGradient2086" |
2557 | + x1="12.615197" |
2558 | + x2="48.374069" |
2559 | + xlink:href="#linearGradient2088" |
2560 | + y1="25.909756" |
2561 | + y2="62.720371" /> |
2562 | + <inkscape:perspective |
2563 | + sodipodi:type="inkscape:persp3d" |
2564 | + inkscape:vp_x="0 : 526.18109 : 1" |
2565 | + inkscape:vp_y="0 : 1000 : 0" |
2566 | + inkscape:vp_z="744.09448 : 526.18109 : 1" |
2567 | + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" |
2568 | + id="perspective2399" /> |
2569 | + <linearGradient |
2570 | + inkscape:collect="always" |
2571 | + xlink:href="#linearGradient2088" |
2572 | + id="linearGradient2420" |
2573 | + gradientUnits="userSpaceOnUse" |
2574 | + gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)" |
2575 | + x1="12.615197" |
2576 | + y1="25.909756" |
2577 | + x2="48.374069" |
2578 | + y2="62.720371" /> |
2579 | + <linearGradient |
2580 | + inkscape:collect="always" |
2581 | + xlink:href="#linearGradient2076" |
2582 | + id="linearGradient2422" |
2583 | + gradientUnits="userSpaceOnUse" |
2584 | + gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)" |
2585 | + x1="12.615197" |
2586 | + y1="25.909756" |
2587 | + x2="48.374069" |
2588 | + y2="62.720371" /> |
2589 | + <linearGradient |
2590 | + inkscape:collect="always" |
2591 | + xlink:href="#linearGradient2088" |
2592 | + id="linearGradient2434" |
2593 | + gradientUnits="userSpaceOnUse" |
2594 | + gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)" |
2595 | + x1="12.615197" |
2596 | + y1="25.909756" |
2597 | + x2="48.374069" |
2598 | + y2="62.720371" /> |
2599 | + <linearGradient |
2600 | + inkscape:collect="always" |
2601 | + xlink:href="#linearGradient2076" |
2602 | + id="linearGradient2436" |
2603 | + gradientUnits="userSpaceOnUse" |
2604 | + gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)" |
2605 | + x1="12.615197" |
2606 | + y1="25.909756" |
2607 | + x2="48.374069" |
2608 | + y2="62.720371" /> |
2609 | + <linearGradient |
2610 | + inkscape:collect="always" |
2611 | + xlink:href="#linearGradient2088" |
2612 | + id="linearGradient2448" |
2613 | + gradientUnits="userSpaceOnUse" |
2614 | + gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)" |
2615 | + x1="12.615197" |
2616 | + y1="25.909756" |
2617 | + x2="48.374069" |
2618 | + y2="62.720371" /> |
2619 | + <linearGradient |
2620 | + inkscape:collect="always" |
2621 | + xlink:href="#linearGradient2076" |
2622 | + id="linearGradient2450" |
2623 | + gradientUnits="userSpaceOnUse" |
2624 | + gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)" |
2625 | + x1="12.615197" |
2626 | + y1="25.909756" |
2627 | + x2="48.374069" |
2628 | + y2="62.720371" /> |
2629 | + <linearGradient |
2630 | + inkscape:collect="always" |
2631 | + xlink:href="#linearGradient2088" |
2632 | + id="linearGradient2462" |
2633 | + gradientUnits="userSpaceOnUse" |
2634 | + gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)" |
2635 | + x1="12.615197" |
2636 | + y1="25.909756" |
2637 | + x2="48.374069" |
2638 | + y2="62.720371" /> |
2639 | + <linearGradient |
2640 | + inkscape:collect="always" |
2641 | + xlink:href="#linearGradient2076" |
2642 | + id="linearGradient2464" |
2643 | + gradientUnits="userSpaceOnUse" |
2644 | + gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)" |
2645 | + x1="12.615197" |
2646 | + y1="25.909756" |
2647 | + x2="48.374069" |
2648 | + y2="62.720371" /> |
2649 | + </defs> |
2650 | + <sodipodi:namedview |
2651 | + id="base" |
2652 | + pagecolor="#ffffff" |
2653 | + bordercolor="#666666" |
2654 | + borderopacity="1.0" |
2655 | + inkscape:pageopacity="0.0" |
2656 | + inkscape:pageshadow="2" |
2657 | + inkscape:zoom="1.3277206" |
2658 | + inkscape:cx="117.47785" |
2659 | + inkscape:cy="-15.977159" |
2660 | + inkscape:document-units="px" |
2661 | + inkscape:current-layer="layer1" |
2662 | + showgrid="false" |
2663 | + showguides="true" |
2664 | + inkscape:guide-bbox="true" |
2665 | + inkscape:window-width="641" |
2666 | + inkscape:window-height="719" |
2667 | + inkscape:window-x="293" |
2668 | + inkscape:window-y="0" /> |
2669 | + <metadata |
2670 | + id="metadata2396"> |
2671 | + <rdf:RDF> |
2672 | + <cc:Work |
2673 | + rdf:about=""> |
2674 | + <dc:format>image/svg+xml</dc:format> |
2675 | + <dc:type |
2676 | + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
2677 | + </cc:Work> |
2678 | + </rdf:RDF> |
2679 | + </metadata> |
2680 | + <g |
2681 | + inkscape:label="Calque 1" |
2682 | + inkscape:groupmode="layer" |
2683 | + id="layer1"> |
2684 | + <g |
2685 | + id="g2409" |
2686 | + transform="matrix(0,0.8161651,-1.764176,0,125.43391,77.398373)"> |
2687 | + <path |
2688 | + d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z" |
2689 | + id="path2084" |
2690 | + style="fill:url(#linearGradient2420);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
2691 | + <path |
2692 | + d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z" |
2693 | + id="rect1303" |
2694 | + style="fill:url(#linearGradient2422);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
2695 | + <path |
2696 | + d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z" |
2697 | + id="path2096" |
2698 | + style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> |
2699 | + <rect |
2700 | + height="1" |
2701 | + id="rect2098" |
2702 | + rx="0.5" |
2703 | + ry="0.5" |
2704 | + style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" |
2705 | + transform="scale(-1,-1)" |
2706 | + width="23" |
2707 | + x="-27.270832" |
2708 | + y="-28" /> |
2709 | + </g> |
2710 | + <g |
2711 | + id="g2424" |
2712 | + transform="matrix(0,-0.8161651,-1.6782543,0,122.04356,52.382073)"> |
2713 | + <path |
2714 | + d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z" |
2715 | + id="path2426" |
2716 | + style="fill:url(#linearGradient2434);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
2717 | + <path |
2718 | + d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z" |
2719 | + id="path2428" |
2720 | + style="fill:url(#linearGradient2436);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
2721 | + <path |
2722 | + d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z" |
2723 | + id="path2430" |
2724 | + style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> |
2725 | + <rect |
2726 | + height="1" |
2727 | + id="rect2432" |
2728 | + rx="0.5" |
2729 | + ry="0.5" |
2730 | + style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" |
2731 | + transform="scale(-1,-1)" |
2732 | + width="23" |
2733 | + x="-27.270832" |
2734 | + y="-28" /> |
2735 | + </g> |
2736 | + <g |
2737 | + id="g2438" |
2738 | + transform="matrix(-0.8161651,0,0,-1.6496137,51.134197,122.05924)"> |
2739 | + <path |
2740 | + d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z" |
2741 | + id="path2440" |
2742 | + style="fill:url(#linearGradient2448);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
2743 | + <path |
2744 | + d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z" |
2745 | + id="path2442" |
2746 | + style="fill:url(#linearGradient2450);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
2747 | + <path |
2748 | + d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z" |
2749 | + id="path2444" |
2750 | + style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> |
2751 | + <rect |
2752 | + height="1" |
2753 | + id="rect2446" |
2754 | + rx="0.5" |
2755 | + ry="0.5" |
2756 | + style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" |
2757 | + transform="scale(-1,-1)" |
2758 | + width="23" |
2759 | + x="-27.270832" |
2760 | + y="-28" /> |
2761 | + </g> |
2762 | + <g |
2763 | + id="g2452" |
2764 | + transform="matrix(0.8161651,0,0,-1.6496137,77.748214,121.52667)"> |
2765 | + <path |
2766 | + d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z" |
2767 | + id="path2454" |
2768 | + style="fill:url(#linearGradient2462);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
2769 | + <path |
2770 | + d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z" |
2771 | + id="path2456" |
2772 | + style="fill:url(#linearGradient2464);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
2773 | + <path |
2774 | + d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z" |
2775 | + id="path2458" |
2776 | + style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> |
2777 | + <rect |
2778 | + height="1" |
2779 | + id="rect2460" |
2780 | + rx="0.5" |
2781 | + ry="0.5" |
2782 | + style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" |
2783 | + transform="scale(-1,-1)" |
2784 | + width="23" |
2785 | + x="-27.270832" |
2786 | + y="-28" /> |
2787 | + </g> |
2788 | + </g> |
2789 | +</svg> |
2790 | |
2791 | === added file 'Remote-Control/data/icon.png' |
2792 | Binary files Remote-Control/data/icon.png 1970-01-01 00:00:00 +0000 and Remote-Control/data/icon.png 2010-09-16 01:10:06 +0000 differ |
2793 | === added file 'Remote-Control/data/preview.jpg' |
2794 | Binary files Remote-Control/data/preview.jpg 1970-01-01 00:00:00 +0000 and Remote-Control/data/preview.jpg 2010-09-16 01:10:06 +0000 differ |
2795 | === added directory 'Remote-Control/src' |
2796 | === added file 'Remote-Control/src/CMakeLists.txt' |
2797 | --- Remote-Control/src/CMakeLists.txt 1970-01-01 00:00:00 +0000 |
2798 | +++ Remote-Control/src/CMakeLists.txt 2010-09-16 01:10:06 +0000 |
2799 | @@ -0,0 +1,40 @@ |
2800 | + |
2801 | +########### sources ############### |
2802 | + |
2803 | +SET(MODULE_SRCS |
2804 | + applet-struct.h |
2805 | + applet-init.c applet-init.h |
2806 | + applet-config.c applet-config.h |
2807 | + applet-session.c applet-session.h |
2808 | + applet-icon-finder.c applet-icon-finder.h |
2809 | + applet-notifications.c applet-notifications.h |
2810 | +) |
2811 | + |
2812 | +add_library(${PACKAGE_REMOTE_CONTROL} SHARED ${MODULE_SRCS}) |
2813 | + |
2814 | +########### compil ############### |
2815 | +add_definitions (-DMY_APPLET_SHARE_DATA_DIR="${remote_controldatadir}") |
2816 | +add_definitions (-DMY_APPLET_PREVIEW_FILE="preview.jpg") |
2817 | +add_definitions (-DMY_APPLET_CONF_FILE="Remote-Control.conf") |
2818 | +add_definitions (-DMY_APPLET_USER_DATA_DIR="Remote-Control") |
2819 | +add_definitions (-DMY_APPLET_VERSION="${VERSION_REMOTE_CONTROL}") |
2820 | +add_definitions (-DMY_APPLET_GETTEXT_DOMAIN="${GETTEXT_REMOTE_CONTROL}") |
2821 | +add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}") |
2822 | +add_definitions (-DMY_APPLET_ICON_FILE="icon.png") |
2823 | +### uncomment the following line to allow multi-instance applet. |
2824 | +#add_definitions (-DCD_APPLET_MULTI_INSTANCE="1") |
2825 | +### uncomment the following line to allow extended OpenGL drawing. |
2826 | +#add_definitions (-DGL_GLEXT_PROTOTYPES="1") |
2827 | + |
2828 | +include_directories ( |
2829 | + ${PACKAGE_INCLUDE_DIRS}) |
2830 | + |
2831 | +link_directories ( |
2832 | + ${PACKAGE_LIBRARY_DIRS}) |
2833 | + |
2834 | +target_link_libraries (${PACKAGE_REMOTE_CONTROL} |
2835 | + ${PACKAGE_LIBRARIES}) |
2836 | + |
2837 | +########### install files ############### |
2838 | + |
2839 | +install(TARGETS ${PACKAGE_REMOTE_CONTROL} DESTINATION ${pluginsdir}) |
2840 | |
2841 | === added file 'Remote-Control/src/applet-config.c' |
2842 | --- Remote-Control/src/applet-config.c 1970-01-01 00:00:00 +0000 |
2843 | +++ Remote-Control/src/applet-config.c 2010-09-16 01:10:06 +0000 |
2844 | @@ -0,0 +1,51 @@ |
2845 | +/** |
2846 | +* This file is a part of the Cairo-Dock project |
2847 | +* |
2848 | +* Copyright : (C) see the 'copyright' file. |
2849 | +* E-mail : see the 'copyright' file. |
2850 | +* |
2851 | +* This program is free software; you can redistribute it and/or |
2852 | +* modify it under the terms of the GNU General Public License |
2853 | +* as published by the Free Software Foundation; either version 3 |
2854 | +* of the License, or (at your option) any later version. |
2855 | +* |
2856 | +* This program is distributed in the hope that it will be useful, |
2857 | +* but WITHOUT ANY WARRANTY; without even the implied warranty of |
2858 | +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2859 | +* GNU General Public License for more details. |
2860 | +* You should have received a copy of the GNU General Public License |
2861 | +* along with this program. If not, see <http://www.gnu.org/licenses/>. |
2862 | +*/ |
2863 | + |
2864 | +#include <string.h> |
2865 | +#include <cairo-dock.h> |
2866 | + |
2867 | +#include "applet-struct.h" |
2868 | +#include "applet-notifications.h" |
2869 | +#include "applet-config.h" |
2870 | + |
2871 | + |
2872 | +//\_________________ Here you have to get all your parameters from the conf file. Use the macros CD_CONFIG_GET_BOOLEAN, CD_CONFIG_GET_INTEGER, CD_CONFIG_GET_STRING, etc. myConfig has been reseted to 0 at this point. This function is called at the beginning of init and reload. |
2873 | +CD_APPLET_GET_CONFIG_BEGIN |
2874 | + myConfig.cShortkeyNav = CD_CONFIG_GET_STRING ("Configuration", "shortkey"); |
2875 | + myConfig.iCloseDuration = CD_CONFIG_GET_INTEGER ("Configuration", "stop duration"); |
2876 | + myConfig.cIconAnimation = CD_CONFIG_GET_STRING ("Configuration", "animation"); |
2877 | + |
2878 | +CD_APPLET_GET_CONFIG_END |
2879 | + |
2880 | + |
2881 | +//\_________________ Here you have to free all ressources allocated for myConfig. This one will be reseted to 0 at the end of this function. This function is called right before you get the applet's config, and when your applet is stopped, in the end. |
2882 | +CD_APPLET_RESET_CONFIG_BEGIN |
2883 | + if (myConfig.cShortkeyNav) |
2884 | + { |
2885 | + cd_keybinder_unbind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav); |
2886 | + g_free (myConfig.cShortkeyNav); |
2887 | + } |
2888 | + |
2889 | +CD_APPLET_RESET_CONFIG_END |
2890 | + |
2891 | + |
2892 | +//\_________________ Here you have to free all ressources allocated for myData. This one will be reseted to 0 at the end of this function. This function is called when your applet is stopped, in the very end. |
2893 | +CD_APPLET_RESET_DATA_BEGIN |
2894 | + |
2895 | +CD_APPLET_RESET_DATA_END |
2896 | |
2897 | === added file 'Remote-Control/src/applet-config.h' |
2898 | --- Remote-Control/src/applet-config.h 1970-01-01 00:00:00 +0000 |
2899 | +++ Remote-Control/src/applet-config.h 2010-09-16 01:10:06 +0000 |
2900 | @@ -0,0 +1,30 @@ |
2901 | +/** |
2902 | +* This file is a part of the Cairo-Dock project |
2903 | +* |
2904 | +* Copyright : (C) see the 'copyright' file. |
2905 | +* E-mail : see the 'copyright' file. |
2906 | +* |
2907 | +* This program is free software; you can redistribute it and/or |
2908 | +* modify it under the terms of the GNU General Public License |
2909 | +* as published by the Free Software Foundation; either version 3 |
2910 | +* of the License, or (at your option) any later version. |
2911 | +* |
2912 | +* This program is distributed in the hope that it will be useful, |
2913 | +* but WITHOUT ANY WARRANTY; without even the implied warranty of |
2914 | +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2915 | +* GNU General Public License for more details. |
2916 | +* You should have received a copy of the GNU General Public License |
2917 | +* along with this program. If not, see <http://www.gnu.org/licenses/>. |
2918 | +*/ |
2919 | + |
2920 | + |
2921 | +#ifndef __APPLET_CONFIG__ |
2922 | +#define __APPLET_CONFIG__ |
2923 | + |
2924 | +#include <cairo-dock.h> |
2925 | + |
2926 | + |
2927 | +CD_APPLET_CONFIG_H |
2928 | + |
2929 | + |
2930 | +#endif |
2931 | |
2932 | === added file 'Remote-Control/src/applet-icon-finder.c' |
2933 | --- Remote-Control/src/applet-icon-finder.c 1970-01-01 00:00:00 +0000 |
2934 | +++ Remote-Control/src/applet-icon-finder.c 2010-09-16 01:10:06 +0000 |
2935 | @@ -0,0 +1,257 @@ |
2936 | +/** |
2937 | +* This file is a part of the Cairo-Dock project |
2938 | +* |
2939 | +* Copyright : (C) see the 'copyright' file. |
2940 | +* E-mail : see the 'copyright' file. |
2941 | +* |
2942 | +* This program is free software; you can redistribute it and/or |
2943 | +* modify it under the terms of the GNU General Public License |
2944 | +* as published by the Free Software Foundation; either version 3 |
2945 | +* of the License, or (at your option) any later version. |
2946 | +* |
2947 | +* This program is distributed in the hope that it will be useful, |
2948 | +* but WITHOUT ANY WARRANTY; without even the implied warranty of |
2949 | +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2950 | +* GNU General Public License for more details. |
2951 | +* You should have received a copy of the GNU General Public License |
2952 | +* along with this program. If not, see <http://www.gnu.org/licenses/>. |
2953 | +*/ |
2954 | + |
2955 | +#include <stdlib.h> |
2956 | +#include <string.h> |
2957 | + |
2958 | +#include "applet-struct.h" |
2959 | +#include "applet-session.h" |
2960 | +#include "applet-notifications.h" |
2961 | +#include "applet-icon-finder.h" |
2962 | + |
2963 | +static inline gboolean _cd_do_icon_match (Icon *pIcon, const gchar *cCommandPrefix, int length) |
2964 | +{ |
2965 | + gboolean bMatch = FALSE; |
2966 | + if (pIcon->cBaseURI != NULL) |
2967 | + { |
2968 | + gchar *cFile = g_path_get_basename (pIcon->cCommand); |
2969 | + bMatch = (cFile && g_ascii_strncasecmp (cCommandPrefix, cFile, length) == 0); |
2970 | + g_free (cFile); |
2971 | + } |
2972 | + else if (pIcon->cCommand) |
2973 | + { |
2974 | + bMatch = (g_ascii_strncasecmp (cCommandPrefix, pIcon->cCommand, length) == 0); |
2975 | + if (!bMatch) |
2976 | + { |
2977 | + gchar *str = strchr (pIcon->cCommand, '-'); // on se limite au 1er tiret. |
2978 | + if (str && *(str-1) != ' ') // on verifie qu'il n'est pas un tiret d'option |
2979 | + { |
2980 | + str ++; |
2981 | + bMatch = (g_strncasecmp (str, cCommandPrefix, length) == 0); |
2982 | + } |
2983 | + if (!bMatch && pIcon->cName) |
2984 | + bMatch = (g_ascii_strncasecmp (cCommandPrefix, pIcon->cName, length) == 0); |
2985 | + } |
2986 | + } |
2987 | + return bMatch; |
2988 | +} |
2989 | + |
2990 | +static void _find_icon_in_dock_with_command (Icon *pIcon, CairoDock *pDock, gpointer *data) |
2991 | +{ |
2992 | + gchar *cCommandPrefix = data[0]; |
2993 | + int length = GPOINTER_TO_INT (data[1]); |
2994 | + Icon *pAfterIcon = data[2]; |
2995 | + Icon **pFoundIcon = data[3]; |
2996 | + CairoDock **pFoundDock = data[4]; |
2997 | + Icon **pFirstIcon = data[5]; |
2998 | + CairoDock **pFirstParentDock = data[6]; |
2999 | + if (pDock == g_pMainDock || *pFoundIcon != NULL) // on a deja cherche dans le main dock, ou deja trouve ce qu'on cherchait. |
3000 | + return ; |
3001 | + |
3002 | + gboolean bFound = _cd_do_icon_match (pIcon, cCommandPrefix, length); |
3003 | + if (bFound) |
3004 | + { |
3005 | + if (pAfterIcon == NULL) |
3006 | + { |
3007 | + *pFoundIcon = pIcon; |
3008 | + *pFoundDock = pDock; |
3009 | + } |
3010 | + else |
3011 | + { |
3012 | + if (*pFirstIcon == NULL) // on garde une trace de la 1ere icone pour boucler dans la liste. |
3013 | + { |
3014 | + *pFirstIcon = pIcon; |
3015 | + *pFirstParentDock = g_pMainDock; |
3016 | + } |
3017 | + if (pIcon == pAfterIcon) |
3018 | + { |
3019 | + data[2] = NULL; |
3020 | + } |
3021 | + } |
3022 | + } |
3023 | +} |
3024 | +Icon *cd_do_search_icon_by_command (const gchar *cCommandPrefix, Icon *pAfterIcon, CairoDock **pDock) |
3025 | +{ |
3026 | + g_return_val_if_fail (cCommandPrefix != NULL, NULL); |
3027 | + |
3028 | + //\_________________ on cherche en premier dans le main dock, car il est deja visible. |
3029 | + int length = strlen (cCommandPrefix); |
3030 | + Icon *pIcon, *pFirstIcon = NULL; |
3031 | + CairoDock *pParentDock, *pFirstParentDock = NULL; |
3032 | + GList *ic; |
3033 | + for (ic = g_pMainDock->icons; ic != NULL; ic = ic->next) |
3034 | + { |
3035 | + pIcon = ic->data; |
3036 | + if (pIcon->cCommand && g_ascii_strncasecmp (cCommandPrefix, pIcon->cCommand, length) == 0) |
3037 | + { |
3038 | + if (pAfterIcon == NULL) |
3039 | + { |
3040 | + *pDock = g_pMainDock; |
3041 | + return pIcon; |
3042 | + } |
3043 | + else |
3044 | + { |
3045 | + if (pFirstIcon == NULL) // on garde une trace de la 1ere icone pour boucler dans la liste. |
3046 | + { |
3047 | + pFirstIcon = pIcon; |
3048 | + pFirstParentDock = g_pMainDock; |
3049 | + } |
3050 | + if (pIcon == pAfterIcon) |
3051 | + { |
3052 | + pAfterIcon = NULL; |
3053 | + } |
3054 | + } |
3055 | + } |
3056 | + } |
3057 | + |
3058 | + //\_________________ si on a rien trouve on cherche dans tous les docks. |
3059 | + pIcon = NULL; |
3060 | + *pDock = NULL; |
3061 | + gpointer data[7]; |
3062 | + data[0] = (gchar *)cCommandPrefix; |
3063 | + data[1] = GINT_TO_POINTER (length); |
3064 | + data[2] = pAfterIcon; |
3065 | + data[3] = &pIcon; |
3066 | + data[4] = pDock; |
3067 | + data[5] = &pFirstIcon; |
3068 | + data[6] = &pFirstParentDock; |
3069 | + cairo_dock_foreach_icons_in_docks ((CairoDockForeachIconFunc) _find_icon_in_dock_with_command, data); |
3070 | + |
3071 | + if (pIcon == NULL) |
3072 | + { |
3073 | + pIcon = pFirstIcon; |
3074 | + *pDock = pFirstParentDock; |
3075 | + } |
3076 | + return pIcon; |
3077 | +} |
3078 | + |
3079 | + |
3080 | +void cd_do_change_current_icon (Icon *pIcon, CairoDock *pDock) |
3081 | +{ |
3082 | + //\_________________ on gere le cachage et le montrage du dock precedent et actuel. |
3083 | + if (myData.pCurrentDock != NULL && pDock != myData.pCurrentDock) // on remet au repos le dock precedemment anime. |
3084 | + { |
3085 | + cairo_dock_emit_leave_signal (CAIRO_CONTAINER (myData.pCurrentDock)); |
3086 | + cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (myData.pCurrentDock), CAIRO_DOCK_RENDER_DOCK, (CairoDockNotificationFunc) cd_do_render, NULL); |
3087 | + cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (myData.pCurrentDock), CAIRO_DOCK_UPDATE_DOCK, (CairoDockNotificationFunc) cd_do_update_container, NULL); |
3088 | + } |
3089 | + if (pDock != NULL && pDock != myData.pCurrentDock) // on montre le nouveau dock |
3090 | + { |
3091 | + if (pDock != NULL) |
3092 | + { |
3093 | + if (pDock->iRefCount > 0) |
3094 | + { |
3095 | + CairoDock *pParentDock = NULL; |
3096 | + Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (pDock, &pParentDock); |
3097 | + if (pPointingIcon != NULL) |
3098 | + { |
3099 | + cairo_dock_show_subdock (pPointingIcon, pParentDock); // utile pour le montrage des sous-docks au clic. |
3100 | + } |
3101 | + } |
3102 | + else |
3103 | + { |
3104 | + /// utile de faire ca si on entre dedans ?... |
3105 | + if (pDock->bAutoHide) |
3106 | + cairo_dock_start_showing (pDock); |
3107 | + if (pDock->iVisibility == CAIRO_DOCK_VISI_KEEP_BELOW) |
3108 | + cairo_dock_pop_up (pDock); |
3109 | + } |
3110 | + cairo_dock_emit_enter_signal (CAIRO_CONTAINER (pDock)); |
3111 | + } |
3112 | + |
3113 | + cairo_dock_register_notification_on_container (CAIRO_CONTAINER (pDock), |
3114 | + CAIRO_DOCK_UPDATE_DOCK, |
3115 | + (CairoDockNotificationFunc) cd_do_update_container, |
3116 | + CAIRO_DOCK_RUN_AFTER, NULL); |
3117 | + cairo_dock_register_notification_on_container (CAIRO_CONTAINER (pDock), |
3118 | + CAIRO_DOCK_RENDER_DOCK, |
3119 | + (CairoDockNotificationFunc) cd_do_render, |
3120 | + CAIRO_DOCK_RUN_AFTER, NULL); |
3121 | + } |
3122 | + if (pDock != NULL) |
3123 | + { |
3124 | + gtk_window_present (GTK_WINDOW (pDock->container.pWidget)); |
3125 | + } |
3126 | + |
3127 | + //\_________________ on gere l'allumage et l'eteignage de l'icone precedente et actuelle. |
3128 | + if (myData.pCurrentIcon != NULL && pIcon != myData.pCurrentIcon) // on remet au repos l'icone precedemment anime. |
3129 | + { |
3130 | + myData.bIgnoreIconState = TRUE; |
3131 | + cairo_dock_stop_icon_animation (myData.pCurrentIcon); |
3132 | + myData.bIgnoreIconState = FALSE; |
3133 | + cairo_dock_redraw_icon (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock)); /// utile ?... |
3134 | + } |
3135 | + if (pIcon != NULL && myData.pCurrentIcon != pIcon) // on anime la nouvelle icone. |
3136 | + { |
3137 | + int x = pIcon->fXAtRest + pIcon->fWidth/2 + (- pDock->fFlatDockWidth + pDock->iMaxDockWidth)/2; |
3138 | + int y = pIcon->fDrawY + pIcon->fHeight/2 * pIcon->fScale; |
3139 | + if (1||myData.pCurrentDock != pDock) |
3140 | + { |
3141 | + cairo_dock_emit_motion_signal (pDock, |
3142 | + x, |
3143 | + y); |
3144 | + } |
3145 | + else |
3146 | + { |
3147 | + myData.iPrevMouseX = myData.iMouseX; |
3148 | + myData.iPrevMouseY = myData.iMouseY; |
3149 | + myData.iMotionCount = 10; |
3150 | + } |
3151 | + myData.iMouseX = x; |
3152 | + myData.iMouseY = y; |
3153 | + cairo_dock_request_icon_animation (pIcon, pDock, myConfig.cIconAnimation, 1e6); // interrompt l'animation de "mouse over". |
3154 | + cairo_dock_launch_animation (CAIRO_CONTAINER (pDock)); |
3155 | + //if (myAccessibility.bShowSubDockOnClick) |
3156 | + // cairo_dock_show_subdock (pIcon, pDock, FALSE); |
3157 | + } |
3158 | + |
3159 | + myData.pCurrentDock = pDock; |
3160 | + myData.pCurrentIcon = pIcon; |
3161 | + if (myData.pCurrentDock == NULL) |
3162 | + gtk_window_present (GTK_WINDOW (g_pMainDock->container.pWidget)); |
3163 | +} |
3164 | + |
3165 | + |
3166 | +void cd_do_search_current_icon (gboolean bLoopSearch) |
3167 | +{ |
3168 | + //\_________________ on cherche un lanceur correspondant. |
3169 | + CairoDock *pDock; |
3170 | + Icon *pIcon = cd_do_search_icon_by_command (myData.sCurrentText->str, (bLoopSearch ? myData.pCurrentIcon : NULL), &pDock); |
3171 | + cd_debug ("found icon : %s\n", pIcon ? pIcon->cName : "none"); |
3172 | + |
3173 | + //\_________________ on gere le changement d'icone/dock. |
3174 | + cd_do_change_current_icon (pIcon, pDock); |
3175 | +} |
3176 | + |
3177 | + |
3178 | +gboolean cairo_dock_emit_motion_signal (CairoDock *pDock, int iMouseX, int iMouseY) |
3179 | +{ |
3180 | + static gboolean bReturn; |
3181 | + static GdkEventMotion motion; |
3182 | + motion.state = 0; |
3183 | + motion.x = iMouseX; |
3184 | + motion.y = iMouseY; |
3185 | + motion.x_root = pDock->container.iWindowPositionX + pDock->container.iMouseX; |
3186 | + motion.y_root = pDock->container.iWindowPositionY + pDock->container.iMouseY; |
3187 | + motion.time = 0; |
3188 | + motion.window = pDock->container.pWidget->window; |
3189 | + motion.device = gdk_device_get_core_pointer (); |
3190 | + g_signal_emit_by_name (pDock->container.pWidget, "motion-notify-event", &motion, &bReturn); |
3191 | + return FALSE; |
3192 | +} |
3193 | |
3194 | === added file 'Remote-Control/src/applet-icon-finder.h' |
3195 | --- Remote-Control/src/applet-icon-finder.h 1970-01-01 00:00:00 +0000 |
3196 | +++ Remote-Control/src/applet-icon-finder.h 2010-09-16 01:10:06 +0000 |
3197 | @@ -0,0 +1,40 @@ |
3198 | +/** |
3199 | +* This file is a part of the Cairo-Dock project |
3200 | +* |
3201 | +* Copyright : (C) see the 'copyright' file. |
3202 | +* E-mail : see the 'copyright' file. |
3203 | +* |
3204 | +* This program is free software; you can redistribute it and/or |
3205 | +* modify it under the terms of the GNU General Public License |
3206 | +* as published by the Free Software Foundation; either version 3 |
3207 | +* of the License, or (at your option) any later version. |
3208 | +* |
3209 | +* This program is distributed in the hope that it will be useful, |
3210 | +* but WITHOUT ANY WARRANTY; without even the implied warranty of |
3211 | +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3212 | +* GNU General Public License for more details. |
3213 | +* You should have received a copy of the GNU General Public License |
3214 | +* along with this program. If not, see <http://www.gnu.org/licenses/>. |
3215 | +*/ |
3216 | + |
3217 | + |
3218 | +#ifndef __APPLET_ICON_FINDER__ |
3219 | +#define __APPLET_ICON_FINDER__ |
3220 | + |
3221 | +#include <cairo-dock.h> |
3222 | +#include "applet-struct.h" |
3223 | + |
3224 | + |
3225 | +Icon *cd_do_search_icon_by_command (const gchar *cCommandPrefix, Icon *pAfterIcon, CairoDock **pDock); |
3226 | + |
3227 | + |
3228 | +void cd_do_change_current_icon (Icon *pIcon, CairoDock *pDock); |
3229 | + |
3230 | + |
3231 | +void cd_do_search_current_icon (gboolean bLoopSearch); |
3232 | + |
3233 | + |
3234 | +gboolean cairo_dock_emit_motion_signal (CairoDock *pDock, int iMouseX, int iMouseY); |
3235 | + |
3236 | + |
3237 | +#endif |
3238 | |
3239 | === added file 'Remote-Control/src/applet-init.c' |
3240 | --- Remote-Control/src/applet-init.c 1970-01-01 00:00:00 +0000 |
3241 | +++ Remote-Control/src/applet-init.c 2010-09-16 01:10:06 +0000 |
3242 | @@ -0,0 +1,66 @@ |
3243 | +/** |
3244 | +* This file is a part of the Cairo-Dock project |
3245 | +* |
3246 | +* Copyright : (C) see the 'copyright' file. |
3247 | +* E-mail : see the 'copyright' file. |
3248 | +* |
3249 | +* This program is free software; you can redistribute it and/or |
3250 | +* modify it under the terms of the GNU General Public License |
3251 | +* as published by the Free Software Foundation; either version 3 |
3252 | +* of the License, or (at your option) any later version. |
3253 | +* |
3254 | +* This program is distributed in the hope that it will be useful, |
3255 | +* but WITHOUT ANY WARRANTY; without even the implied warranty of |
3256 | +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3257 | +* GNU General Public License for more details. |
3258 | +* You should have received a copy of the GNU General Public License |
3259 | +* along with this program. If not, see <http://www.gnu.org/licenses/>. |
3260 | +*/ |
3261 | + |
3262 | +#include "stdlib.h" |
3263 | + |
3264 | +#include "applet-struct.h" |
3265 | +#include "applet-config.h" |
3266 | +#include "applet-notifications.h" |
3267 | +#include "applet-session.h" |
3268 | +#include "applet-init.h" |
3269 | + |
3270 | + |
3271 | +CD_APPLET_DEFINE_BEGIN (("Remote-Control"), |
3272 | + 2, 2, 0, |
3273 | + CAIRO_DOCK_CATEGORY_APPLET_FUN, |
3274 | + ("This plug-in lets you control your dock from the keyboard,\n" |
3275 | + " or even a remote controller.\n" |
3276 | + "Press the shortcut (by default CTRL + F9),\n" |
3277 | + " then use the arrows to navigate into the docks and sub-docks,\n" |
3278 | + " or type the name of a launcher and press Tab to automatically jump to the next suitable launcher\n" |
3279 | + "Press Enter to click on the icon, Shift+Enter for Shift+click, Alt+Enter for middle click, and Ctrl+Enter for left click\n" |
3280 | + "Escape or the same shortkey will cancel."), |
3281 | + "Fabounet (Fabrice Rey)") |
3282 | + CD_APPLET_DEFINE_COMMON_APPLET_INTERFACE |
3283 | + CD_APPLET_SET_CONTAINER_TYPE (CAIRO_DOCK_MODULE_IS_PLUGIN); |
3284 | +CD_APPLET_DEFINE_END |
3285 | + |
3286 | + |
3287 | +//\___________ Here is where you initiate your applet. myConfig is already set at this point, and also myIcon, myContainer, myDock, myDesklet (and myDrawContext if you're in dock mode). The macro CD_APPLET_MY_CONF_FILE and CD_APPLET_MY_KEY_FILE can give you access to the applet's conf-file and its corresponding key-file (also available during reload). If you're in desklet mode, myDrawContext is still NULL, and myIcon's buffers has not been filled, because you may not need them then (idem when reloading). |
3288 | +CD_APPLET_INIT_BEGIN |
3289 | + cd_keybinder_bind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav, myApplet); |
3290 | + |
3291 | +CD_APPLET_INIT_END |
3292 | + |
3293 | + |
3294 | +//\___________ Here is where you stop your applet. myConfig and myData are still valid, but will be reseted to 0 at the end of the function. In the end, your applet will go back to its original state, as if it had never been activated. |
3295 | +CD_APPLET_STOP_BEGIN |
3296 | + cd_do_exit_session (); |
3297 | + |
3298 | +CD_APPLET_STOP_END |
3299 | + |
3300 | + |
3301 | +//\___________ The reload occurs in 2 occasions : when the user changes the applet's config, and when the user reload the cairo-dock's config or modify the desklet's size. The macro CD_APPLET_MY_CONFIG_CHANGED can tell you this. myConfig has already been reloaded at this point if you're in the first case, myData is untouched. You also have the macro CD_APPLET_MY_CONTAINER_TYPE_CHANGED that can tell you if you switched from dock/desklet to desklet/dock mode. |
3302 | +CD_APPLET_RELOAD_BEGIN |
3303 | + if (CD_APPLET_MY_CONFIG_CHANGED) |
3304 | + { |
3305 | + cd_keybinder_bind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav, myApplet); // shortkey were unbinded during reset_config. |
3306 | + |
3307 | + } |
3308 | +CD_APPLET_RELOAD_END |
3309 | |
3310 | === added file 'Remote-Control/src/applet-init.h' |
3311 | --- Remote-Control/src/applet-init.h 1970-01-01 00:00:00 +0000 |
3312 | +++ Remote-Control/src/applet-init.h 2010-09-16 01:10:06 +0000 |
3313 | @@ -0,0 +1,31 @@ |
3314 | +/** |
3315 | +* This file is a part of the Cairo-Dock project |
3316 | +* |
3317 | +* Copyright : (C) see the 'copyright' file. |
3318 | +* E-mail : see the 'copyright' file. |
3319 | +* |
3320 | +* This program is free software; you can redistribute it and/or |
3321 | +* modify it under the terms of the GNU General Public License |
3322 | +* as published by the Free Software Foundation; either version 3 |
3323 | +* of the License, or (at your option) any later version. |
3324 | +* |
3325 | +* This program is distributed in the hope that it will be useful, |
3326 | +* but WITHOUT ANY WARRANTY; without even the implied warranty of |
3327 | +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3328 | +* GNU General Public License for more details. |
3329 | +* You should have received a copy of the GNU General Public License |
3330 | +* along with this program. If not, see <http://www.gnu.org/licenses/>. |
3331 | +*/ |
3332 | + |
3333 | + |
3334 | +#ifndef __APPLET_INIT__ |
3335 | +#define __APPLET_INIT__ |
3336 | + |
3337 | + |
3338 | +#include <cairo-dock.h> |
3339 | + |
3340 | + |
3341 | +CD_APPLET_H |
3342 | + |
3343 | + |
3344 | +#endif |
3345 | |
3346 | === added file 'Remote-Control/src/applet-notifications.c' |
3347 | --- Remote-Control/src/applet-notifications.c 1970-01-01 00:00:00 +0000 |
3348 | +++ Remote-Control/src/applet-notifications.c 2010-09-16 01:10:06 +0000 |
3349 | @@ -0,0 +1,480 @@ |
3350 | +/** |
3351 | +* This file is a part of the Cairo-Dock project |
3352 | +* |
3353 | +* Copyright : (C) see the 'copyright' file. |
3354 | +* E-mail : see the 'copyright' file. |
3355 | +* |
3356 | +* This program is free software; you can redistribute it and/or |
3357 | +* modify it under the terms of the GNU General Public License |
3358 | +* as published by the Free Software Foundation; either version 3 |
3359 | +* of the License, or (at your option) any later version. |
3360 | +* |
3361 | +* This program is distributed in the hope that it will be useful, |
3362 | +* but WITHOUT ANY WARRANTY; without even the implied warranty of |
3363 | +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3364 | +* GNU General Public License for more details. |
3365 | +* You should have received a copy of the GNU General Public License |
3366 | +* along with this program. If not, see <http://www.gnu.org/licenses/>. |
3367 | +*/ |
3368 | + |
3369 | +#include <stdlib.h> |
3370 | +#include <string.h> |
3371 | +#include <math.h> |
3372 | +#include <gdk/gdkkeysyms.h> |
3373 | + |
3374 | +#include "applet-struct.h" |
3375 | +#include "applet-icon-finder.h" |
3376 | +#include "applet-session.h" |
3377 | +#include "applet-notifications.h" |
3378 | + |
3379 | +#define _alpha_prompt(k,n) cos (G_PI/2*fabs ((double) ((k % (2*n)) - n) / n)); |
3380 | + |
3381 | +const int s_iNbPromptAnimationSteps = 40; |
3382 | + |
3383 | + |
3384 | +static inline int _orient_arrow (CairoContainer *pContainer, int iKeyVal) |
3385 | +{ |
3386 | + switch (iKeyVal) |
3387 | + { |
3388 | + case GDK_Up : |
3389 | + if (pContainer->bIsHorizontal) |
3390 | + { |
3391 | + if (!pContainer->bDirectionUp) |
3392 | + iKeyVal = GDK_Down; |
3393 | + } |
3394 | + else |
3395 | + { |
3396 | + iKeyVal = GDK_Left; |
3397 | + } |
3398 | + break; |
3399 | + |
3400 | + case GDK_Down : |
3401 | + if (pContainer->bIsHorizontal) |
3402 | + { |
3403 | + if (!pContainer->bDirectionUp) |
3404 | + iKeyVal = GDK_Up; |
3405 | + } |
3406 | + else |
3407 | + { |
3408 | + iKeyVal = GDK_Right; |
3409 | + } |
3410 | + break; |
3411 | + |
3412 | + case GDK_Left : |
3413 | + if (!pContainer->bIsHorizontal) |
3414 | + { |
3415 | + if (pContainer->bDirectionUp) |
3416 | + iKeyVal = GDK_Up; |
3417 | + else |
3418 | + iKeyVal = GDK_Down; |
3419 | + } |
3420 | + break; |
3421 | + |
3422 | + case GDK_Right : |
3423 | + if (!pContainer->bIsHorizontal) |
3424 | + { |
3425 | + if (pContainer->bDirectionUp) |
3426 | + iKeyVal = GDK_Down; |
3427 | + else |
3428 | + iKeyVal = GDK_Up; |
3429 | + } |
3430 | + break; |
3431 | + default: |
3432 | + break; |
3433 | + |
3434 | + } |
3435 | + return iKeyVal; |
3436 | +} |
3437 | +static void _find_next_dock (CairoDock *pDock, gpointer *data) |
3438 | +{ |
3439 | + if (data[3] == NULL) // first root dock in the list. |
3440 | + data[3] = pDock; |
3441 | + if (data[0] == pDock) // this dock is the current one, we'll take the next one. |
3442 | + data[2] = GINT_TO_POINTER (TRUE); |
3443 | + else if (data[2]) // we take this one. |
3444 | + data[1] = pDock; |
3445 | +} |
3446 | +gboolean cd_do_key_pressed (gpointer pUserData, CairoContainer *pContainer, guint iKeyVal, guint iModifierType, const gchar *string) |
3447 | +{ |
3448 | + g_return_val_if_fail (cd_do_session_is_running (), CAIRO_DOCK_LET_PASS_NOTIFICATION); |
3449 | + |
3450 | + const gchar *cKeyName = gdk_keyval_name (iKeyVal); |
3451 | + guint32 iUnicodeChar = gdk_keyval_to_unicode (iKeyVal); |
3452 | + cd_debug ("+ cKeyName : %s (%c, %s)\n", cKeyName, iUnicodeChar, string); |
3453 | + |
3454 | + if (iKeyVal == GDK_Escape) // on clot la session. |
3455 | + { |
3456 | + cd_do_close_session (); |
3457 | + } |
3458 | + else if (iKeyVal == GDK_space && myData.sCurrentText->len == 0) // pas d'espace en debut de chaine. |
3459 | + { |
3460 | + // on rejette. |
3461 | + } |
3462 | + else if (iKeyVal >= GDK_Shift_L && iKeyVal <= GDK_Hyper_R) // on n'ecrit pas les modificateurs. |
3463 | + { |
3464 | + // on rejette. |
3465 | + } |
3466 | + else if (iKeyVal == GDK_Menu) // emulation du clic droit. |
3467 | + { |
3468 | + if (myData.pCurrentIcon != NULL && myData.pCurrentDock != NULL) |
3469 | + { |
3470 | + myData.bIgnoreIconState = TRUE; |
3471 | + cairo_dock_stop_icon_animation (myData.pCurrentIcon); // car on va perdre le focus. |
3472 | + myData.bIgnoreIconState = FALSE; |
3473 | + |
3474 | + GtkWidget *menu = cairo_dock_build_menu (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock)); |
3475 | + cairo_dock_popup_menu_on_icon (menu, myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock)); |
3476 | + } |
3477 | + } |
3478 | + else if (iKeyVal == GDK_BackSpace) // on efface la derniere lettre. |
3479 | + { |
3480 | + if (myData.sCurrentText->len > 0) |
3481 | + { |
3482 | + cd_debug ("on efface la derniere lettre de %s (%d)\n", myData.sCurrentText->str, myData.sCurrentText->len); |
3483 | + |
3484 | + g_string_truncate (myData.sCurrentText, myData.sCurrentText->len-1); |
3485 | + |
3486 | + // on relance la recherche. |
3487 | + if (myData.pCurrentIcon == NULL) // sinon l'icone actuelle convient toujours. |
3488 | + cd_do_search_current_icon (FALSE); |
3489 | + } |
3490 | + } |
3491 | + else if (iKeyVal == GDK_Tab) // jump to next icon. |
3492 | + { |
3493 | + if (myData.sCurrentText->len > 0) |
3494 | + { |
3495 | + gboolean bPrevious = iModifierType & GDK_SHIFT_MASK; |
3496 | + // on cherche l'icone suivante. |
3497 | + cd_do_search_current_icon (TRUE); // pCurrentIcon peut etre NULL si elle s'est faite detruire pendant la recherche, auquel cas on cherchera juste normalement. |
3498 | + } |
3499 | + } |
3500 | + else if (iKeyVal == GDK_Return) |
3501 | + { |
3502 | + if (myData.pCurrentIcon != NULL && myData.pCurrentDock != NULL) |
3503 | + { |
3504 | + cd_debug ("on clique sur l'icone '%s' [%d, %d]\n", myData.pCurrentIcon->cName, iModifierType, GDK_SHIFT_MASK); |
3505 | + |
3506 | + myData.bIgnoreIconState = TRUE; |
3507 | + if (iModifierType & GDK_MOD1_MASK) // ALT |
3508 | + { |
3509 | + myData.bIgnoreIconState = TRUE; |
3510 | + cairo_dock_stop_icon_animation (myData.pCurrentIcon); // car aucune animation ne va la remplacer. |
3511 | + myData.bIgnoreIconState = FALSE; |
3512 | + cairo_dock_notify (CAIRO_DOCK_MIDDLE_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock); |
3513 | + } |
3514 | + else if (iModifierType & GDK_CONTROL_MASK) // CTRL |
3515 | + { |
3516 | + myData.bIgnoreIconState = TRUE; |
3517 | + cairo_dock_stop_icon_animation (myData.pCurrentIcon); // car on va perdre le focus. |
3518 | + myData.bIgnoreIconState = FALSE; |
3519 | + |
3520 | + myData.pCurrentDock->bMenuVisible = TRUE; |
3521 | + GtkWidget *menu = cairo_dock_build_menu (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock)); |
3522 | + cairo_dock_popup_menu_on_icon (menu, myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock)); |
3523 | + } |
3524 | + else if (myData.pCurrentIcon != NULL) |
3525 | + { |
3526 | + cairo_dock_notify (CAIRO_DOCK_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock, iModifierType); |
3527 | + if (CAIRO_DOCK_IS_APPLI (myData.pCurrentIcon)) |
3528 | + myData.iPreviouslyActiveWindow = 0; |
3529 | + } |
3530 | + if (myData.pCurrentIcon != NULL) |
3531 | + cairo_dock_start_icon_animation (myData.pCurrentIcon, myData.pCurrentDock); |
3532 | + myData.bIgnoreIconState = FALSE; |
3533 | + myData.pCurrentIcon = NULL; // sinon on va interrompre l'animation en fermant la session. |
3534 | + } |
3535 | + cd_do_close_session (); |
3536 | + } |
3537 | + else if (iKeyVal == GDK_Left || iKeyVal == GDK_Right || iKeyVal == GDK_Up || iKeyVal == GDK_Down) |
3538 | + { |
3539 | + iKeyVal = _orient_arrow (pContainer, iKeyVal); |
3540 | + if (iKeyVal == GDK_Up) |
3541 | + { |
3542 | + if (myData.pCurrentIcon != NULL && myData.pCurrentIcon->pSubDock != NULL) |
3543 | + { |
3544 | + cd_debug ("on monte dans le sous-dock %s\n", myData.pCurrentIcon->cName); |
3545 | + Icon *pIcon = cairo_dock_get_first_icon (myData.pCurrentIcon->pSubDock->icons); |
3546 | + cd_do_change_current_icon (pIcon, myData.pCurrentIcon->pSubDock); |
3547 | + } |
3548 | + } |
3549 | + else if (iKeyVal == GDK_Down) |
3550 | + { |
3551 | + if (myData.pCurrentDock != NULL && myData.pCurrentDock->iRefCount > 0) |
3552 | + { |
3553 | + CairoDock *pParentDock = NULL; |
3554 | + Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (myData.pCurrentDock, &pParentDock); |
3555 | + if (pPointingIcon != NULL) |
3556 | + { |
3557 | + cd_debug ("on redescend dans le dock parent via %s\n", pPointingIcon->cName); |
3558 | + cd_do_change_current_icon (pPointingIcon, pParentDock); |
3559 | + } |
3560 | + } |
3561 | + } |
3562 | + else if (iKeyVal == GDK_Left) |
3563 | + { |
3564 | + if (myData.pCurrentDock == NULL) // on initialise le deplacement. |
3565 | + { |
3566 | + myData.pCurrentDock = g_pMainDock; |
3567 | + int n = g_list_length (g_pMainDock->icons); |
3568 | + if (n > 0) |
3569 | + { |
3570 | + myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n-1) / 2); |
3571 | + if (CAIRO_DOCK_IS_SEPARATOR (myData.pCurrentIcon) && n > 1) |
3572 | + myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n+1) / 2); |
3573 | + } |
3574 | + } |
3575 | + if (myData.pCurrentDock->icons != NULL) |
3576 | + { |
3577 | + Icon *pPrevIcon = cairo_dock_get_previous_icon (myData.pCurrentDock->icons, myData.pCurrentIcon); |
3578 | + if (CAIRO_DOCK_IS_SEPARATOR (pPrevIcon)) |
3579 | + pPrevIcon = cairo_dock_get_previous_icon (myData.pCurrentDock->icons, pPrevIcon); |
3580 | + if (pPrevIcon == NULL) // pas trouve ou bien 1ere icone. |
3581 | + { |
3582 | + pPrevIcon = cairo_dock_get_last_icon (myData.pCurrentDock->icons); |
3583 | + } |
3584 | + |
3585 | + cd_debug ("on se deplace a gauche sur %s\n", pPrevIcon ? pPrevIcon->cName : "none"); |
3586 | + cd_do_change_current_icon (pPrevIcon, myData.pCurrentDock); |
3587 | + } |
3588 | + } |
3589 | + else // Gdk_Right. |
3590 | + { |
3591 | + if (myData.pCurrentDock == NULL) // on initialise le deplacement. |
3592 | + { |
3593 | + myData.pCurrentDock = g_pMainDock; |
3594 | + int n = g_list_length (g_pMainDock->icons); |
3595 | + if (n > 0) |
3596 | + { |
3597 | + myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n-1) / 2); |
3598 | + if (CAIRO_DOCK_IS_SEPARATOR (myData.pCurrentIcon) && n > 1) |
3599 | + myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n+1) / 2); |
3600 | + } |
3601 | + } |
3602 | + if (myData.pCurrentDock->icons != NULL) |
3603 | + { |
3604 | + Icon *pNextIcon = cairo_dock_get_next_icon (myData.pCurrentDock->icons, myData.pCurrentIcon); |
3605 | + if (CAIRO_DOCK_IS_SEPARATOR (pNextIcon)) |
3606 | + pNextIcon = cairo_dock_get_next_icon (myData.pCurrentDock->icons, pNextIcon); |
3607 | + if (pNextIcon == NULL) // pas trouve ou bien 1ere icone. |
3608 | + { |
3609 | + pNextIcon = cairo_dock_get_first_icon (myData.pCurrentDock->icons); |
3610 | + } |
3611 | + |
3612 | + cd_debug ("on se deplace a gauche sur %s\n", pNextIcon ? pNextIcon->cName : "none"); |
3613 | + cd_do_change_current_icon (pNextIcon, myData.pCurrentDock); |
3614 | + } |
3615 | + } |
3616 | + } |
3617 | + else if (iKeyVal == GDK_Page_Down || iKeyVal == GDK_Page_Up || iKeyVal == GDK_Home || iKeyVal == GDK_End) |
3618 | + { |
3619 | + if (iModifierType & GDK_CONTROL_MASK) // changement de dock principal |
3620 | + { |
3621 | + gpointer data[4] = {myData.pCurrentDock, NULL, GINT_TO_POINTER (FALSE), NULL}; |
3622 | + cairo_dock_foreach_root_docks ((GFunc) _find_next_dock, data); |
3623 | + CairoDock *pNextDock = data[1]; |
3624 | + if (pNextDock == NULL) |
3625 | + pNextDock = data[3]; |
3626 | + if (pNextDock != NULL) |
3627 | + { |
3628 | + Icon *pNextIcon = NULL; |
3629 | + int n = g_list_length (pNextDock->icons); |
3630 | + if (n > 0) |
3631 | + { |
3632 | + pNextIcon = g_list_nth_data (pNextDock->icons, (n-1) / 2); |
3633 | + if (CAIRO_DOCK_IS_SEPARATOR (pNextIcon) && n > 1) |
3634 | + pNextIcon = g_list_nth_data (pNextDock->icons, (n+1) / 2); |
3635 | + } |
3636 | + cd_do_change_current_icon (pNextIcon, pNextDock); |
3637 | + } |
3638 | + } |
3639 | + |
3640 | + Icon *pIcon = (iKeyVal == GDK_Page_Up || iKeyVal == GDK_Home ? cairo_dock_get_first_icon (myData.pCurrentDock->icons) : cairo_dock_get_last_icon (myData.pCurrentDock->icons)); |
3641 | + cd_debug ("on se deplace a l'extremite sur %s\n", pIcon ? pIcon->cName : "none"); |
3642 | + cd_do_change_current_icon (pIcon, myData.pCurrentDock); |
3643 | + } |
3644 | + else if (string) /// utiliser l'unichar ... |
3645 | + { |
3646 | + cd_debug ("string:'%s'\n", string); |
3647 | + g_string_append_c (myData.sCurrentText, *string); |
3648 | + |
3649 | + cd_do_search_current_icon (FALSE); |
3650 | + } |
3651 | + |
3652 | + return CAIRO_DOCK_INTERCEPT_NOTIFICATION; |
3653 | +} |
3654 | + |
3655 | + |
3656 | +void cd_do_on_shortkey_nav (const char *keystring, gpointer data) |
3657 | +{ |
3658 | + if (! cd_do_session_is_running ()) |
3659 | + { |
3660 | + cd_do_open_session (); |
3661 | + } |
3662 | + else |
3663 | + { |
3664 | + cd_do_close_session (); |
3665 | + } |
3666 | +} |
3667 | + |
3668 | + |
3669 | +gboolean cd_do_update_container (gpointer pUserData, CairoContainer *pContainer, gboolean *bContinueAnimation) |
3670 | +{ |
3671 | + g_return_val_if_fail (!cd_do_session_is_off (), CAIRO_DOCK_LET_PASS_NOTIFICATION); |
3672 | + |
3673 | + if (myData.iMotionCount != 0) |
3674 | + { |
3675 | + myData.iMotionCount --; |
3676 | + double f = (double) myData.iMotionCount / 10; |
3677 | + cairo_dock_emit_motion_signal (CAIRO_DOCK (pContainer), |
3678 | + f * myData.iPrevMouseX + (1-f) * myData.iMouseX, |
3679 | + f * myData.iPrevMouseY + (1-f) * myData.iMouseY); |
3680 | + *bContinueAnimation = TRUE; |
3681 | + } |
3682 | + |
3683 | + int iDeltaT = cairo_dock_get_animation_delta_t (pContainer); |
3684 | + if (cd_do_session_is_closing ()) |
3685 | + { |
3686 | + //\___________________ animation de fermeture de la session (disparition des lettres ou du prompt). |
3687 | + myData.iCloseTime -= iDeltaT; |
3688 | + if (myData.iCloseTime <= 0) |
3689 | + cd_do_exit_session (); |
3690 | + else |
3691 | + *bContinueAnimation = TRUE; |
3692 | + cairo_dock_redraw_container (pContainer); |
3693 | + } |
3694 | + else if (cd_do_session_is_running ()) |
3695 | + { |
3696 | + //\___________________ animation du prompt. |
3697 | + myData.iPromptAnimationCount ++; |
3698 | + *bContinueAnimation = TRUE; |
3699 | + |
3700 | + cairo_dock_redraw_container (pContainer); |
3701 | + } |
3702 | + |
3703 | + return CAIRO_DOCK_LET_PASS_NOTIFICATION; |
3704 | +} |
3705 | + |
3706 | + |
3707 | +gboolean cd_do_check_icon_stopped (gpointer pUserData, Icon *pIcon) |
3708 | +{ |
3709 | + if (pIcon == myData.pCurrentIcon && ! myData.bIgnoreIconState) |
3710 | + { |
3711 | + cd_debug ("notre icone vient de se faire stopper\n"); |
3712 | + myData.pCurrentIcon = NULL; |
3713 | + myData.pCurrentDock = NULL; |
3714 | + |
3715 | + // eventuellement emuler un TAB pour trouver la suivante ... |
3716 | + } |
3717 | + |
3718 | + return CAIRO_DOCK_LET_PASS_NOTIFICATION; |
3719 | +} |
3720 | + |
3721 | + |
3722 | +static void _check_dock_is_active (gchar *cDockName, CairoDock *pDock, Window *data) |
3723 | +{ |
3724 | + Window xActiveWindow = data[0]; |
3725 | + if (GDK_WINDOW_XID (pDock->container.pWidget->window) == xActiveWindow) |
3726 | + data[1] = 1; |
3727 | +} |
3728 | +gboolean cd_do_check_active_dock (gpointer pUserData, Window *XActiveWindow) |
3729 | +{ |
3730 | + if (myData.sCurrentText == NULL || XActiveWindow == NULL) |
3731 | + return CAIRO_DOCK_LET_PASS_NOTIFICATION; |
3732 | + Window data[2] = {*XActiveWindow, 0}; |
3733 | + cairo_dock_foreach_docks ((GHFunc) _check_dock_is_active, data); |
3734 | + |
3735 | + if (data[1] == 0) |
3736 | + gtk_window_present (GTK_WINDOW (g_pMainDock->container.pWidget)); |
3737 | + return CAIRO_DOCK_LET_PASS_NOTIFICATION; |
3738 | +} |
3739 | + |
3740 | + |
3741 | +static void _render_cairo (CairoContainer *pContainer, cairo_t *pCairoContext) |
3742 | +{ |
3743 | + double fAlpha; |
3744 | + if (myData.iCloseTime != 0) // animation de fin |
3745 | + fAlpha = (double) myData.iCloseTime / myConfig.iCloseDuration; |
3746 | + else |
3747 | + fAlpha = 1.; |
3748 | + |
3749 | + if (myData.pArrowImage->pSurface != NULL) |
3750 | + { |
3751 | + double fFrameWidth = myData.pArrowImage->iWidth; |
3752 | + double fFrameHeight = myData.pArrowImage->iHeight; |
3753 | + |
3754 | + double fDockOffsetX, fDockOffsetY; // Offset du coin haut gauche du prompt. |
3755 | + if (pContainer->bIsHorizontal) |
3756 | + { |
3757 | + fDockOffsetX = (pContainer->iWidth - fFrameWidth) / 2; |
3758 | + fDockOffsetY = (pContainer->iHeight - fFrameHeight) / 2; |
3759 | + } |
3760 | + else |
3761 | + { |
3762 | + fDockOffsetY = (pContainer->iWidth - fFrameWidth) / 2; |
3763 | + fDockOffsetX = (pContainer->iHeight - fFrameHeight) / 2; |
3764 | + } |
3765 | + |
3766 | + fAlpha *= _alpha_prompt (myData.iPromptAnimationCount, s_iNbPromptAnimationSteps); |
3767 | + |
3768 | + if (fAlpha != 0) |
3769 | + { |
3770 | + cairo_translate (pCairoContext, fDockOffsetX, fDockOffsetY); |
3771 | + cairo_dock_draw_surface (pCairoContext, myData.pArrowImage->pSurface, fFrameWidth, fFrameHeight, pContainer->bDirectionUp, pContainer->bIsHorizontal, fAlpha); |
3772 | + } |
3773 | + } |
3774 | +} |
3775 | + |
3776 | +static void _render_opengl (CairoContainer *pContainer) |
3777 | +{ |
3778 | + double fAlpha; |
3779 | + if (myData.iCloseTime != 0) // animation de fin |
3780 | + fAlpha = (double) myData.iCloseTime / myConfig.iCloseDuration; |
3781 | + else |
3782 | + fAlpha = 1.; |
3783 | + |
3784 | + if (myData.pArrowImage->iTexture != 0) |
3785 | + { |
3786 | + double fFrameWidth = myData.pArrowImage->iWidth; |
3787 | + double fFrameHeight = myData.pArrowImage->iHeight; |
3788 | + |
3789 | + double fDockOffsetX, fDockOffsetY; // Offset du coin haut gauche du prompt. |
3790 | + fDockOffsetX = (pContainer->iWidth - fFrameWidth) / 2; |
3791 | + fDockOffsetY = (pContainer->iHeight - fFrameHeight) / 2; |
3792 | + |
3793 | + fAlpha *= _alpha_prompt (myData.iPromptAnimationCount, s_iNbPromptAnimationSteps); |
3794 | + |
3795 | + if (fAlpha != 0) |
3796 | + { |
3797 | + glPushMatrix (); |
3798 | + |
3799 | + cairo_dock_set_container_orientation_opengl (pContainer); |
3800 | + |
3801 | + glTranslatef (pContainer->iWidth/2, pContainer->iHeight/2, 0.); |
3802 | + |
3803 | + _cairo_dock_enable_texture (); |
3804 | + _cairo_dock_set_blend_alpha (); |
3805 | + |
3806 | + _cairo_dock_apply_texture_at_size_with_alpha (myData.pArrowImage->iTexture, fFrameWidth, fFrameHeight, fAlpha); |
3807 | + |
3808 | + _cairo_dock_disable_texture (); |
3809 | + |
3810 | + glPopMatrix(); |
3811 | + } |
3812 | + } |
3813 | +} |
3814 | + |
3815 | +gboolean cd_do_render (gpointer pUserData, CairoContainer *pContainer, cairo_t *pCairoContext) |
3816 | +{ |
3817 | + g_return_val_if_fail (!cd_do_session_is_off (), CAIRO_DOCK_LET_PASS_NOTIFICATION); |
3818 | + |
3819 | + if (pCairoContext != NULL) |
3820 | + { |
3821 | + _render_cairo (pContainer, pCairoContext); |
3822 | + } |
3823 | + else |
3824 | + { |
3825 | + _render_opengl (pContainer); |
3826 | + } |
3827 | + |
3828 | + return CAIRO_DOCK_LET_PASS_NOTIFICATION; |
3829 | +} |
3830 | |
3831 | === added file 'Remote-Control/src/applet-notifications.h' |
3832 | --- Remote-Control/src/applet-notifications.h 1970-01-01 00:00:00 +0000 |
3833 | +++ Remote-Control/src/applet-notifications.h 2010-09-16 01:10:06 +0000 |
3834 | @@ -0,0 +1,45 @@ |
3835 | +/** |
3836 | +* This file is a part of the Cairo-Dock project |
3837 | +* |
3838 | +* Copyright : (C) see the 'copyright' file. |
3839 | +* E-mail : see the 'copyright' file. |
3840 | +* |
3841 | +* This program is free software; you can redistribute it and/or |
3842 | +* modify it under the terms of the GNU General Public License |
3843 | +* as published by the Free Software Foundation; either version 3 |
3844 | +* of the License, or (at your option) any later version. |
3845 | +* |
3846 | +* This program is distributed in the hope that it will be useful, |
3847 | +* but WITHOUT ANY WARRANTY; without even the implied warranty of |
3848 | +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3849 | +* GNU General Public License for more details. |
3850 | +* You should have received a copy of the GNU General Public License |
3851 | +* along with this program. If not, see <http://www.gnu.org/licenses/>. |
3852 | +*/ |
3853 | + |
3854 | + |
3855 | +#ifndef __APPLET_NOTIFICATIONS__ |
3856 | +#define __APPLET_NOTIFICATIONS__ |
3857 | + |
3858 | +#include <cairo-dock.h> |
3859 | + |
3860 | + |
3861 | +gboolean cd_do_key_pressed (gpointer pUserData, CairoContainer *pContainer, guint iKeyVal, guint iModifierType, const gchar *string); |
3862 | + |
3863 | + |
3864 | +void cd_do_on_shortkey_nav (const char *keystring, gpointer data); |
3865 | + |
3866 | + |
3867 | +gboolean cd_do_update_container (gpointer pUserData, CairoContainer *pContainer, gboolean *bContinueAnimation); |
3868 | + |
3869 | + |
3870 | +gboolean cd_do_check_icon_stopped (gpointer pUserData, Icon *pIcon); |
3871 | + |
3872 | + |
3873 | +gboolean cd_do_check_active_dock (gpointer pUserData, Window *XActiveWindow); |
3874 | + |
3875 | + |
3876 | +gboolean cd_do_render (gpointer pUserData, CairoContainer *pContainer, cairo_t *pCairoContext); |
3877 | + |
3878 | + |
3879 | +#endif |
3880 | |
3881 | === added file 'Remote-Control/src/applet-session.c' |
3882 | --- Remote-Control/src/applet-session.c 1970-01-01 00:00:00 +0000 |
3883 | +++ Remote-Control/src/applet-session.c 2010-09-16 01:10:06 +0000 |
3884 | @@ -0,0 +1,154 @@ |
3885 | +/** |
3886 | +* This file is a part of the Cairo-Dock project |
3887 | +* |
3888 | +* Copyright : (C) see the 'copyright' file. |
3889 | +* E-mail : see the 'copyright' file. |
3890 | +* |
3891 | +* This program is free software; you can redistribute it and/or |
3892 | +* modify it under the terms of the GNU General Public License |
3893 | +* as published by the Free Software Foundation; either version 3 |
3894 | +* of the License, or (at your option) any later version. |
3895 | +* |
3896 | +* This program is distributed in the hope that it will be useful, |
3897 | +* but WITHOUT ANY WARRANTY; without even the implied warranty of |
3898 | +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3899 | +* GNU General Public License for more details. |
3900 | +* You should have received a copy of the GNU General Public License |
3901 | +* along with this program. If not, see <http://www.gnu.org/licenses/>. |
3902 | +*/ |
3903 | + |
3904 | +#include <stdlib.h> |
3905 | +#include <string.h> |
3906 | + |
3907 | +#include "applet-struct.h" |
3908 | +#include "applet-notifications.h" |
3909 | +#include "applet-icon-finder.h" |
3910 | +#include "applet-session.h" |
3911 | + |
3912 | + |
3913 | +void cd_do_open_session (void) |
3914 | +{ |
3915 | + if (cd_do_session_is_running ()) // session already running |
3916 | + return; |
3917 | + |
3918 | + // register to draw on dock. |
3919 | + /**if (cd_do_session_is_off ()) |
3920 | + { |
3921 | + cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock), |
3922 | + CAIRO_DOCK_UPDATE_DOCK, |
3923 | + (CairoDockNotificationFunc) cd_do_update_container, |
3924 | + CAIRO_DOCK_RUN_AFTER, NULL); |
3925 | + cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock), |
3926 | + CAIRO_DOCK_RENDER_DOCK, |
3927 | + (CairoDockNotificationFunc) cd_do_render, |
3928 | + CAIRO_DOCK_RUN_AFTER, NULL); |
3929 | + }*/ |
3930 | + |
3931 | + // wait for keyboard input. |
3932 | + cairo_dock_register_notification (CAIRO_DOCK_KEY_PRESSED, (CairoDockNotificationFunc) cd_do_key_pressed, CAIRO_DOCK_RUN_AFTER, NULL); |
3933 | + cairo_dock_register_notification (CAIRO_DOCK_STOP_ICON, (CairoDockNotificationFunc) cd_do_check_icon_stopped, CAIRO_DOCK_RUN_AFTER, NULL); |
3934 | + cairo_dock_register_notification (CAIRO_DOCK_WINDOW_ACTIVATED, (CairoDockNotificationFunc) cd_do_check_active_dock, CAIRO_DOCK_RUN_AFTER, NULL); |
3935 | + |
3936 | + myData.sCurrentText = g_string_sized_new (20); |
3937 | + myData.iPromptAnimationCount = 0; |
3938 | + if (myData.pArrowImage == NULL) |
3939 | + { |
3940 | + myData.pArrowImage = cairo_dock_create_image_buffer (MY_APPLET_SHARE_DATA_DIR"/arrows.svg", |
3941 | + g_pMainDock->iMaxDockHeight, |
3942 | + g_pMainDock->iMaxDockHeight, |
3943 | + CAIRO_DOCK_KEEP_RATIO); |
3944 | + } |
3945 | + |
3946 | + // set initial position. |
3947 | + myData.pCurrentDock = NULL; |
3948 | + myData.pCurrentIcon = NULL; |
3949 | + |
3950 | + CairoDock *pDock = g_pMainDock; |
3951 | + Icon *pIcon = NULL; |
3952 | + int n = g_list_length (g_pMainDock->icons); |
3953 | + if (n > 0) |
3954 | + { |
3955 | + pIcon = g_list_nth_data (pDock->icons, (n-1) / 2); |
3956 | + if (CAIRO_DOCK_IS_SEPARATOR (pIcon) && n > 1) |
3957 | + pIcon = g_list_nth_data (pDock->icons, (n+1) / 2); |
3958 | + } |
3959 | + cd_do_change_current_icon (pIcon, pDock); |
3960 | + |
3961 | + // show main dock. |
3962 | + myData.bIgnoreIconState = TRUE; |
3963 | + cairo_dock_emit_enter_signal (CAIRO_CONTAINER (g_pMainDock)); |
3964 | + myData.bIgnoreIconState = FALSE; |
3965 | + |
3966 | + // give focus to main dock for inputs. |
3967 | + myData.iPreviouslyActiveWindow = cairo_dock_get_active_xwindow (); |
3968 | + |
3969 | + ///gtk_window_present (GTK_WINDOW (g_pMainDock->container.pWidget)); |
3970 | + gtk_window_present_with_time (GTK_WINDOW (g_pMainDock->container.pWidget), gdk_x11_get_server_time (g_pMainDock->container.pWidget->window)); // pour eviter la prevention du vol de focus. |
3971 | + cairo_dock_freeze_docks (TRUE); |
3972 | + |
3973 | + // launch animation. |
3974 | + cairo_dock_launch_animation (CAIRO_CONTAINER (g_pMainDock)); |
3975 | + |
3976 | + myData.iSessionState = 2; |
3977 | +} |
3978 | + |
3979 | +void cd_do_close_session (void) |
3980 | +{ |
3981 | + if (! cd_do_session_is_running ()) // session not running |
3982 | + return; |
3983 | + |
3984 | + // no more keyboard input. |
3985 | + cairo_dock_remove_notification_func (CAIRO_DOCK_KEY_PRESSED, (CairoDockNotificationFunc) cd_do_key_pressed, NULL); |
3986 | + cairo_dock_remove_notification_func (CAIRO_DOCK_STOP_ICON, (CairoDockNotificationFunc) cd_do_check_icon_stopped, NULL); |
3987 | + cairo_dock_remove_notification_func (CAIRO_DOCK_WINDOW_ACTIVATED, (CairoDockNotificationFunc) cd_do_check_active_dock, NULL); |
3988 | + |
3989 | + g_string_free (myData.sCurrentText, TRUE); |
3990 | + myData.sCurrentText = NULL; |
3991 | + |
3992 | + // give back focus. |
3993 | + if (myData.iPreviouslyActiveWindow != 0) |
3994 | + { |
3995 | + // ne le faire que si on a encore le focus, sinon c'est que l'utilisateur a change lui-meme de fenetre... |
3996 | + Window iActiveWindow = cairo_dock_get_active_xwindow (); |
3997 | + if (myData.pCurrentDock && iActiveWindow == GDK_WINDOW_XID (myData.pCurrentDock->container.pWidget->window)) |
3998 | + cairo_dock_show_xwindow (myData.iPreviouslyActiveWindow); |
3999 | + |
4000 | + myData.iPreviouslyActiveWindow = 0; |
4001 | + } |
4002 | + |
4003 | + // reset session state. |
4004 | + if (myData.pCurrentIcon != NULL) |
4005 | + { |
4006 | + myData.bIgnoreIconState = TRUE; |
4007 | + cairo_dock_stop_icon_animation (myData.pCurrentIcon); |
4008 | + myData.bIgnoreIconState = FALSE; |
4009 | + myData.pCurrentIcon = NULL; |
4010 | + } |
4011 | + |
4012 | + if (myData.pCurrentDock != NULL) |
4013 | + { |
4014 | + cairo_dock_emit_leave_signal (CAIRO_CONTAINER (myData.pCurrentDock)); |
4015 | + } |
4016 | + |
4017 | + // launch closing animation. |
4018 | + myData.iCloseTime = myConfig.iCloseDuration; |
4019 | + cairo_dock_launch_animation (CAIRO_CONTAINER (g_pMainDock)); |
4020 | + cairo_dock_freeze_docks (FALSE); |
4021 | + |
4022 | + myData.iSessionState = 1; |
4023 | +} |
4024 | + |
4025 | + |
4026 | +void cd_do_exit_session (void) |
4027 | +{ |
4028 | + if (cd_do_session_is_off ()) // session already off |
4029 | + return; |
4030 | + |
4031 | + cd_do_close_session (); |
4032 | + |
4033 | + myData.iCloseTime = 0; |
4034 | + |
4035 | + cd_do_change_current_icon (NULL, NULL); |
4036 | + |
4037 | + myData.iSessionState = 0; |
4038 | +} |
4039 | |
4040 | === added file 'Remote-Control/src/applet-session.h' |
4041 | --- Remote-Control/src/applet-session.h 1970-01-01 00:00:00 +0000 |
4042 | +++ Remote-Control/src/applet-session.h 2010-09-16 01:10:06 +0000 |
4043 | @@ -0,0 +1,38 @@ |
4044 | +/** |
4045 | +* This file is a part of the Cairo-Dock project |
4046 | +* |
4047 | +* Copyright : (C) see the 'copyright' file. |
4048 | +* E-mail : see the 'copyright' file. |
4049 | +* |
4050 | +* This program is free software; you can redistribute it and/or |
4051 | +* modify it under the terms of the GNU General Public License |
4052 | +* as published by the Free Software Foundation; either version 3 |
4053 | +* of the License, or (at your option) any later version. |
4054 | +* |
4055 | +* This program is distributed in the hope that it will be useful, |
4056 | +* but WITHOUT ANY WARRANTY; without even the implied warranty of |
4057 | +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4058 | +* GNU General Public License for more details. |
4059 | +* You should have received a copy of the GNU General Public License |
4060 | +* along with this program. If not, see <http://www.gnu.org/licenses/>. |
4061 | +*/ |
4062 | + |
4063 | +#ifndef __APPLET_SESSION__ |
4064 | +#define __APPLET_SESSION__ |
4065 | + |
4066 | +#include <cairo-dock.h> |
4067 | +#include "applet-struct.h" |
4068 | + |
4069 | + |
4070 | +void cd_do_open_session (void); |
4071 | + |
4072 | +void cd_do_close_session (void); |
4073 | + |
4074 | +void cd_do_exit_session (void); |
4075 | + |
4076 | +#define cd_do_session_is_running(...) (myData.iSessionState == 2) |
4077 | +#define cd_do_session_is_closing(...) (myData.iSessionState == 1) |
4078 | +#define cd_do_session_is_off(...) (myData.iSessionState == 0) |
4079 | + |
4080 | + |
4081 | +#endif |
4082 | |
4083 | === added file 'Remote-Control/src/applet-struct.h' |
4084 | --- Remote-Control/src/applet-struct.h 1970-01-01 00:00:00 +0000 |
4085 | +++ Remote-Control/src/applet-struct.h 2010-09-16 01:10:06 +0000 |
4086 | @@ -0,0 +1,51 @@ |
4087 | +/** |
4088 | +* This file is a part of the Cairo-Dock project |
4089 | +* |
4090 | +* Copyright : (C) see the 'copyright' file. |
4091 | +* E-mail : see the 'copyright' file. |
4092 | +* |
4093 | +* This program is free software; you can redistribute it and/or |
4094 | +* modify it under the terms of the GNU General Public License |
4095 | +* as published by the Free Software Foundation; either version 3 |
4096 | +* of the License, or (at your option) any later version. |
4097 | +* |
4098 | +* This program is distributed in the hope that it will be useful, |
4099 | +* but WITHOUT ANY WARRANTY; without even the implied warranty of |
4100 | +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4101 | +* GNU General Public License for more details. |
4102 | +* You should have received a copy of the GNU General Public License |
4103 | +* along with this program. If not, see <http://www.gnu.org/licenses/>. |
4104 | +*/ |
4105 | + |
4106 | + |
4107 | +#ifndef __CD_APPLET_STRUCT__ |
4108 | +#define __CD_APPLET_STRUCT__ |
4109 | + |
4110 | +#include <cairo-dock.h> |
4111 | + |
4112 | +//\___________ structure containing the applet's configuration parameters. |
4113 | +struct _AppletConfig { |
4114 | + gchar *cShortkeyNav; |
4115 | + gchar *cIconAnimation; |
4116 | + gint iCloseDuration; |
4117 | + } ; |
4118 | + |
4119 | +//\___________ structure containing the applet's data, like surfaces, dialogs, results of calculus, etc. |
4120 | +struct _AppletData { |
4121 | + gint iSessionState; // 0:no session, 1: session closing, 2: session running |
4122 | + GString *sCurrentText; |
4123 | + CairoDockImageBuffer *pArrowImage; |
4124 | + gint iPromptAnimationCount; |
4125 | + gint iCloseTime; |
4126 | + Window iPreviouslyActiveWindow; |
4127 | + Icon *pCurrentIcon; |
4128 | + CairoDock *pCurrentDock; |
4129 | + gboolean bIgnoreIconState; |
4130 | + |
4131 | + int iPrevMouseX, iPrevMouseY; |
4132 | + int iMouseX, iMouseY; |
4133 | + int iMotionCount; |
4134 | + } ; |
4135 | + |
4136 | + |
4137 | +#endif |
4138 | |
4139 | === modified file 'Scooby-Do/data/CMakeLists.txt' |
4140 | --- Scooby-Do/data/CMakeLists.txt 2010-08-07 01:43:25 +0000 |
4141 | +++ Scooby-Do/data/CMakeLists.txt 2010-09-16 01:10:06 +0000 |
4142 | @@ -9,7 +9,6 @@ |
4143 | install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Scooby-Do.conf |
4144 | preview.jpg |
4145 | icon.png |
4146 | - arrows.svg |
4147 | active-button.svg |
4148 | inactive-button.svg |
4149 | internet.png |
4150 | |
4151 | === modified file 'Scooby-Do/data/Scooby-Do.conf.in' |
4152 | --- Scooby-Do/data/Scooby-Do.conf.in 2010-08-07 01:43:25 +0000 |
4153 | +++ Scooby-Do/data/Scooby-Do.conf.in 2010-09-16 01:10:06 +0000 |
4154 | @@ -6,9 +6,6 @@ |
4155 | #k Shortkey to enable/disable the finder mode: |
4156 | shortkey search = <Control>Return |
4157 | |
4158 | -#k Shortkey to enable/disable the navigation mode: |
4159 | -shortkey = <Control>F9 |
4160 | - |
4161 | #i[10;200] Maximum number of results : |
4162 | #{Maximum number of mails that will be previewed. Put -1 to show the maximum possible.} |
4163 | nb results = 80 |
4164 | |
4165 | === removed file 'Scooby-Do/data/arrows.svg' |
4166 | --- Scooby-Do/data/arrows.svg 2009-10-05 19:27:17 +0000 |
4167 | +++ Scooby-Do/data/arrows.svg 1970-01-01 00:00:00 +0000 |
4168 | @@ -1,289 +0,0 @@ |
4169 | -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
4170 | -<!-- Created with Inkscape (http://www.inkscape.org/) --> |
4171 | -<svg |
4172 | - xmlns:dc="http://purl.org/dc/elements/1.1/" |
4173 | - xmlns:cc="http://creativecommons.org/ns#" |
4174 | - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
4175 | - xmlns:svg="http://www.w3.org/2000/svg" |
4176 | - xmlns="http://www.w3.org/2000/svg" |
4177 | - xmlns:xlink="http://www.w3.org/1999/xlink" |
4178 | - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
4179 | - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
4180 | - width="128" |
4181 | - height="128" |
4182 | - id="svg2391" |
4183 | - sodipodi:version="0.32" |
4184 | - inkscape:version="0.46" |
4185 | - version="1.0" |
4186 | - sodipodi:docname="arrows.svg" |
4187 | - inkscape:output_extension="org.inkscape.output.svg.inkscape"> |
4188 | - <defs |
4189 | - id="defs2393"> |
4190 | - <linearGradient |
4191 | - id="linearGradient2076"> |
4192 | - <stop |
4193 | - id="stop2078" |
4194 | - offset="0.0000000" |
4195 | - style="stop-color:#afd9ed;stop-opacity:1.0000000;" /> |
4196 | - <stop |
4197 | - id="stop2080" |
4198 | - offset="1.0000000" |
4199 | - style="stop-color:#cfc3db;stop-opacity:1.0000000;" /> |
4200 | - </linearGradient> |
4201 | - <linearGradient |
4202 | - gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)" |
4203 | - gradientUnits="userSpaceOnUse" |
4204 | - id="linearGradient2082" |
4205 | - x1="12.615197" |
4206 | - x2="48.374069" |
4207 | - xlink:href="#linearGradient2076" |
4208 | - y1="25.909756" |
4209 | - y2="62.720371" /> |
4210 | - <linearGradient |
4211 | - id="linearGradient2088"> |
4212 | - <stop |
4213 | - id="stop2090" |
4214 | - offset="0.0000000" |
4215 | - style="stop-color:#87a8b7;stop-opacity:1.0000000;" /> |
4216 | - <stop |
4217 | - id="stop2092" |
4218 | - offset="1.0000000" |
4219 | - style="stop-color:#7f718e;stop-opacity:1.0000000;" /> |
4220 | - </linearGradient> |
4221 | - <linearGradient |
4222 | - gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)" |
4223 | - gradientUnits="userSpaceOnUse" |
4224 | - id="linearGradient2086" |
4225 | - x1="12.615197" |
4226 | - x2="48.374069" |
4227 | - xlink:href="#linearGradient2088" |
4228 | - y1="25.909756" |
4229 | - y2="62.720371" /> |
4230 | - <inkscape:perspective |
4231 | - sodipodi:type="inkscape:persp3d" |
4232 | - inkscape:vp_x="0 : 526.18109 : 1" |
4233 | - inkscape:vp_y="0 : 1000 : 0" |
4234 | - inkscape:vp_z="744.09448 : 526.18109 : 1" |
4235 | - inkscape:persp3d-origin="372.04724 : 350.78739 : 1" |
4236 | - id="perspective2399" /> |
4237 | - <linearGradient |
4238 | - inkscape:collect="always" |
4239 | - xlink:href="#linearGradient2088" |
4240 | - id="linearGradient2420" |
4241 | - gradientUnits="userSpaceOnUse" |
4242 | - gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)" |
4243 | - x1="12.615197" |
4244 | - y1="25.909756" |
4245 | - x2="48.374069" |
4246 | - y2="62.720371" /> |
4247 | - <linearGradient |
4248 | - inkscape:collect="always" |
4249 | - xlink:href="#linearGradient2076" |
4250 | - id="linearGradient2422" |
4251 | - gradientUnits="userSpaceOnUse" |
4252 | - gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)" |
4253 | - x1="12.615197" |
4254 | - y1="25.909756" |
4255 | - x2="48.374069" |
4256 | - y2="62.720371" /> |
4257 | - <linearGradient |
4258 | - inkscape:collect="always" |
4259 | - xlink:href="#linearGradient2088" |
4260 | - id="linearGradient2434" |
4261 | - gradientUnits="userSpaceOnUse" |
4262 | - gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)" |
4263 | - x1="12.615197" |
4264 | - y1="25.909756" |
4265 | - x2="48.374069" |
4266 | - y2="62.720371" /> |
4267 | - <linearGradient |
4268 | - inkscape:collect="always" |
4269 | - xlink:href="#linearGradient2076" |
4270 | - id="linearGradient2436" |
4271 | - gradientUnits="userSpaceOnUse" |
4272 | - gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)" |
4273 | - x1="12.615197" |
4274 | - y1="25.909756" |
4275 | - x2="48.374069" |
4276 | - y2="62.720371" /> |
4277 | - <linearGradient |
4278 | - inkscape:collect="always" |
4279 | - xlink:href="#linearGradient2088" |
4280 | - id="linearGradient2448" |
4281 | - gradientUnits="userSpaceOnUse" |
4282 | - gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)" |
4283 | - x1="12.615197" |
4284 | - y1="25.909756" |
4285 | - x2="48.374069" |
4286 | - y2="62.720371" /> |
4287 | - <linearGradient |
4288 | - inkscape:collect="always" |
4289 | - xlink:href="#linearGradient2076" |
4290 | - id="linearGradient2450" |
4291 | - gradientUnits="userSpaceOnUse" |
4292 | - gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)" |
4293 | - x1="12.615197" |
4294 | - y1="25.909756" |
4295 | - x2="48.374069" |
4296 | - y2="62.720371" /> |
4297 | - <linearGradient |
4298 | - inkscape:collect="always" |
4299 | - xlink:href="#linearGradient2088" |
4300 | - id="linearGradient2462" |
4301 | - gradientUnits="userSpaceOnUse" |
4302 | - gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)" |
4303 | - x1="12.615197" |
4304 | - y1="25.909756" |
4305 | - x2="48.374069" |
4306 | - y2="62.720371" /> |
4307 | - <linearGradient |
4308 | - inkscape:collect="always" |
4309 | - xlink:href="#linearGradient2076" |
4310 | - id="linearGradient2464" |
4311 | - gradientUnits="userSpaceOnUse" |
4312 | - gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)" |
4313 | - x1="12.615197" |
4314 | - y1="25.909756" |
4315 | - x2="48.374069" |
4316 | - y2="62.720371" /> |
4317 | - </defs> |
4318 | - <sodipodi:namedview |
4319 | - id="base" |
4320 | - pagecolor="#ffffff" |
4321 | - bordercolor="#666666" |
4322 | - borderopacity="1.0" |
4323 | - inkscape:pageopacity="0.0" |
4324 | - inkscape:pageshadow="2" |
4325 | - inkscape:zoom="1.3277206" |
4326 | - inkscape:cx="117.47785" |
4327 | - inkscape:cy="-15.977159" |
4328 | - inkscape:document-units="px" |
4329 | - inkscape:current-layer="layer1" |
4330 | - showgrid="false" |
4331 | - showguides="true" |
4332 | - inkscape:guide-bbox="true" |
4333 | - inkscape:window-width="641" |
4334 | - inkscape:window-height="719" |
4335 | - inkscape:window-x="293" |
4336 | - inkscape:window-y="0" /> |
4337 | - <metadata |
4338 | - id="metadata2396"> |
4339 | - <rdf:RDF> |
4340 | - <cc:Work |
4341 | - rdf:about=""> |
4342 | - <dc:format>image/svg+xml</dc:format> |
4343 | - <dc:type |
4344 | - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
4345 | - </cc:Work> |
4346 | - </rdf:RDF> |
4347 | - </metadata> |
4348 | - <g |
4349 | - inkscape:label="Calque 1" |
4350 | - inkscape:groupmode="layer" |
4351 | - id="layer1"> |
4352 | - <g |
4353 | - id="g2409" |
4354 | - transform="matrix(0,0.8161651,-1.764176,0,125.43391,77.398373)"> |
4355 | - <path |
4356 | - d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z" |
4357 | - id="path2084" |
4358 | - style="fill:url(#linearGradient2420);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
4359 | - <path |
4360 | - d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z" |
4361 | - id="rect1303" |
4362 | - style="fill:url(#linearGradient2422);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
4363 | - <path |
4364 | - d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z" |
4365 | - id="path2096" |
4366 | - style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> |
4367 | - <rect |
4368 | - height="1" |
4369 | - id="rect2098" |
4370 | - rx="0.5" |
4371 | - ry="0.5" |
4372 | - style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" |
4373 | - transform="scale(-1,-1)" |
4374 | - width="23" |
4375 | - x="-27.270832" |
4376 | - y="-28" /> |
4377 | - </g> |
4378 | - <g |
4379 | - id="g2424" |
4380 | - transform="matrix(0,-0.8161651,-1.6782543,0,122.04356,52.382073)"> |
4381 | - <path |
4382 | - d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z" |
4383 | - id="path2426" |
4384 | - style="fill:url(#linearGradient2434);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
4385 | - <path |
4386 | - d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z" |
4387 | - id="path2428" |
4388 | - style="fill:url(#linearGradient2436);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
4389 | - <path |
4390 | - d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z" |
4391 | - id="path2430" |
4392 | - style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> |
4393 | - <rect |
4394 | - height="1" |
4395 | - id="rect2432" |
4396 | - rx="0.5" |
4397 | - ry="0.5" |
4398 | - style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" |
4399 | - transform="scale(-1,-1)" |
4400 | - width="23" |
4401 | - x="-27.270832" |
4402 | - y="-28" /> |
4403 | - </g> |
4404 | - <g |
4405 | - id="g2438" |
4406 | - transform="matrix(-0.8161651,0,0,-1.6496137,51.134197,122.05924)"> |
4407 | - <path |
4408 | - d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z" |
4409 | - id="path2440" |
4410 | - style="fill:url(#linearGradient2448);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
4411 | - <path |
4412 | - d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z" |
4413 | - id="path2442" |
4414 | - style="fill:url(#linearGradient2450);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
4415 | - <path |
4416 | - d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z" |
4417 | - id="path2444" |
4418 | - style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> |
4419 | - <rect |
4420 | - height="1" |
4421 | - id="rect2446" |
4422 | - rx="0.5" |
4423 | - ry="0.5" |
4424 | - style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" |
4425 | - transform="scale(-1,-1)" |
4426 | - width="23" |
4427 | - x="-27.270832" |
4428 | - y="-28" /> |
4429 | - </g> |
4430 | - <g |
4431 | - id="g2452" |
4432 | - transform="matrix(0.8161651,0,0,-1.6496137,77.748214,121.52667)"> |
4433 | - <path |
4434 | - d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z" |
4435 | - id="path2454" |
4436 | - style="fill:url(#linearGradient2462);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
4437 | - <path |
4438 | - d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z" |
4439 | - id="path2456" |
4440 | - style="fill:url(#linearGradient2464);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" /> |
4441 | - <path |
4442 | - d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z" |
4443 | - id="path2458" |
4444 | - style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> |
4445 | - <rect |
4446 | - height="1" |
4447 | - id="rect2460" |
4448 | - rx="0.5" |
4449 | - ry="0.5" |
4450 | - style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" |
4451 | - transform="scale(-1,-1)" |
4452 | - width="23" |
4453 | - x="-27.270832" |
4454 | - y="-28" /> |
4455 | - </g> |
4456 | - </g> |
4457 | -</svg> |
4458 | |
4459 | === removed file 'Scooby-Do/data/messages' |
4460 | --- Scooby-Do/data/messages 2010-08-07 01:43:25 +0000 |
4461 | +++ Scooby-Do/data/messages 1970-01-01 00:00:00 +0000 |
4462 | @@ -1,118 +0,0 @@ |
4463 | -_("Configuration") |
4464 | - |
4465 | -_("Shortkey to enable/disable the finder mode:") |
4466 | - |
4467 | -_("Shortkey to enable/disable the navigation mode:") |
4468 | - |
4469 | -_("Maximum number of mails that will be previewed. Put -1 to show the maximum possible.") |
4470 | - |
4471 | -_("Maximum number of results :") |
4472 | - |
4473 | -_("Number of lines of the listing. If there are more results, the listing will scroll when you go up or down with the arrows.") |
4474 | - |
4475 | -_("Number of lines to display :") |
4476 | - |
4477 | -_("Animations") |
4478 | - |
4479 | -_("In ms.") |
4480 | - |
4481 | -_("Duration of the appearance animation :") |
4482 | - |
4483 | -_("In ms.") |
4484 | - |
4485 | -_("Duration of the stop animation :") |
4486 | - |
4487 | -_("Animation of the current icon :") |
4488 | - |
4489 | -_("Is detached from the dock") |
4490 | - |
4491 | -_("Font used to display what you type:") |
4492 | - |
4493 | -_("Color of the text's frame :") |
4494 | - |
4495 | -_("Font size, relative to the dock size:") |
4496 | - |
4497 | -_("between 1 and 9, the higher, the bigger.") |
4498 | - |
4499 | -_("Text size:") |
4500 | - |
4501 | -_("Outline text?") |
4502 | - |
4503 | -_("Text colour:") |
4504 | - |
4505 | -_("Character background colour:") |
4506 | - |
4507 | -_("Write text on the top of the dock?") |
4508 | - |
4509 | -_("Favorite applications") |
4510 | - |
4511 | -_("FAvorite applications starting with 'a' :") |
4512 | - |
4513 | -_("Favorite application starting with 'b' :") |
4514 | - |
4515 | -_("Favorite application(s) starting with 'c' :") |
4516 | - |
4517 | -_("Favorite application(s starting with 'd' :") |
4518 | - |
4519 | -_("Favorite application(s) starting with 'e' :") |
4520 | - |
4521 | -_("Favorite application(s) starting with 'f' :") |
4522 | - |
4523 | -_("Favorite application(s) starting with 'g' :") |
4524 | - |
4525 | -_("Favorite application(s) starting with 'h' :") |
4526 | - |
4527 | -_("Favorite application(s) starting with 'i' :") |
4528 | - |
4529 | -_("Favorite application(s) starting with 'j' :") |
4530 | - |
4531 | -_("Favorite application(s) starting with 'k' :") |
4532 | - |
4533 | -_("Favorite application(s) starting with 'l' :") |
4534 | - |
4535 | -_("Favorite application(s) starting with 'm' :") |
4536 | - |
4537 | -_("Favorite application(s) starting with 'n' :") |
4538 | - |
4539 | -_("Favorite application(s) starting with 'o' :") |
4540 | - |
4541 | -_("Favorite application(s) starting with 'p' :") |
4542 | - |
4543 | -_("Favorite application(s) starting with 'q' :") |
4544 | - |
4545 | -_("Favorite application(s) starting with 'r' :") |
4546 | - |
4547 | -_("Favorite application(s) starting with 's' :") |
4548 | - |
4549 | -_("Favorite application(s) starting with 't' :") |
4550 | - |
4551 | -_("Favorite application(s) starting with 'u' :") |
4552 | - |
4553 | -_("Favorite application(s) starting with 'v' :") |
4554 | - |
4555 | -_("Favorite application(s) starting with 'w' :") |
4556 | - |
4557 | -_("Favorite application(s) starting with 'x' :") |
4558 | - |
4559 | -_("Favorite application(s) starting with 'y' :") |
4560 | - |
4561 | -_("Favorite application(s) starting with 'z' :") |
4562 | - |
4563 | -_("Start XPenguins") |
4564 | - |
4565 | -_("Show hidden files?") |
4566 | - |
4567 | -_("Firefox bookmarks") |
4568 | - |
4569 | -_("Recent files") |
4570 | - |
4571 | -_("Propose some web search engines ?") |
4572 | - |
4573 | -_("It can launch commands and even do some calculations.") |
4574 | - |
4575 | -_("Enter a command to launch:") |
4576 | - |
4577 | -_("Help") |
4578 | - |
4579 | -_("Applet's Handbook") |
4580 | - |
4581 | |
4582 | === modified file 'Scooby-Do/src/applet-appli-finder.h' |
4583 | --- Scooby-Do/src/applet-appli-finder.h 2009-10-05 19:27:17 +0000 |
4584 | +++ Scooby-Do/src/applet-appli-finder.h 2010-09-16 01:10:06 +0000 |
4585 | @@ -17,11 +17,9 @@ |
4586 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4587 | */ |
4588 | |
4589 | - |
4590 | #ifndef __APPLET_APPLI_FINDER__ |
4591 | #define __APPLET_APPLI_FINDER__ |
4592 | |
4593 | - |
4594 | #include <cairo-dock.h> |
4595 | #include "applet-struct.h" |
4596 | |
4597 | |
4598 | === modified file 'Scooby-Do/src/applet-config.c' |
4599 | --- Scooby-Do/src/applet-config.c 2010-08-07 01:43:25 +0000 |
4600 | +++ Scooby-Do/src/applet-config.c 2010-09-16 01:10:06 +0000 |
4601 | @@ -60,7 +60,6 @@ |
4602 | |
4603 | //\_________________ Here you have to get all your parameters from the conf file. Use the macros CD_CONFIG_GET_BOOLEAN, CD_CONFIG_GET_INTEGER, CD_CONFIG_GET_STRING, etc. myConfig has been reseted to 0 at this point. This function is called at the beginning of init and reload. |
4604 | CD_APPLET_GET_CONFIG_BEGIN |
4605 | - myConfig.cShortkeyNav = CD_CONFIG_GET_STRING ("Configuration", "shortkey"); |
4606 | myConfig.cShortkeySearch = CD_CONFIG_GET_STRING ("Configuration", "shortkey search"); |
4607 | myConfig.iAppearanceDuration = CD_CONFIG_GET_INTEGER ("Configuration", "appear duration"); |
4608 | myConfig.iCloseDuration = CD_CONFIG_GET_INTEGER ("Configuration", "stop duration"); |
4609 | @@ -126,10 +125,6 @@ |
4610 | |
4611 | //\_________________ Here you have to free all ressources allocated for myConfig. This one will be reseted to 0 at the end of this function. This function is called right before you get the applet's config, and when your applet is stopped, in the end. |
4612 | CD_APPLET_RESET_CONFIG_BEGIN |
4613 | - //g_print ("%s / %s\n", myConfig.cShortkeyNav, myConfig.cShortkeySearch); |
4614 | - if (myConfig.cShortkeyNav) |
4615 | - cd_keybinder_unbind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav); |
4616 | - g_free (myConfig.cShortkeyNav); |
4617 | if (myConfig.cShortkeySearch) |
4618 | cd_keybinder_unbind (myConfig.cShortkeySearch, (CDBindkeyHandler) cd_do_on_shortkey_search); |
4619 | g_free (myConfig.cShortkeySearch); |
4620 | @@ -154,10 +149,6 @@ |
4621 | cairo_surface_destroy (myData.pPromptSurface); |
4622 | if (myData.iPromptTexture != 0) |
4623 | _cairo_dock_delete_texture (myData.iPromptTexture); |
4624 | - if (myData.pArrowSurface != NULL) |
4625 | - cairo_surface_destroy (myData.pArrowSurface); |
4626 | - if (myData.iArrowTexture != 0) |
4627 | - _cairo_dock_delete_texture (myData.iArrowTexture); |
4628 | if (myData.pScoobySurface != NULL) |
4629 | cairo_surface_destroy (myData.pScoobySurface); |
4630 | if (myData.pActiveButtonSurface != NULL) |
4631 | |
4632 | === modified file 'Scooby-Do/src/applet-draw.c' |
4633 | --- Scooby-Do/src/applet-draw.c 2010-08-07 01:43:25 +0000 |
4634 | +++ Scooby-Do/src/applet-draw.c 2010-09-16 01:10:06 +0000 |
4635 | @@ -91,7 +91,7 @@ |
4636 | |
4637 | if (myData.pCharList == NULL && myData.pListingHistory == NULL) // aucune lettre de tapee => on montre le prompt. |
4638 | { |
4639 | - if (! myData.bNavigationMode && myData.pPromptSurface != NULL) |
4640 | + if (myData.pPromptSurface != NULL) |
4641 | { |
4642 | double fFrameWidth = myData.iPromptWidth; |
4643 | double fFrameHeight = myData.iPromptHeight; |
4644 | @@ -105,30 +105,11 @@ |
4645 | if (fAlpha != 0) |
4646 | { |
4647 | cairo_translate (pCairoContext, fDockOffsetX, fDockOffsetY); |
4648 | - cairo_dock_draw_surface (pCairoContext, myData.pArrowSurface, fFrameWidth, fFrameHeight, pMainDock->container.bDirectionUp, pMainDock->container.bIsHorizontal, fAlpha); |
4649 | + cairo_dock_draw_surface (pCairoContext, myData.pPromptSurface, fFrameWidth, fFrameHeight, pMainDock->container.bDirectionUp, pMainDock->container.bIsHorizontal, fAlpha); |
4650 | //cairo_set_source_surface (pCairoContext, myData.pPromptSurface, 0., 0.); |
4651 | //cairo_paint_with_alpha (pCairoContext, fAlpha); |
4652 | } |
4653 | } |
4654 | - else if (myData.bNavigationMode && myData.pArrowSurface != NULL) |
4655 | - { |
4656 | - double fFrameWidth = myData.iArrowWidth; |
4657 | - double fFrameHeight = myData.iArrowHeight; |
4658 | - |
4659 | - double fDockOffsetX, fDockOffsetY; // Offset du coin haut gauche du prompt. |
4660 | - fDockOffsetX = (pMainDock->container.iWidth - fFrameWidth) / 2; |
4661 | - fDockOffsetY = (pMainDock->container.iHeight - fFrameHeight) / 2; |
4662 | - |
4663 | - fAlpha *= _alpha_prompt (myData.iPromptAnimationCount, s_iNbPromptAnimationSteps); |
4664 | - |
4665 | - if (fAlpha != 0) |
4666 | - { |
4667 | - cairo_translate (pCairoContext, fDockOffsetX, fDockOffsetY); |
4668 | - cairo_dock_draw_surface (pCairoContext, myData.pArrowSurface, fFrameWidth, fFrameHeight, pMainDock->container.bDirectionUp, pMainDock->container.bIsHorizontal, fAlpha); |
4669 | - //cairo_set_source_surface (pCairoContext, myData.pArrowSurface, 0., 0.); |
4670 | - //cairo_paint_with_alpha (pCairoContext, fAlpha); |
4671 | - } |
4672 | - } |
4673 | } |
4674 | else // si du texte a ete entre, on le dessine, ainsi que eventuellement la liste des icones correspondantes. |
4675 | { |
4676 | @@ -282,7 +263,7 @@ |
4677 | |
4678 | if (myData.pCharList == NULL && myData.pListingHistory == NULL) // aucune lettre de tapee => on montre le prompt. |
4679 | { |
4680 | - if (! myData.bNavigationMode && myData.iPromptTexture != 0) |
4681 | + if (myData.iPromptTexture != 0) |
4682 | { |
4683 | double fFrameWidth = myData.iPromptWidth; |
4684 | double fFrameHeight = myData.iPromptHeight; |
4685 | @@ -310,34 +291,6 @@ |
4686 | glPopMatrix(); |
4687 | } |
4688 | } |
4689 | - else if (myData.bNavigationMode && myData.iArrowTexture != 0) |
4690 | - { |
4691 | - double fFrameWidth = myData.iArrowWidth; |
4692 | - double fFrameHeight = myData.iArrowHeight; |
4693 | - |
4694 | - double fDockOffsetX, fDockOffsetY; // Offset du coin haut gauche du prompt. |
4695 | - fDockOffsetX = (pMainDock->container.iWidth - fFrameWidth) / 2; |
4696 | - fDockOffsetY = (pMainDock->container.iHeight - fFrameHeight) / 2; |
4697 | - |
4698 | - fAlpha *= _alpha_prompt (myData.iPromptAnimationCount, s_iNbPromptAnimationSteps); |
4699 | - |
4700 | - if (fAlpha != 0) |
4701 | - { |
4702 | - glPushMatrix (); |
4703 | - if (! pMainDock->container.bIsHorizontal) |
4704 | - glRotatef (pMainDock->container.bDirectionUp ? 90. : -90., 0., 0., 1.); |
4705 | - glTranslatef (pMainDock->container.iWidth/2, pMainDock->container.iHeight/2, 0.); |
4706 | - |
4707 | - _cairo_dock_enable_texture (); |
4708 | - _cairo_dock_set_blend_alpha (); |
4709 | - |
4710 | - _cairo_dock_apply_texture_at_size_with_alpha (myData.iArrowTexture, fFrameWidth, fFrameHeight, fAlpha); |
4711 | - |
4712 | - _cairo_dock_disable_texture (); |
4713 | - |
4714 | - glPopMatrix(); |
4715 | - } |
4716 | - } |
4717 | } |
4718 | else // si du texte a ete entre, on le dessine, ainsi que eventuellement la liste des icones correspondantes. |
4719 | { |
4720 | |
4721 | === modified file 'Scooby-Do/src/applet-icon-finder.c' |
4722 | --- Scooby-Do/src/applet-icon-finder.c 2010-08-07 01:43:25 +0000 |
4723 | +++ Scooby-Do/src/applet-icon-finder.c 2010-09-16 01:10:06 +0000 |
4724 | @@ -52,197 +52,6 @@ |
4725 | return bMatch; |
4726 | } |
4727 | |
4728 | -static void _find_icon_in_dock_with_command (Icon *pIcon, CairoDock *pDock, gpointer *data) |
4729 | -{ |
4730 | - gchar *cCommandPrefix = data[0]; |
4731 | - int length = GPOINTER_TO_INT (data[1]); |
4732 | - Icon *pAfterIcon = data[2]; |
4733 | - Icon **pFoundIcon = data[3]; |
4734 | - CairoDock **pFoundDock = data[4]; |
4735 | - Icon **pFirstIcon = data[5]; |
4736 | - CairoDock **pFirstParentDock = data[6]; |
4737 | - if (pDock == g_pMainDock || *pFoundIcon != NULL) // on a deja cherche dans le main dock, ou deja trouve ce qu'on cherchait. |
4738 | - return ; |
4739 | - |
4740 | - gboolean bFound = _cd_do_icon_match (pIcon, cCommandPrefix, length); |
4741 | - if (bFound) |
4742 | - { |
4743 | - if (pAfterIcon == NULL) |
4744 | - { |
4745 | - *pFoundIcon = pIcon; |
4746 | - *pFoundDock = pDock; |
4747 | - } |
4748 | - else |
4749 | - { |
4750 | - if (*pFirstIcon == NULL) // on garde une trace de la 1ere icone pour boucler dans la liste. |
4751 | - { |
4752 | - *pFirstIcon = pIcon; |
4753 | - *pFirstParentDock = g_pMainDock; |
4754 | - } |
4755 | - if (pIcon == pAfterIcon) |
4756 | - { |
4757 | - data[2] = NULL; |
4758 | - } |
4759 | - } |
4760 | - } |
4761 | -} |
4762 | -Icon *cd_do_search_icon_by_command (const gchar *cCommandPrefix, Icon *pAfterIcon, CairoDock **pDock) |
4763 | -{ |
4764 | - g_return_val_if_fail (cCommandPrefix != NULL, NULL); |
4765 | - |
4766 | - //\_________________ on cherche en premier dans le main dock, car il est deja visible. |
4767 | - int length = strlen (cCommandPrefix); |
4768 | - Icon *pIcon, *pFirstIcon = NULL; |
4769 | - CairoDock *pParentDock, *pFirstParentDock = NULL; |
4770 | - GList *ic; |
4771 | - for (ic = g_pMainDock->icons; ic != NULL; ic = ic->next) |
4772 | - { |
4773 | - pIcon = ic->data; |
4774 | - if (pIcon->cCommand && g_ascii_strncasecmp (cCommandPrefix, pIcon->cCommand, length) == 0) |
4775 | - { |
4776 | - if (pAfterIcon == NULL) |
4777 | - { |
4778 | - *pDock = g_pMainDock; |
4779 | - return pIcon; |
4780 | - } |
4781 | - else |
4782 | - { |
4783 | - if (pFirstIcon == NULL) // on garde une trace de la 1ere icone pour boucler dans la liste. |
4784 | - { |
4785 | - pFirstIcon = pIcon; |
4786 | - pFirstParentDock = g_pMainDock; |
4787 | - } |
4788 | - if (pIcon == pAfterIcon) |
4789 | - { |
4790 | - pAfterIcon = NULL; |
4791 | - } |
4792 | - } |
4793 | - } |
4794 | - } |
4795 | - |
4796 | - //\_________________ si on a rien trouve on cherche dans tous les docks. |
4797 | - pIcon = NULL; |
4798 | - *pDock = NULL; |
4799 | - gpointer data[7]; |
4800 | - data[0] = (gchar *)cCommandPrefix; |
4801 | - data[1] = GINT_TO_POINTER (length); |
4802 | - data[2] = pAfterIcon; |
4803 | - data[3] = &pIcon; |
4804 | - data[4] = pDock; |
4805 | - data[5] = &pFirstIcon; |
4806 | - data[6] = &pFirstParentDock; |
4807 | - cairo_dock_foreach_icons_in_docks ((CairoDockForeachIconFunc) _find_icon_in_dock_with_command, data); |
4808 | - |
4809 | - if (pIcon == NULL) |
4810 | - { |
4811 | - pIcon = pFirstIcon; |
4812 | - *pDock = pFirstParentDock; |
4813 | - } |
4814 | - return pIcon; |
4815 | -} |
4816 | - |
4817 | - |
4818 | -void cd_do_change_current_icon (Icon *pIcon, CairoDock *pDock) |
4819 | -{ |
4820 | - //\_________________ on gere le cachage et le montrage du dock precedent et actuel. |
4821 | - if (myData.pCurrentDock != NULL && pDock != myData.pCurrentDock && myData.pCurrentDock != g_pMainDock) // on remet au repos dock precedemment anime. |
4822 | - { |
4823 | - cairo_dock_emit_leave_signal (myData.pCurrentDock); |
4824 | - } |
4825 | - if (pDock != NULL && pDock != g_pMainDock && pDock != myData.pCurrentDock) // on montre le nouveau dock |
4826 | - { |
4827 | - if (pDock != NULL) |
4828 | - { |
4829 | - if (pDock->iRefCount > 0) |
4830 | - { |
4831 | - CairoDock *pParentDock = NULL; |
4832 | - Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (pDock, &pParentDock); |
4833 | - if (pPointingIcon != NULL) |
4834 | - { |
4835 | - cairo_dock_show_subdock (pPointingIcon, pParentDock); // utile pour le montrage des sous-docks au clic. |
4836 | - } |
4837 | - } |
4838 | - else |
4839 | - { |
4840 | - ///cairo_dock_pop_up (pDock); |
4841 | - } |
4842 | - cairo_dock_emit_enter_signal (pDock); |
4843 | - } |
4844 | - } |
4845 | - if (pDock != NULL) |
4846 | - { |
4847 | - |
4848 | - gtk_window_present (GTK_WINDOW (pDock->container.pWidget)); |
4849 | - } |
4850 | - |
4851 | - //\_________________ on gere l'allumage et l'eteignage de l'icone precedente et actuelle. |
4852 | - if (myData.pCurrentIcon != NULL && pIcon != myData.pCurrentIcon) // on remet au repos l'icone precedemment anime. |
4853 | - { |
4854 | - myData.bIgnoreIconState = TRUE; |
4855 | - cairo_dock_stop_icon_animation (myData.pCurrentIcon); |
4856 | - myData.bIgnoreIconState = FALSE; |
4857 | - cairo_dock_redraw_icon (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock)); /// utile ?... |
4858 | - } |
4859 | - if (pIcon != NULL && myData.pCurrentIcon != pIcon) // on anime la nouvelle icone. |
4860 | - { |
4861 | - int x = pIcon->fXAtRest + pIcon->fWidth/2 + (- pDock->fFlatDockWidth + pDock->iMaxDockWidth)/2; |
4862 | - int y = pIcon->fDrawY + pIcon->fHeight/2 * pIcon->fScale; |
4863 | - if (1||myData.pCurrentDock != pDock) |
4864 | - { |
4865 | - cairo_dock_emit_motion_signal (pDock, |
4866 | - x, |
4867 | - y); |
4868 | - } |
4869 | - else |
4870 | - { |
4871 | - myData.iPrevMouseX = myData.iMouseX; |
4872 | - myData.iPrevMouseY = myData.iMouseY; |
4873 | - myData.iMotionCount = 10; |
4874 | - } |
4875 | - myData.iMouseX = x; |
4876 | - myData.iMouseY = y; |
4877 | - cairo_dock_request_icon_animation (pIcon, pDock, myConfig.cIconAnimation, 1e6); // interrompt l'animation de "mouse over". |
4878 | - cairo_dock_launch_animation (CAIRO_CONTAINER (pDock)); |
4879 | - //if (myAccessibility.bShowSubDockOnClick) |
4880 | - // cairo_dock_show_subdock (pIcon, pDock, FALSE); |
4881 | - } |
4882 | - |
4883 | - myData.pCurrentDock = pDock; |
4884 | - myData.pCurrentIcon = pIcon; |
4885 | - if (myData.pCurrentDock == NULL) |
4886 | - gtk_window_present (GTK_WINDOW (g_pMainDock->container.pWidget)); |
4887 | -} |
4888 | - |
4889 | - |
4890 | -void cd_do_search_current_icon (gboolean bLoopSearch) |
4891 | -{ |
4892 | - //\_________________ on cherche un lanceur correspondant. |
4893 | - CairoDock *pDock; |
4894 | - Icon *pIcon = cd_do_search_icon_by_command (myData.sCurrentText->str, (bLoopSearch ? myData.pCurrentIcon : NULL), &pDock); |
4895 | - cd_debug ("found icon : %s\n", pIcon ? pIcon->cName : "none"); |
4896 | - |
4897 | - //\_________________ on gere le changement d'icone/dock. |
4898 | - cd_do_change_current_icon (pIcon, pDock); |
4899 | -} |
4900 | - |
4901 | - |
4902 | -gboolean cairo_dock_emit_motion_signal (CairoDock *pDock, int iMouseX, int iMouseY) |
4903 | -{ |
4904 | - static gboolean bReturn; |
4905 | - static GdkEventMotion motion; |
4906 | - motion.state = 0; |
4907 | - motion.x = iMouseX; |
4908 | - motion.y = iMouseY; |
4909 | - motion.x_root = pDock->container.iWindowPositionX + pDock->container.iMouseX; |
4910 | - motion.y_root = pDock->container.iWindowPositionY + pDock->container.iMouseY; |
4911 | - motion.time = 0; |
4912 | - motion.window = pDock->container.pWidget->window; |
4913 | - motion.device = gdk_device_get_core_pointer (); |
4914 | - g_signal_emit_by_name (pDock->container.pWidget, "motion-notify-event", &motion, &bReturn); |
4915 | - return FALSE; |
4916 | -} |
4917 | - |
4918 | - |
4919 | |
4920 | static inline void _cd_do_search_matching_icons_in_dock (CairoDock *pDock) |
4921 | { |
4922 | @@ -270,7 +79,7 @@ |
4923 | return; |
4924 | cd_debug ("%s (%s)\n", __func__, myData.sCurrentText->str); |
4925 | gchar *str = strchr (myData.sCurrentText->str, ' '); // on ne compte pas les arguments d'une eventuelle commande deja tapee. |
4926 | - int length = myData.sCurrentText->len; |
4927 | + guint length = myData.sCurrentText->len; |
4928 | if (str != NULL) |
4929 | { |
4930 | g_string_set_size (myData.sCurrentText, str - myData.sCurrentText->str + 1); |
4931 | @@ -279,22 +88,13 @@ |
4932 | |
4933 | if (myData.pMatchingIcons == NULL) |
4934 | { |
4935 | - if (myData.bSessionStartedAutomatically) // on cherche dans le dock courant. |
4936 | - { |
4937 | - cd_debug ("on cherche dans le dock\n"); |
4938 | - _cd_do_search_matching_icons_in_dock (myData.pCurrentDock); |
4939 | - myData.pMatchingIcons = g_list_reverse (myData.pMatchingIcons); |
4940 | - } |
4941 | - else |
4942 | - { |
4943 | - cd_debug ("on cherche tout\n"); |
4944 | - // on parcours tous les docks. |
4945 | - cairo_dock_foreach_icons_in_docks ((CairoDockForeachIconFunc) _cd_do_search_in_one_dock, NULL); |
4946 | - myData.pMatchingIcons = g_list_reverse (myData.pMatchingIcons); |
4947 | - |
4948 | - // on rajoute les icones ne venant pas du dock. |
4949 | - cd_do_find_matching_applications (); |
4950 | - } |
4951 | + cd_debug ("on cherche tout\n"); |
4952 | + // on parcours tous les docks. |
4953 | + cairo_dock_foreach_icons_in_docks ((CairoDockForeachIconFunc) _cd_do_search_in_one_dock, NULL); |
4954 | + myData.pMatchingIcons = g_list_reverse (myData.pMatchingIcons); |
4955 | + |
4956 | + // on rajoute les icones ne venant pas du dock. |
4957 | + cd_do_find_matching_applications (); |
4958 | } |
4959 | else // optimisation : on peut se contenter de chercher parmi les icones deja trouvees. |
4960 | { |
4961 | @@ -317,7 +117,7 @@ |
4962 | myData.iCurrentMatchingOffset = 0; |
4963 | if (myData.pCurrentApplicationToLoad != NULL) // on va continuer le chargement sur la sous-liste. |
4964 | myData.pCurrentApplicationToLoad = myData.pMatchingIcons; // comme l'ordre de la liste n'a pas ete altere, on n'est sur de ne pas sauter d'icone. |
4965 | - cairo_dock_redraw_container (CAIRO_CONTAINER (myData.pCurrentDock)); |
4966 | + cairo_dock_redraw_container (CAIRO_CONTAINER (g_pMainDock)); |
4967 | //g_print ("%d / %d\n", length , myData.sCurrentText->len); |
4968 | if (length != myData.sCurrentText->len) |
4969 | g_string_set_size (myData.sCurrentText, length); |
4970 | |
4971 | === modified file 'Scooby-Do/src/applet-icon-finder.h' |
4972 | --- Scooby-Do/src/applet-icon-finder.h 2009-10-05 19:27:17 +0000 |
4973 | +++ Scooby-Do/src/applet-icon-finder.h 2010-09-16 01:10:06 +0000 |
4974 | @@ -17,7 +17,6 @@ |
4975 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4976 | */ |
4977 | |
4978 | - |
4979 | #ifndef __APPLET_ICON_FINDER__ |
4980 | #define __APPLET_ICON_FINDER__ |
4981 | |
4982 | |
4983 | === modified file 'Scooby-Do/src/applet-init.c' |
4984 | --- Scooby-Do/src/applet-init.c 2010-08-07 01:43:25 +0000 |
4985 | +++ Scooby-Do/src/applet-init.c 2010-09-16 01:10:06 +0000 |
4986 | @@ -36,22 +36,18 @@ |
4987 | CD_APPLET_DEFINE_BEGIN ("Scooby-Do", |
4988 | 2, 1, 4, |
4989 | CAIRO_DOCK_CATEGORY_APPLET_SYSTEM, |
4990 | - N_("This plug-in allows you to make different actions directly from the keyboard.\n" |
4991 | - "It has 2 modes, each one being triggered by a keyboard shortcut:\n\n" |
4992 | - "- the finder mode (default shortcut : CTRL + Enter) :\n" |
4993 | - " It lets you find and launch applications, files, recent files, firefox bookmarks, commands, and even calculations.\n" |
4994 | - " Type what you want to search, the results will be displayed in real time.\n" |
4995 | - " The first results of each category are displayed in the main listing.\n" |
4996 | - " Use the up/down arrows to navigate inside the list,\n" |
4997 | - " and use the left/right arrows to enter into a category, or to display more actions (when a little arrow is drawn next to text).\n" |
4998 | - " Once inside a category, you can filter the results by typing some letters.\n" |
4999 | - " Press Enter to validate, maintain SHIFT or ALT to keep the list of results opened.\n\n" |
5000 | - "- the navigation mode (default shortcut : CTRL + F9) :\n" |