menu-spec: Excluded items are Unllocated
markmc at redhat.com
Mon Dec 13 10:38:30 EET 2004
On Fri, 2004-12-10 at 17:31 +0100, Waldo Bastian wrote:
> On Friday 10 December 2004 16:50, Mark McLoughlin wrote:
> > > Right, the idea being that in former example items with Category Bar
> > > aren't a good fit for that menu, but in the latter example they are a
> > > good fit, but you just don't want them displayed.
> > >
> > > How does the attached patch look? Also changed the <OnlyUnallocated>
> > > test to catch this.
> > I've gone ahead and committed that now ...
> I would mention the Include/Exclude behavior explicitly:
> For each <Exclude>, match the rules against the currently-included
> desktop entries. For each desktop entry that matches, remove it again
> from the menu.
> + Note that an entry that is included in a menu but excluded again by a later
> + <Exclude> will still be considered allocated even though such entry
> + will no longer appear in the menu.
Okay, checked this in ...
RCS file: /cvs/menus/menu-spec/menu-spec.xml,v
retrieving revision 1.21
diff -u -p -r1.21 menu-spec.xml
--- menu-spec.xml 10 Dec 2004 15:50:05 -0000 1.21
+++ menu-spec.xml 13 Dec 2004 08:38:40 -0000
@@ -1048,7 +1048,10 @@ entries</ulink>: <varname>Categories</va
add it to the menu to be displayed and mark it as having been allocated.
For each <Exclude>, match the rules against the currently-included
desktop entries. For each desktop entry that matches, remove it again
- from the menu.
+ from the menu. Note that an entry that is included in a menu but excluded
+ again by a later <Exclude> is still considered allocated (for the
+ purposes of <OnlyUnallocated>) even though that entry no longer
+ appears in the menu.
Two passes are necessary, once for regular menus where any entry may
More information about the xdg