r4875 - in software/ui: . debian src

[Enrico Zini]

Author: enrico
Date: 2007-12-09 12:13:20 +0000 (Sun, 09 Dec 2007)
New Revision: 4875

Modified:
   software/ui/
   software/ui/debian/changelog
   software/ui/src/Engine.cpp
Log:
Don't hide the currently selected filters from the list of available filters.


Property changes on: software/ui
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-12-09 11:37:59.420000076 +0000
committer: enrico at enricozini.org
properties: 
	branch-nick: goplay

   + timestamp: 2007-12-09 11:53:26.052999973 +0000
committer: enrico at enricozini.org
properties: 
	branch-nick: goplay

Name: bzr:revision-id:v3-single-software/ui
   - 108 enrico at enricozini.org-20071208200723-y4vsdj5bsmuf0uqa
109 enrico at enricozini.org-20071209105906-z4sjyyyni51a3cnj
110 enrico at enricozini.org-20071209110551-33y5jxsqejx92fq3
111 enrico at enricozini.org-20071209112332-1rf57dt9r853hdxn
112 enrico at enricozini.org-20071209113708-u77ke5c0ubb5gecl
113 enrico at enricozini.org-20071209113759-tc79y911o01c01rb

   + 108 enrico at enricozini.org-20071208200723-y4vsdj5bsmuf0uqa
109 enrico at enricozini.org-20071209105906-z4sjyyyni51a3cnj
110 enrico at enricozini.org-20071209110551-33y5jxsqejx92fq3
111 enrico at enricozini.org-20071209112332-1rf57dt9r853hdxn
112 enrico at enricozini.org-20071209113708-u77ke5c0ubb5gecl
113 enrico at enricozini.org-20071209113759-tc79y911o01c01rb
114 enrico at enricozini.org-20071209115326-qm81khq7dslw4o63


Modified: software/ui/debian/changelog
===================================================================
--- software/ui/debian/changelog	2007-12-09 12:13:19 UTC (rev 4874)
+++ software/ui/debian/changelog	2007-12-09 12:13:20 UTC (rev 4875)
@@ -4,8 +4,10 @@
      - Use the Xapian term prefixes used by apt-xapian-index
      - Use a non-const string to work around fltk's non const-cleaniness.
        Closes: bug#441120
+     - Don't hide the currently selected filters from the list of available
+       filters.
 
- -- Enrico Zini <enrico at debian.org>  Sun, 09 Dec 2007 11:04:24 +0000
+ -- Enrico Zini <enrico at debian.org>  Sun, 09 Dec 2007 11:52:33 +0000
 
 goplay (0.1-1) unstable; urgency=low
 

Modified: software/ui/src/Engine.cpp
===================================================================
--- software/ui/src/Engine.cpp	2007-12-09 12:13:19 UTC (rev 4874)
+++ software/ui/src/Engine.cpp	2007-12-09 12:13:20 UTC (rev 4875)
@@ -215,7 +215,13 @@
 					m_interfaces.insert(*j);
 		}
 	}
+	// Always keep the currently selected items in the lists
+	if (m_filter_type.valid())
+		m_types.insert(m_filter_type);
+	if (m_filter_iface.valid())
+		m_interfaces.insert(m_filter_iface);
 
+
 	if (m_res_max > m_max)
 		m_max = m_res_max;