Compiz

Merge lp://qastaging/~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04 into lp://qastaging/~unity-team/compiz/trunk

  1. plugins-main-trunk.fixes-2011-03-04
  2. Merge into trunk
Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp://qastaging/~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04
Merge into: lp://qastaging/~unity-team/compiz/trunk
Diff against target: 50179 lines (+49298/-0) (has conflicts)
161 files modified
AUTHORS (+51/-0)
CMakeLists.txt (+29/-0)
COPYING (+340/-0)
NEWS (+17/-0)
animation/CMakeLists.txt (+7/-0)
animation/animation.xml.in (+757/-0)
animation/compiz-animation.pc.in (+12/-0)
animation/include/.directory (+3/-0)
animation/include/animation/animation.h (+77/-0)
animation/include/animation/animeffect.h (+209/-0)
animation/include/animation/extensionplugin.h (+71/-0)
animation/include/animation/fade.h (+19/-0)
animation/include/animation/grid.h (+106/-0)
animation/include/animation/gridtransform.h (+22/-0)
animation/include/animation/multi.h (+397/-0)
animation/include/animation/partialwindow.h (+25/-0)
animation/include/animation/persistent.h (+18/-0)
animation/include/animation/point3d.h (+105/-0)
animation/include/animation/screen.h (+35/-0)
animation/include/animation/transform.h (+34/-0)
animation/include/animation/window.h (+67/-0)
animation/include/animation/zoom.h (+70/-0)
animation/src/animation.cpp (+2852/-0)
animation/src/curvedfold.cpp (+254/-0)
animation/src/dodge.cpp (+876/-0)
animation/src/dream.cpp (+156/-0)
animation/src/extensionplugin.cpp (+841/-0)
animation/src/fade.cpp (+61/-0)
animation/src/focusfade.cpp (+131/-0)
animation/src/glide.cpp (+192/-0)
animation/src/grid.cpp (+711/-0)
animation/src/horizontalfold.cpp (+204/-0)
animation/src/magiclamp.cpp (+509/-0)
animation/src/options.cpp (+354/-0)
animation/src/private.h (+806/-0)
animation/src/restack.cpp (+405/-0)
animation/src/rollup.cpp (+150/-0)
animation/src/transform.cpp (+146/-0)
animation/src/wave.cpp (+144/-0)
animation/src/zoomside.cpp (+451/-0)
colorfilter/AUTHORS (+5/-0)
colorfilter/CMakeLists.txt (+5/-0)
colorfilter/colorfilter.xml.in (+66/-0)
colorfilter/compiz-core-print-fragment-program.patch (+79/-0)
colorfilter/data/filters/blackandwhite (+11/-0)
colorfilter/data/filters/blueish-filter (+10/-0)
colorfilter/data/filters/contrast (+21/-0)
colorfilter/data/filters/deuteranopia (+43/-0)
colorfilter/data/filters/grayscale (+6/-0)
colorfilter/data/filters/negative (+9/-0)
colorfilter/data/filters/negative-green (+10/-0)
colorfilter/data/filters/protanopia (+43/-0)
colorfilter/data/filters/sepia (+9/-0)
colorfilter/data/filters/swap-green-blue (+5/-0)
colorfilter/data/filters/swap-red-blue (+5/-0)
colorfilter/data/filters/swap-red-green (+5/-0)
colorfilter/src/colorfilter.cpp (+507/-0)
colorfilter/src/colorfilter.h (+181/-0)
colorfilter/src/parser.cpp (+537/-0)
colorfilter/src/parser.h (+105/-0)
expo/CMakeLists.txt (+7/-0)
expo/expo.xml.in (+271/-0)
expo/src/expo.cpp (+1379/-0)
expo/src/expo.h (+162/-0)
ezoom/CMakeLists.txt (+5/-0)
ezoom/ezoom.xml.in (+288/-0)
ezoom/src/ezoom.cpp (+1949/-0)
ezoom/src/ezoom.h (+401/-0)
jpeg/CMakeLists.txt (+7/-0)
jpeg/imgjpeg.xml.in (+26/-0)
jpeg/src/imgjpeg.cpp (+313/-0)
jpeg/src/imgjpeg.h (+75/-0)
kdecompat/CMakeLists.txt (+5/-0)
kdecompat/kdecompat.xml.in (+59/-0)
kdecompat/src/kdecompat.cpp (+979/-0)
kdecompat/src/kdecompat.h (+221/-0)
mag/CMakeLists.txt (+5/-0)
mag/images/Gnome/image.svg (+498/-0)
mag/images/Oxygen/image.svg (+4523/-0)
mag/mag.xml.in (+168/-0)
mag/src/mag.cpp (+1040/-0)
mag/src/mag.h (+192/-0)
mousepoll/CMakeLists.txt (+5/-0)
mousepoll/compiz-mousepoll.pc.in (+12/-0)
mousepoll/include/mousepoll/mousepoll.h (+62/-0)
mousepoll/mousepoll.xml.in (+25/-0)
mousepoll/src/mousepoll.cpp (+253/-0)
mousepoll/src/private.h (+81/-0)
neg/CMakeLists.txt (+5/-0)
neg/neg.xml.in (+46/-0)
neg/src/neg.cpp (+581/-0)
neg/src/neg.h (+114/-0)
opacify/CMakeLists.txt (+5/-0)
opacify/opacify.xml.in (+90/-0)
opacify/src/opacify.cpp (+435/-0)
opacify/src/opacify.h (+148/-0)
put/CMakeLists.txt (+5/-0)
put/put.xml.in (+364/-0)
put/src/put.cpp (+1298/-0)
put/src/put.h (+212/-0)
resizeinfo/CMakeLists.txt (+5/-0)
resizeinfo/resizeinfo.xml.in (+73/-0)
resizeinfo/src/resizeinfo.cpp (+528/-0)
resizeinfo/src/resizeinfo.h (+145/-0)
ring/CMakeLists.txt (+5/-0)
ring/ring.xml.in (+252/-0)
ring/src/ring.cpp (+1370/-0)
ring/src/ring.h (+266/-0)
scaleaddon/CMakeLists.txt (+5/-0)
scaleaddon/scaleaddon.xml.in (+187/-0)
scaleaddon/src/scaleaddon.cpp (+1307/-0)
scaleaddon/src/scaleaddon.h (+160/-0)
session/.gitignore (+1/-0)
session/CMakeLists.txt (+5/-0)
session/session.xml.in (+27/-0)
session/src/session.cpp (+790/-0)
session/src/session.h (+126/-0)
shift/CMakeLists.txt (+5/-0)
shift/shift.xml.in (+393/-0)
shift/src/shift.cpp (+2144/-0)
shift/src/shift.h (+323/-0)
snap/CMakeLists.txt (+5/-0)
snap/snap.xml.in (+100/-0)
snap/src/snap.cpp (+831/-0)
snap/src/snap.h (+168/-0)
staticswitcher/CMakeLists.txt (+5/-0)
staticswitcher/src/staticswitcher.cpp (+1347/-0)
staticswitcher/src/staticswitcher.h (+176/-0)
staticswitcher/staticswitcher.xml.in (+298/-0)
text/CMakeLists.txt (+5/-0)
text/compiz-text.pc.in (+12/-0)
text/include/text/text.h (+92/-0)
text/src/private.h (+106/-0)
text/src/text.cpp (+585/-0)
text/text.xml.in (+18/-0)
thumbnail/CMakeLists.txt (+5/-0)
thumbnail/src/thumbnail.cpp (+1050/-0)
thumbnail/src/thumbnail.h (+208/-0)
thumbnail/src/thumbnail_tex.h (+313/-0)
thumbnail/thumbnail.xml.in (+117/-0)
titleinfo/CMakeLists.txt (+5/-0)
titleinfo/src/titleinfo.cpp (+297/-0)
titleinfo/src/titleinfo.h (+113/-0)
titleinfo/titleinfo.xml.in (+27/-0)
vpswitch/CMakeLists.txt (+5/-0)
vpswitch/src/vpswitch.cpp (+367/-0)
vpswitch/src/vpswitch.h (+136/-0)
vpswitch/vpswitch.xml.in (+126/-0)
wall/CMakeLists.txt (+5/-0)
wall/src/wall.cpp (+1755/-0)
wall/src/wall.h (+208/-0)
wall/wall.xml.in (+361/-0)
winrules/CMakeLists.txt (+5/-0)
winrules/src/winrules.cpp (+554/-0)
winrules/src/winrules.h (+125/-0)
winrules/winrules.xml.in (+120/-0)
workarounds/CMakeLists.txt (+5/-0)
workarounds/LICENSE (+340/-0)
workarounds/src/workarounds.cpp (+1177/-0)
workarounds/src/workarounds.h (+213/-0)
workarounds/workarounds.xml.in (+106/-0)
Conflict adding file AUTHORS.  Moved existing file to AUTHORS.moved.
Conflict adding file CMakeLists.txt.  Moved existing file to CMakeLists.txt.moved.
Conflict adding file COPYING.  Moved existing file to COPYING.moved.
Conflict adding file NEWS.  Moved existing file to NEWS.moved.
To merge this branch: bzr merge lp://qastaging/~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Needs Fixing
Review via email: mp+56892@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2011-04-08.

Description of the change

Allows expo to match the visual design better

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

The diff has conflicts, did you propose to the right branch?

It seems an UI change, that will be nice that you do the paper work here: https://wiki.ubuntu.com/FreezeExceptionProcess#UserInterfaceFreeze%20Exceptions

review: Needs Fixing
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

You're right, somehow it ended up on lp:compiz again :/

On Fri, Apr 8, 2011 at 4:22 PM, Didier Roche <email address hidden> wrote:
> Review: Needs Fixing
> The diff has conflicts, did you propose to the right branch?
>
> It seems an UI change, that will be nice that you do the paper work here: https://wiki.ubuntu.com/FreezeExceptionProcess#UserInterfaceFreeze%20Exceptions
> --
> https://code.launchpad.net/~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04/+merge/56892
> Your team Unity Team is subscribed to branch lp:~unity-team/compiz/trunk.
>

--
Sam Spilsbury

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

You're right, somehow it ended up on lp:compiz again :/

On Fri, Apr 8, 2011 at 4:22 PM, Didier Roche <email address hidden> wrote:
> Review: Needs Fixing
> The diff has conflicts, did you propose to the right branch?
>
> It seems an UI change, that will be nice that you do the paper work here: https://wiki.ubuntu.com/FreezeExceptionProcess#UserInterfaceFreeze%20Exceptions
> --
> https://code.launchpad.net/~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04/+merge/56892
> Your team Unity Team is subscribed to branch lp:~unity-team/compiz/trunk.
>

--
Sam Spilsbury

lp://qastaging/~unity-team/compiz/plugins-main-trunk.fixes-2011-03-04 updated
5. By Sam Spilsbury

Much better implementation. Default should be X Offset: 64, Y Offset: 24

Unmerged revisions

5. By Sam Spilsbury

Much better implementation. Default should be X Offset: 64, Y Offset: 24

4. By Sam Spilsbury

Allow distance to be pulled back a bit further, add X and Y offset options for expo

3. By David Barth

fix embarassing typo

2. By David Barth

merge lp:~unity-team/compiz/plugins-main-trunk.fix_wrong_window_move_expo

1. By David Barth

initial import from compiz-plugins-main_0.9.4git20110322.orig.tar.gz

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: