Docky

Merge lp://qastaging/~cszikszoy/docky/service-consolidation into lp://qastaging/docky

  1. service-consolidation
  2. Merge into trunk
Proposed by Chris S.
Status: Merged
Merged at revision: 1610
Proposed branch: lp://qastaging/~cszikszoy/docky/service-consolidation
Merge into: lp://qastaging/docky
Diff against target: 3491 lines (+1023/-1166)
71 files modified
Docky-2.sln (+2/-8)
Docky.DBus/Docky.DBus.csproj (+0/-4)
Docky.DBus/Docky.DBus/DBusManager.cs (+1/-1)
Docky.DBus/Makefile.am (+0/-1)
Docky.Items/Docky.Items.csproj (+0/-4)
Docky.Items/Docky.Items/ApplicationDockItem.cs (+5/-4)
Docky.Items/Docky.Items/ColoredIconDockItem.cs (+1/-0)
Docky.Items/Docky.Items/FileApplicationProvider.cs (+14/-12)
Docky.Items/Docky.Items/WindowDockItem.cs (+3/-2)
Docky.Items/Docky.Items/WnckDockItem.cs (+2/-1)
Docky.Items/Docky.Menus/MenuItem.cs (+1/-0)
Docky.Items/Docky.Menus/WindowMenuItem.cs (+1/-1)
Docky.Items/Makefile.am (+1/-2)
Docky.Services/Docky.Services.csproj (+26/-6)
Docky.Services/Docky.Services.dll.config (+2/-1)
Docky.Services/Docky.Services/Applications/DesktopFileChangedEventArgs.cs (+1/-1)
Docky.Services/Docky.Services/Applications/DesktopItem.cs (+43/-38)
Docky.Services/Docky.Services/DesktopItemService.cs (+593/-0)
Docky.Services/Docky.Services/DockServices.cs (+7/-0)
Docky.Services/Docky.Services/DrawingService.cs (+0/-4)
Docky.Services/Docky.Services/Extensions/WnckWindowExtension.cs (+18/-21)
Docky.Services/Docky.Services/HelperService.cs (+4/-1)
Docky.Services/Docky.Services/Helpers/Helper.cs (+3/-1)
Docky.Services/Docky.Services/Helpers/HelperMetadata.cs (+1/-1)
Docky.Services/Docky.Services/Helpers/HelperStatusChangedEventArgs.cs (+1/-1)
Docky.Services/Docky.Services/PathsService.cs (+2/-2)
Docky.Services/Docky.Services/Preferences/IPreferences.cs (+1/-1)
Docky.Services/Docky.Services/Preferences/Preferences.cs (+1/-1)
Docky.Services/Docky.Services/Preferences/PreferencesChangedEventArgs.cs (+1/-1)
Docky.Services/Docky.Services/PreferencesService.cs (+3/-1)
Docky.Services/Docky.Services/SystemService.cs (+30/-12)
Docky.Services/Docky.Services/ThemeService.cs (+2/-0)
Docky.Services/Docky.Services/WindowMatcherService.cs (+197/-753)
Docky.Services/Docky.Services/Windows/Position.cs (+1/-2)
Docky.Services/Docky.Services/Windows/WindowControl.cs (+1/-2)
Docky.Services/Docky.Services/Xlib/X11Atoms.cs (+3/-3)
Docky.Services/Docky.Services/Xlib/Xlib.cs (+3/-6)
Docky.Services/Makefile.am (+25/-15)
Docky.Windowing/AssemblyInfo.cs (+0/-42)
Docky.Windowing/Docky.Windowing.csproj (+0/-85)
Docky.Windowing/Docky.Windowing.dll.config (+0/-4)
Docky.Windowing/Makefile.am (+0/-36)
Docky.Windowing/Windowing/ClickAction.cs (+0/-31)
Docky.Windowing/docky.windowing.pc.in (+0/-5)
Docky/Docky.csproj (+0/-4)
Docky/Docky/ConfigurationWindow.cs (+1/-0)
Docky/Docky/DockController.cs (+1/-0)
Docky/Docky/Docky.cs (+1/-1)
Docky/Docky/HelperTile.cs (+1/-1)
Docky/Docky/Interface/AutohideManager.cs (+1/-0)
Docky/Docky/Interface/DockDragTracker.cs (+1/-7)
Docky/Docky/Interface/DockPreferences.cs (+2/-1)
Docky/Docky/Interface/DockWindow.cs (+3/-7)
Docky/Docky/Items/DockyItem.cs (+1/-0)
Docky/Makefile.am (+0/-1)
Docky/gtk-gui/gui.stetic (+0/-1)
Makefile.am (+0/-1)
StandardPlugins/Clock/src/ClockDockItem.cs (+1/-0)
StandardPlugins/Desktop/Desktop.csproj (+0/-4)
StandardPlugins/Desktop/Makefile.am (+0/-1)
StandardPlugins/GMail/src/GMailPreferences.cs (+1/-0)
StandardPlugins/NPR/src/NPR.cs (+1/-1)
StandardPlugins/RecentDocuments/src/RecentDocumentsItem.cs (+1/-0)
StandardPlugins/SessionManager/src/SessionManagerItem.cs (+1/-0)
StandardPlugins/Timer/src/TimerMainDockItem.cs (+1/-0)
StandardPlugins/Trash/src/TrashDockItem.cs (+1/-0)
StandardPlugins/Weather/src/WeatherPreferences.cs (+1/-0)
StandardPlugins/WorkspaceSwitcher/Makefile.am (+0/-1)
StandardPlugins/WorkspaceSwitcher/WorkspaceSwitcher.csproj (+2/-5)
StandardPlugins/WorkspaceSwitcher/src/WorkspaceSwitcherDockItem.cs (+1/-0)
configure.ac (+0/-13)
To merge this branch: bzr merge lp://qastaging/~cszikszoy/docky/service-consolidation
Reviewer Review Type Date Requested Status
Robert Dyer (community) Disapprove
Rico Tzschichholz Approve
Review via email: mp+32003@code.qastaging.launchpad.net

Description of the change

Completely remove the Docky.Windowing assembly. Separate DesktopItem related stuff from the WindowManager, and turn both into services. Move other items from Docky.Windowing into Docky.Services. Also clean up services in general by moving items into specialized namespaces / folders.

To post a comment you must log in.
lp://qastaging/~cszikszoy/docky/service-consolidation updated
1628. By Chris S.

add more feedback when adding / removing items

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

Compiling Docky.Services.dll...
./Docky.Services/DesktopItemService.cs(224,33): error CS1579: foreach statement cannot operate on variables of type `int' because it does not contain a definition for `GetEnumerator' or is not accessible

and don't delete po/docky.pot ;-)

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

do a bzr pull. I fixed that but forgot to push. It's there now. As for
po/docky.pot... I have no idea why that keeps getting deleted. I think it
happens when I run 'make clean'.

lp://qastaging/~cszikszoy/docky/service-consolidation updated
1629. By Chris S.

that won't work... don't care about feedback for removed apps

1630. By Chris S.

bring back docky.pot

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

Didn't experienced problems, yet ;-)

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

Let's switch to BAMF and then figure out how we want to refactor the windowing code.

review: Disapprove
Revision history for this message
Rico Tzschichholz (ricotz) wrote :

@Robert: I see no harm in merging this refactoring and consider a transition to BAMF afterwards. The new structure even seems to make it easier to distinguish the parts which BAMF would replace.

lp://qastaging/~cszikszoy/docky/service-consolidation updated
1631. By Chris S.

merge el trunko

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

I think the switch to BAMF should come post 2.1. There are a lot of unknowns and unresolved issues when dealing with BAMF. I think it'd just be better to refactor the current code (as I've done), then investigate switching to BAMF.

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: