Docky

Merge lp://qastaging/~cszikszoy/docky/options into lp://qastaging/docky

  1. options
  2. Merge into trunk
Proposed by Chris S.
Status: Merged
Merged at revision: 1542
Proposed branch: lp://qastaging/~cszikszoy/docky/options
Merge into: lp://qastaging/docky
Diff against target: 1415 lines (+1168/-62)
9 files modified
Docky/AssemblyInfo.cs.in (+0/-8)
Docky/Docky.csproj (+6/-4)
Docky/Docky/Docky.cs (+3/-1)
Docky/Docky/Interface/CursorTracker.cs (+1/-1)
Docky/Docky/Interface/DockWindow.cs (+4/-4)
Docky/Docky/UserArgs.cs (+51/-39)
Docky/Makefile.am (+2/-2)
Docky/Mono/Options.cs (+1101/-0)
configure.ac (+0/-3)
To merge this branch: bzr merge lp://qastaging/~cszikszoy/docky/options
Reviewer Review Type Date Requested Status
Robert Dyer (community) Needs Fixing
Review via email: mp+28545@code.qastaging.launchpad.net
To post a comment you must log in.
lp://qastaging/~cszikszoy/docky/options updated
1522. By Chris S.

remove old options parsing call

1523. By Chris S.

merge trunk

Revision history for this message
Robert Dyer (psybers) wrote :

Lines 146 and 150 - why twice?

review: Needs Fixing
Revision history for this message
Robert Dyer (psybers) wrote :

<PsyberS> cszikszoy: i dont think we need a NvidiaMode value
<PsyberS> it only existed before because it had to in order to get that flag as an option
<PsyberS> its an alias for '-b 10'

<PsyberS> however you lost this functionality -> NvidiaMode |= DockServices.System.HasNvidia;

<PsyberS> and this -> if (NvidiaMode && BufferTime == 0)

review: Needs Fixing
Revision history for this message
Chris S. (cszikszoy) wrote :

> Lines 146 and 150 - why twice?

It's not twice, that's just a merge conflict with core. I already merged trunk, so I'm not sure why it's showing that as a merge conflict though.

Revision history for this message
Robert Dyer (psybers) wrote :

Its showing that because thats what your branch has!

http://bazaar.launchpad.net/~cszikszoy/docky/options/annotate/head:/Docky/Docky/Interface/DockWindow.cs#L1531

lp://qastaging/~cszikszoy/docky/options updated
1524. By Chris S.

fix merge error, and tweak how nvidia is parsed

1525. By Chris S.

merge trunk

1526. By Chris S.

a little refactoring, remove nvidia option variable

1527. By Chris S.

use const int for forced buffer refresh time (for nvidia users)

Revision history for this message
Chris Halse Rogers (raof) wrote :

You've got some merge conflicts still in the tree:

On Fri, 2010-06-25 at 23:35 +0000, Chris S. wrote:
> Chris S. has proposed merging lp:~cszikszoy/docky/options into lp:docky.
>
> Requested reviews:
> Docky Core (docky-core)
>
> === modified file 'Docky/Docky/Interface/DockWindow.cs'
> --- Docky/Docky/Interface/DockWindow.cs 2010-06-24 11:45:49 +0000
> +++ Docky/Docky/Interface/DockWindow.cs 2010-06-25 23:35:40 +0000
> @@ -1528,9 +1528,13 @@
> UpdateMonitorGeometry ();
>
> int height = ZoomedDockHeight;
> +<<<<<<< TREE
> if (Painter != null)
> height += ZoomedIconSize;
> int width = Math.Min (Docky.CommandLinePreferences.MaxSize, Preferences.IsVertical ? monitor_geo.Height : monitor_geo.Width);
> +=======
> + int width = Math.Min (UserArgs.MaxSize, Preferences.IsVertical ? monitor_geo.Height : monitor_geo.Width);
> +>>>>>>> MERGE-SOURCE
>
> if (Gdk.Screen.Default.IsComposited)
> height += DockHeightBuffer + UrgentBounceHeight;

Revision history for this message
Robert Dyer (psybers) wrote :

This was already merged buddy. But thanks for looking! :)

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 status/vote changes: