[Debtags-commits] [svn] r1349 - debtags-edit/trunk/src
Enrico Zini
enrico at costa.debian.org
Fri Sep 9 10:09:44 UTC 2005
Author: enrico
Date: Fri Sep 9 10:09:43 2005
New Revision: 1349
Modified:
debtags-edit/trunk/src/DebtagsEditor.cc
debtags-edit/trunk/src/DebtagsEditor.h
debtags-edit/trunk/src/FilterPanel.cc
debtags-edit/trunk/src/FilterPanel.h
debtags-edit/trunk/src/Makefile.am
debtags-edit/trunk/src/PatchReview.cc
debtags-edit/trunk/src/PatchReview.h
debtags-edit/trunk/src/RelatedPanel.cc
debtags-edit/trunk/src/RelatedPanel.h
debtags-edit/trunk/src/TagEditor.cc
debtags-edit/trunk/src/TagEditor.h
debtags-edit/trunk/src/TagMenu.cc
debtags-edit/trunk/src/TagSelector.cc
debtags-edit/trunk/src/TagSelector.h
debtags-edit/trunk/src/debtags-edit.cc
Log:
Builds with new libapt-front; doesn't depend on libdebtags1 anymore; it's faster
Modified: debtags-edit/trunk/src/DebtagsEditor.cc
==============================================================================
--- debtags-edit/trunk/src/DebtagsEditor.cc (original)
+++ debtags-edit/trunk/src/DebtagsEditor.cc Fri Sep 9 10:09:43 2005
@@ -32,7 +32,7 @@
#include <map>
using namespace std;
-using namespace Debtags;
+using namespace Tagcoll;
//template class DebtagsEditor<DebtagsDocument>;
@@ -224,7 +224,7 @@
void DebtagsEditor<DOC>::on_reselected()
{
checkReapply();
- if (doc.current() == typename DOC::package())
+ if (doc.current() == Package())
descrBuf->set_text("No packages are currently selected");
else
try {
Modified: debtags-edit/trunk/src/DebtagsEditor.h
==============================================================================
--- debtags-edit/trunk/src/DebtagsEditor.h (original)
+++ debtags-edit/trunk/src/DebtagsEditor.h Fri Sep 9 10:09:43 2005
@@ -60,6 +60,10 @@
class DebtagsEditor : public Gtk::Window
{
protected:
+ typedef typename DOC::Package Package;
+ typedef typename DOC::Facet Facet;
+ typedef typename DOC::Tag Tag;
+
DOC& doc;
Gtk::Notebook mainArea;
Modified: debtags-edit/trunk/src/FilterPanel.cc
==============================================================================
--- debtags-edit/trunk/src/FilterPanel.cc (original)
+++ debtags-edit/trunk/src/FilterPanel.cc Fri Sep 9 10:09:43 2005
@@ -24,9 +24,9 @@
#include <tagcoll/Expression.h>
#include <tagcoll/Filters.h>
-#include <debtags/Filters.h>
#include "Environment.h"
+#include <apt-front/cache/component/debtags/utils.h>
#include <apt-front/predicate/predicate.h>
#include <apt-front/predicate/factory.h>
#include <apt-front/predicate/combinators.h>
@@ -52,14 +52,14 @@
/*
template<>
-void Tagcoll::ExpressionFilter<aptFront::cache::entity::Package, Debtags::Tag>::consume(const DebtagsDocument::package& item, const Tagcoll::OpSet<Debtags::Tag>& tags);
+void Tagcoll::ExpressionFilter<aptFront::cache::entity::Package, Tag>::consume(const DebtagsDocument::package& item, const Tagcoll::OpSet<Tag>& tags);
template<>
-void Tagcoll::ExpressionFilter<aptFront::cache::entity::Package, Debtags::Tag>::consume(const Tagcoll::OpSet<DebtagsDocument::package>& items, const Tagcoll::OpSet<Debtags::Tag>& tags);
+void Tagcoll::ExpressionFilter<aptFront::cache::entity::Package, Tag>::consume(const Tagcoll::OpSet<DebtagsDocument::package>& items, const Tagcoll::OpSet<Tag>& tags);
*/
using namespace std;
-using namespace Debtags;
+using namespace Tagcoll;
using namespace aptFront;
//#define MAX_VISIBLE_PKG 200
@@ -169,9 +169,9 @@
int cur = statusFilter.get_history();
filter.setInstalled(
- cur == 0 ? Debtags::BasicPackageMatcher<typename DOC::package>::ANY :
- cur == 1 ? Debtags::BasicPackageMatcher<typename DOC::package>::YES :
- Debtags::BasicPackageMatcher<typename DOC::package>::NO);
+ cur == 0 ? Debtags::BasicPackageMatcher<Package>::ANY :
+ cur == 1 ? Debtags::BasicPackageMatcher<Package>::YES :
+ Debtags::BasicPackageMatcher<Package>::NO);
filter.setDebtags(tagSelector.selected());
@@ -183,13 +183,17 @@
class FacetsDialog : public Gtk::Dialog
{
protected:
+ typedef typename DOC::Package Package;
+ typedef typename DOC::Facet Facet;
+ typedef typename DOC::Tag Tag;
+
// Tree model columns
class FacetListModelColumns : public Gtk::TreeModel::ColumnRecord
{
public:
FacetListModelColumns() { add(facet); add(label); }
- Gtk::TreeModelColumn<Debtags::Facet> facet;
+ Gtk::TreeModelColumn<Facet> facet;
Gtk::TreeModelColumn<Glib::ustring> label;
};
@@ -210,7 +214,7 @@
DOC& doc;
- class Stats : public Consumer<typename DOC::package, Tag>, public std::map<Facet, int>
+ class Stats : public Consumer<Package, Tag>, public std::map<Facet, int>
{
protected:
DOC& doc;
@@ -220,31 +224,31 @@
void update(const Tagcoll::OpSet<Tag>& tags, int count)
{
OpSet<Facet> has;
- for (Tagcoll::OpSet<Tag>::const_iterator i = tags.begin();
+ for (typename OpSet<Tag>::const_iterator i = tags.begin();
i != tags.end(); i++)
has += i->facet();
if (has.contains(pivot))
{
has = facets - has;
- for (OpSet<Facet>::const_iterator i = has.begin(); i != has.end(); i++)
+ for (typename OpSet<Facet>::const_iterator i = has.begin(); i != has.end(); i++)
(*this)[*i] += count;
}
}
- void consumeItemUntagged(const typename DOC::package& pkg) {}
- void consumeItemsUntagged(const typename DOC::package& pkg) {}
- void consumeItem(const typename DOC::package& item, const Tagcoll::OpSet<Tag>& tags)
+ void consumeItemUntagged(const Package& pkg) {}
+ void consumeItemsUntagged(const Package& pkg) {}
+ void consumeItem(const Package& item, const Tagcoll::OpSet<Tag>& tags)
{
update(tags, 1);
}
- void consumeItems(const Tagcoll::OpSet<typename DOC::package>& items, const Tagcoll::OpSet<Tag>& tags)
+ void consumeItems(const Tagcoll::OpSet<Package>& items, const Tagcoll::OpSet<Tag>& tags)
{
update(tags, items.size());
}
public:
Stats(DOC& doc, const Facet& pivot) : doc(doc), pivot(pivot)
{
- facets = doc.vocabulary().getFacets();
+ facets = doc.vocabulary().facets();
}
virtual ~Stats() {}
};
@@ -259,7 +263,7 @@
Gtk::TreeModel::Row row;
Stats stats(doc, master);
- doc.tagdb().outputPatched(stats);
+ doc.debtags().outputPatched(stats);
std::map<int, Facet> rstats;
for (typename Stats::const_iterator i = stats.begin();
i != stats.end(); i++)
@@ -323,8 +327,8 @@
add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
Gtk::TreeModel::Row row;
- OpSet<Facet> facets = doc.vocabulary().getFacets();
- for (OpSet<Facet>::const_iterator i = facets.begin();
+ OpSet<Facet> facets = doc.vocabulary().facets();
+ for (typename OpSet<Facet>::const_iterator i = facets.begin();
i != facets.end(); i++)
{
row = *(masterListModel->append());
@@ -372,6 +376,10 @@
class TODODialog : public Gtk::Dialog
{
protected:
+ typedef typename DOC::Package Package;
+ typedef typename DOC::Facet Facet;
+ typedef typename DOC::Tag Tag;
+
DOC& doc;
Gtk::RadioButtonGroup group;
std::vector<Gtk::RadioButton*> buttons;
@@ -379,7 +387,7 @@
int selected;
std::string selectedLabel;
Facet specialFacet;
- OpSet<typename DOC::package> specialPackages;
+ OpSet<Package> specialPackages;
void on_selected_changed(int val)
{
@@ -398,7 +406,7 @@
doc.wantSpecials();
int count = 0;
- for (typename std::map<Facet, OpSet<typename DOC::package> >::const_iterator i = doc.specials.specials.begin();
+ for (typename std::map<Facet, OpSet<Package> >::const_iterator i = doc.specials.specials.begin();
i != doc.specials.specials.end(); i++, count++)
if (count == val - 5)
{
@@ -443,7 +451,7 @@
{
doc.wantSpecials();
- for (typename std::map<Facet, OpSet<typename DOC::package> >::const_iterator i = doc.specials.specials.begin();
+ for (typename std::map<Facet, OpSet<Package> >::const_iterator i = doc.specials.specials.begin();
i != doc.specials.specials.end(); i++, count++)
addButton("Specials: [" + i->first.name() + "] " + i->first.sdesc() + " (" + stringf::fmt(i->second.size()) + ")", count);
} else if (doc.hasSpecials == DebtagsDocument::GENERATING) {
@@ -463,7 +471,7 @@
std::string getSelectedLabel() { return selectedLabel; }
int getSelected() { return selected; }
Facet getSpecialFacet() { return specialFacet; }
- OpSet<typename DOC::package> getSpecialPackages() { return specialPackages; }
+ OpSet<Package> getSpecialPackages() { return specialPackages; }
};
@@ -509,7 +517,7 @@
Gtk::TreeModel::Row row = *iter;
//Debtags::Package p = doc.packageDB().getPackage(row[itemListModelColumns.pkg]);
//fprintf(stderr, "Selected %.*s\n", PFSTR(p.name()));
- typename DOC::package up = row[itemListModelColumns.pkg];
+ Package up = row[itemListModelColumns.pkg];
signal_selected().emit(up);
}
}
@@ -539,39 +547,39 @@
#endif
template<class DOC>
-void FilterPanel<DOC>::outputSpecialColl(Tagcoll::Consumer<typename DOC::package, Tag>& consumer)
+void FilterPanel<DOC>::outputSpecialColl(Consumer<Package, Tag>& consumer)
{
if (specialID == -1)
{
- Tagcoll::FilterItemsByExpression<typename DOC::package, Debtags::Tag> filter(
+ Tagcoll::FilterItemsByExpression<Package, Tag> filter(
consumer, specialExpression);
- doc.tagdb().output(filter);
+ doc.debtags().tagdb().output(filter);
} else if (specialID == 0) {
- doc.tagdb().output(consumer);
+ doc.debtags().tagdb().output(consumer);
} else if (specialID == 1) {
- UntaggedRemover<typename DOC::package, Debtags::Tag> filter(consumer, true);
- doc.tagdb().output(filter);
+ UntaggedRemover<Package, Tag> filter(consumer, true);
+ doc.debtags().tagdb().output(filter);
} else if (specialID == 2) {
- Tagcoll::FilterItemsByExpression<typename DOC::package, Debtags::Tag> filter(
+ Tagcoll::FilterItemsByExpression<Package, Tag> filter(
consumer, "uitoolkit::* && !interface::*");
- doc.tagdb().output(filter);
+ doc.debtags().tagdb().output(filter);
} else if (specialID == 3) {
- Tagcoll::FilterItemsByExpression<typename DOC::package, Debtags::Tag> filter(
+ Tagcoll::FilterItemsByExpression<Package, Tag> filter(
consumer, "uitoolkit::* && !implemented-in::*");
- doc.tagdb().output(filter);
+ doc.debtags().tagdb().output(filter);
} else if (specialID == 4) {
- Tagcoll::FilterItemsByExpression<typename DOC::package, Debtags::Tag> filter(
+ Tagcoll::FilterItemsByExpression<Package, Tag> filter(
consumer, "!role::*");
- doc.tagdb().output(filter);
+ doc.debtags().tagdb().output(filter);
} else {
if (!specialFacet)
{
warning("I don't know how to handle special ID %d", specialID);
} else {
- for (typename OpSet<typename DOC::package>::const_iterator i = specialPackages.begin();
+ for (typename OpSet<Package>::const_iterator i = specialPackages.begin();
i != specialPackages.end(); i++)
{
- OpSet<Tag> tags = doc.tagdb().getTags(*i);
+ OpSet<Tag> tags = doc.debtags().tagdb().getTags(*i);
if (tags.empty())
consumer.consume(*i);
else
@@ -613,7 +621,7 @@
for (Gtk::ListStore::const_iterator i = itemListModel->children().begin();
i != itemListModel->children().end(); i++)
{
- typename DOC::package thisPkg = (*i)[itemListModelColumns.pkg];
+ Package thisPkg = (*i)[itemListModelColumns.pkg];
if (thisPkg == doc.current())
{
sel->select(itemListModel->get_path(i));
@@ -646,7 +654,7 @@
Debtags::BasicPackageMatcher<string>::NO);
*/
- typedef typename DOC::package Package;
+ typedef Package Package;
string name_f = nameFilter.get_text();
string desc_f = ftextFilter.get_text();
@@ -672,7 +680,7 @@
} else if (specialID == 0) {
doc.tagdb().output(consumer);
} else if (specialID == 1) {
- UntaggedFilter<typename DOC::package> filter(&consumer);
+ UntaggedFilter<Package> filter(&consumer);
doc.tagdb().output(filter);
*/
case 2:
@@ -690,7 +698,7 @@
{
warning("I don't know how to handle special ID %d", specialID);
} else {
- for (typename OpSet<typename DOC::package>::const_iterator i = specialPackages.begin();
+ for (typename OpSet<Package>::const_iterator i = specialPackages.begin();
i != specialPackages.end(); i++)
{
TagSet tags = doc.tagdb().getTags(*i);
@@ -708,7 +716,7 @@
r.output(TagcollConsumerAdaptor<Package, Tag>(doc.subCollection));
/*
p.apply(utils::range(doc.packages().packagesBegin(), doc.packages().packagesEnd()),
- TagcollConsumerAdaptor<typename DOC::package, Tag>(doc.subCollection));
+ TagcollConsumerAdaptor<Package, Tag>(doc.subCollection));
*/
/*
if (specialID != 0)
@@ -724,17 +732,17 @@
if (filter.hasOnlyDebtags())
{
//doc.tagdb().outputHavingTags(filter.debtagsTagset(), doc.subCollection);
- //OpSet<typename DOC::package> items(doc.tagdb().getItems(filter.debtagsTagset()));
+ //OpSet<Package> items(doc.tagdb().getItems(filter.debtagsTagset()));
TagSet tags(filter.debtagsTagset());
if (!tags.empty())
{
TagSet::const_iterator i = tags.begin();
- OpSet<typename DOC::package> items = doc.tagdb().getItems(*i);
+ OpSet<Package> items = doc.tagdb().getItems(*i);
for (; i != tags.end(); i++)
items ^= doc.tagdb().getItems(*i);
fprintf(stderr, "A %d to start with\n", items.size());
- for (typename OpSet<typename DOC::package>::const_iterator i = items.begin();
+ for (typename OpSet<Package>::const_iterator i = items.begin();
i != items.end(); i++)
doc.subCollection.consume(*i, doc.tagdb().getTags(*i));
//consumer.consume(*i, getTags(*i));
@@ -745,9 +753,9 @@
filter.setConsumer(&doc.subCollection);
//doc.tagdb().outputHavingTags(filter.debtagsTagset(), filter);
- OpSet<typename DOC::package> items(doc.tagdb().getItems(filter.debtagsTagset()));
+ OpSet<Package> items(doc.tagdb().getItems(filter.debtagsTagset()));
fprintf(stderr, "B %d to start with\n", items.size());
- for (typename OpSet<typename DOC::package>::const_iterator i = items.begin();
+ for (typename OpSet<Package>::const_iterator i = items.begin();
i != items.end(); i++)
filter.consume(*i, doc.tagdb().getTags(*i));
}
@@ -795,14 +803,14 @@
}
template<class DOC>
-void FilterPanel<DOC>::consumeItemUntagged(const typename DOC::package& pkg)
+void FilterPanel<DOC>::consumeItemUntagged(const Package& pkg)
{
#ifdef MAX_VISIBLE_PKG
static const unsigned int max_pkg = 500;
if (itemListModel->children().size() > max_pkg)
return;
#endif
- if (pkg != typename DOC::package())
+ if (pkg != Package())
{
Gtk::TreeModel::Row row;
row = *(itemListModel->append());
@@ -819,7 +827,7 @@
}
template<class DOC>
-void FilterPanel<DOC>::consumeItem(const typename DOC::package& item, const Tagcoll::OpSet<Debtags::Tag>& tags)
+void FilterPanel<DOC>::consumeItem(const Package& item, const Tagcoll::OpSet<Tag>& tags)
{
consume(item);
}
Modified: debtags-edit/trunk/src/FilterPanel.h
==============================================================================
--- debtags-edit/trunk/src/FilterPanel.h (original)
+++ debtags-edit/trunk/src/FilterPanel.h Fri Sep 9 10:09:43 2005
@@ -37,11 +37,16 @@
#include <gtkmm/radiobutton.h>
template<class DOC>
-class FilterPanel : public Gtk::Frame, public Tagcoll::Consumer<typename DOC::package, Debtags::Tag>
+class FilterPanel : public Gtk::Frame, public Tagcoll::Consumer<typename DOC::Package, typename DOC::Tag>
{
+protected:
+ typedef typename DOC::Package Package;
+ typedef typename DOC::Facet Facet;
+ typedef typename DOC::Tag Tag;
+
public:
typedef SigC::Signal0<void> type_signal_changed;
- typedef SigC::Signal1<void, typename DOC::package> type_signal_selected;
+ typedef SigC::Signal1<void, Package> type_signal_selected;
protected:
DOC& doc;
@@ -60,8 +65,8 @@
int specialID;
std::string specialExpression;
- Debtags::Facet specialFacet;
- Tagcoll::OpSet<typename DOC::package> specialPackages;
+ Facet specialFacet;
+ Tagcoll::OpSet<Package> specialPackages;
// Tree model columns
class ItemListModelColumns : public Gtk::TreeModel::ColumnRecord
@@ -69,7 +74,7 @@
public:
ItemListModelColumns() { add(pkg); add(name); add(desc); }
- Gtk::TreeModelColumn<typename DOC::package> pkg;
+ Gtk::TreeModelColumn<Package> pkg;
Gtk::TreeModelColumn<Glib::ustring> name;
Gtk::TreeModelColumn<Glib::ustring> desc;
};
@@ -87,10 +92,10 @@
void reselect();
void updateList();
- void outputSpecialColl(Tagcoll::Consumer<typename DOC::package, Debtags::Tag>& consumer);
+ void outputSpecialColl(Tagcoll::Consumer<Package, Tag>& consumer);
- virtual void consumeItemUntagged(const typename DOC::package& item);
- virtual void consumeItem(const typename DOC::package& item, const Tagcoll::OpSet<Debtags::Tag>& tags);
+ virtual void consumeItemUntagged(const Package& item);
+ virtual void consumeItem(const Package& item, const Tagcoll::OpSet<Tag>& tags);
public:
FilterPanel(DOC& doc);
Modified: debtags-edit/trunk/src/Makefile.am
==============================================================================
--- debtags-edit/trunk/src/Makefile.am (original)
+++ debtags-edit/trunk/src/Makefile.am Fri Sep 9 10:09:43 2005
@@ -20,7 +20,7 @@
instantiations.cc
instantiations.cc \
instantiations1.cc
-debtags_edit_LDADD = $(LIBAPT_FRONT_LIBS) $(LIBTAGCOLL1_LIBS) $(GTKMM_LIBS) -lpthread
+debtags_edit_LDADD = $(LIBAPT_FRONT_LIBS) $(LIBTAGCOLL1_LIBS) $(GTKMM_LIBS) -lpthread -lrt
INCLUDES = $(LIBAPT_FRONT_CFLAGS) $(LIBTAGCOLL1_CFLAGS) $(GTKMM_CFLAGS)
Modified: debtags-edit/trunk/src/PatchReview.cc
==============================================================================
--- debtags-edit/trunk/src/PatchReview.cc (original)
+++ debtags-edit/trunk/src/PatchReview.cc Fri Sep 9 10:09:43 2005
@@ -25,9 +25,8 @@
#include <gtkmm/frame.h>
#include <gtkmm/paned.h>
-
using namespace std;
-using namespace Debtags;
+using namespace Tagcoll;
template<class DOC>
PatchReview<DOC>::PatchReview(DOC& doc)
@@ -287,7 +286,7 @@
Gtk::TreeModel::Row row = *iter;
//Debtags::Package p = doc.packageDB().getPackage(row[itemListModelColumns.pkg]);
//fprintf(stderr, "Selected %.*s\n", PFSTR(p.name()));
- typename DOC::package up = row[patchListModelColumns.pkg];
+ Package up = row[patchListModelColumns.pkg];
doc.setCurrent(up);
}
}
@@ -295,7 +294,7 @@
template<class DOC>
void PatchReview<DOC>::updatePackages()
{
- typedef PatchList<typename DOC::package, Tag> patch_t;
+ typedef PatchList<Package, Tag> patch_t;
const patch_t& patch = doc.getPatch();
patchListModel->clear();
@@ -303,7 +302,7 @@
for (typename patch_t::const_iterator i = patch.begin();
i != patch.end(); i++)
{
- if (i->first != typename DOC::package())
+ if (i->first != Package())
{
Gtk::TreeModel::Row row;
row = *(patchListModel->append());
@@ -312,12 +311,12 @@
const OpSet<Tag>& added = i->second.getAdded();
const OpSet<Tag>& removed = i->second.getRemoved();
string p;
- for (OpSet<Tag>::const_iterator j = added.begin(); j != added.end(); j++)
+ for (typename OpSet<Tag>::const_iterator j = added.begin(); j != added.end(); j++)
if (p.empty())
p += "+" + j->fullname();
else
p += ", +" + j->fullname();
- for (OpSet<Tag>::const_iterator j = removed.begin(); j != removed.end(); j++)
+ for (typename OpSet<Tag>::const_iterator j = removed.begin(); j != removed.end(); j++)
if (p.empty())
p += "-" + j->fullname();
else
@@ -332,7 +331,7 @@
template<class DOC>
void PatchReview<DOC>::updateCurrent()
{
- typedef PatchList<typename DOC::package, Tag> patch_t;
+ typedef PatchList<Package, Tag> patch_t;
const patch_t& patch = doc.getPatch();
typename patch_t::const_iterator p = patch.find(doc.current());
Glib::RefPtr<Gtk::TreeSelection> sel = patchList.get_selection();
@@ -352,30 +351,30 @@
const OpSet<Tag>& added = p->second.getAdded();
const OpSet<Tag>& removed = p->second.getRemoved();
- for (OpSet<Tag>::const_iterator i = added.begin();
+ for (typename OpSet<Tag>::const_iterator i = added.begin();
i != added.end(); i++)
{
Gtk::TreeModel::Row row;
row = *(tagListModel->append());
row[tagListModelColumns.tag] = *i;
row[tagListModelColumns.name] = "+" + i->fullname();
- row[tagListModelColumns.sdesc] = i->sdesc();
+ row[tagListModelColumns.sdesc] = i->shortDescription();
}
- for (OpSet<Tag>::const_iterator i = removed.begin();
+ for (typename OpSet<Tag>::const_iterator i = removed.begin();
i != removed.end(); i++)
{
Gtk::TreeModel::Row row;
row = *(tagListModel->append());
row[tagListModelColumns.tag] = *i;
row[tagListModelColumns.name] = "-" + i->fullname();
- row[tagListModelColumns.sdesc] = i->sdesc();
+ row[tagListModelColumns.sdesc] = i->shortDescription();
}
for (Gtk::ListStore::const_iterator i = patchListModel->children().begin();
i != patchListModel->children().end(); i++)
{
- typename DOC::package thisPkg = (*i)[patchListModelColumns.pkg];
+ Package thisPkg = (*i)[patchListModelColumns.pkg];
if (thisPkg == doc.current())
{
sel->select(patchListModel->get_path(i));
Modified: debtags-edit/trunk/src/PatchReview.h
==============================================================================
--- debtags-edit/trunk/src/PatchReview.h (original)
+++ debtags-edit/trunk/src/PatchReview.h Fri Sep 9 10:09:43 2005
@@ -21,7 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <debtags/Tag.h>
#include <gtkmm/textview.h>
#include <gtkmm/box.h>
#include <gtkmm/treeview.h>
@@ -50,6 +49,10 @@
class PatchReview : public Gtk::VBox
{
protected:
+ typedef typename DOC::Package Package;
+ typedef typename DOC::Facet Facet;
+ typedef typename DOC::Tag Tag;
+
DOC& doc;
// Tree model columns
@@ -58,7 +61,7 @@
public:
PatchListModelColumns() { add(pkg); add(name); add(patch); }
- Gtk::TreeModelColumn<typename DOC::package> pkg;
+ Gtk::TreeModelColumn<Package> pkg;
Gtk::TreeModelColumn<Glib::ustring> name;
Gtk::TreeModelColumn<Glib::ustring> patch;
};
@@ -67,7 +70,7 @@
public:
TagListModelColumns() { add(tag); add(name); add(sdesc); }
- Gtk::TreeModelColumn<Debtags::Tag> tag;
+ Gtk::TreeModelColumn<Tag> tag;
Gtk::TreeModelColumn<Glib::ustring> name;
Gtk::TreeModelColumn<Glib::ustring> sdesc;
};
Modified: debtags-edit/trunk/src/RelatedPanel.cc
==============================================================================
--- debtags-edit/trunk/src/RelatedPanel.cc (original)
+++ debtags-edit/trunk/src/RelatedPanel.cc Fri Sep 9 10:09:43 2005
@@ -33,7 +33,7 @@
#include <gtkmm/treemodel.h>
using namespace std;
-using namespace Debtags;
+using namespace Tagcoll;
//template class RelatedPanel<DebtagsDocument>;
@@ -75,7 +75,7 @@
if (iter)
{
Gtk::TreeModel::Row row = *iter;
- typename DOC::package pkg = row[itemListModelColumns.pkg];
+ Package pkg = row[itemListModelColumns.pkg];
signal_selected().emit(pkg);
}
}
@@ -86,7 +86,7 @@
static const unsigned int max_pkg = 200;
printf("rpUPDATELIST start\n");
- if (pivot == typename DOC::package())
+ if (pivot == Package())
{
printf("rpUPDATELIST end\n");
return;
@@ -94,13 +94,13 @@
unsigned int dist = 0;
//pkgs.clear();
- OpSet<Tag> ref = doc.tagdb().getTags(pivot);
- OpSet<typename DOC::package> related;
+ OpSet<Tag> ref = doc.debtags().tagdb().getTags(pivot);
+ OpSet<Package> related;
for ( ; related.size() == 0 && dist <= ref.size(); dist++)
{
fprintf(stderr, "Trying distance %d...\n", dist);
//Debtags::Environment::get().outputRelated(pkgs, pivot, dist);
- related += doc.tagdb().getRelatedItems(pivot.tags(), dist);
+ related += doc.debtags().tagdb().getRelatedItems(pivot.tags(), dist);
//related.output(pkgs);
}
@@ -122,10 +122,10 @@
Gtk::TreeModel::Row row;
itemListModel->clear();
unsigned int count = 0;
- for (typename OpSet<typename DOC::package>::const_iterator i = related.begin(); count < max_pkg && i != related.end(); i++, count++)
+ for (typename OpSet<Package>::const_iterator i = related.begin(); count < max_pkg && i != related.end(); i++, count++)
{
//printf("rpUPDATELIST: %.*s\n", PFSTR((*i)->name()));
- if (*i != typename DOC::package())
+ if (*i != Package())
{
row = *(itemListModel->append());
row[itemListModelColumns.pkg] = *i;
Modified: debtags-edit/trunk/src/RelatedPanel.h
==============================================================================
--- debtags-edit/trunk/src/RelatedPanel.h (original)
+++ debtags-edit/trunk/src/RelatedPanel.h Fri Sep 9 10:09:43 2005
@@ -21,9 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "TagSelector.h"
-
#include <sigc++/sigc++.h>
+#include <gtkmm/box.h>
#include <gtkmm/entry.h>
#include <gtkmm/frame.h>
#include <gtkmm/paned.h>
@@ -36,8 +35,13 @@
template<class DOC>
class RelatedPanel : public Gtk::VBox
{
+protected:
+ typedef typename DOC::Package Package;
+ typedef typename DOC::Facet Facet;
+ typedef typename DOC::Tag Tag;
+
public:
- typedef SigC::Signal1<void, typename DOC::package> type_signal_selected;
+ typedef SigC::Signal1<void, Package> type_signal_selected;
protected:
DOC& doc;
@@ -46,7 +50,7 @@
Gtk::ScrolledWindow scrolledItemList;
Glib::RefPtr<Gtk::ListStore> itemListModel;
- typename DOC::package pivot;
+ Package pivot;
//PackageBuffer pkgs;
// Tree model columns
@@ -55,7 +59,7 @@
public:
ItemListModelColumns() { add(pkg); add(name); add(desc); }
- Gtk::TreeModelColumn<typename DOC::package> pkg;
+ Gtk::TreeModelColumn<Package> pkg;
Gtk::TreeModelColumn<Glib::ustring> name;
Gtk::TreeModelColumn<Glib::ustring> desc;
};
@@ -72,7 +76,7 @@
RelatedPanel(DOC& doc);
virtual ~RelatedPanel() {}
- void do_pivot_change(const typename DOC::package& _pivot) throw ()
+ void do_pivot_change(const Package& _pivot) throw ()
{
if (doc.getComputeIntensive())
{
Modified: debtags-edit/trunk/src/TagEditor.cc
==============================================================================
--- debtags-edit/trunk/src/TagEditor.cc (original)
+++ debtags-edit/trunk/src/TagEditor.cc Fri Sep 9 10:09:43 2005
@@ -28,7 +28,6 @@
using namespace std;
using namespace Tagcoll;
-using namespace Debtags;
//template class TagEditor<DebtagsDocument>;
@@ -112,7 +111,7 @@
tags += tag;
doc.applyChange(
- Patch<typename DOC::package, Debtags::Tag>(
+ Patch<typename DOC::Package, Tag>(
doc.current(),
tags,
OpSet<Tag>()));
@@ -137,7 +136,7 @@
tags += tag;
doc.applyChange(
- Patch<typename DOC::package, Debtags::Tag>(
+ Patch<typename DOC::Package, Tag>(
doc.current(),
OpSet<Tag>(),
tags));
@@ -259,7 +258,7 @@
delete table;
}
- if (doc.current() == typename DOC::package())
+ if (doc.current() == typename DOC::Package())
{
table = new Gtk::Table(1, 1);
tableBox.pack_start(*table);
@@ -275,11 +274,11 @@
// Create the facet/tag hierarchy
int facets = 0, tags = 0;
std::map< Facet, OpSet<Tag> > contents;
- for (OpSet<Tag>::const_iterator i = _selected.begin(); i != _selected.end(); i++)
+ for (typename OpSet<Tag>::const_iterator i = _selected.begin(); i != _selected.end(); i++)
{
// fprintf(stderr, "Tag %.*s facet %.*s name %.*s\n",
// PFSTR(i->fullname()), PFSTR(i->facet().name()), PFSTR(i->name()));
- std::map< Facet, OpSet<Tag> >::iterator j = contents.find(i->facet());
+ typename std::map< Facet, OpSet<Tag> >::iterator j = contents.find(i->facet());
if (j != contents.end())
{
j->second += *i;
@@ -308,14 +307,14 @@
// Add facets and tags
int row = 0;
- for (std::map< Facet, OpSet<Tag> >::const_iterator i = contents.begin(); i != contents.end(); i++)
+ for (typename std::map< Facet, OpSet<Tag> >::const_iterator i = contents.begin(); i != contents.end(); i++)
{
//printf("Add facet: %.*s\n", PFSTR(i->first));
Gtk::Button* delFacet = manage(new Gtk::Button("-"));
table->attach(*delFacet, 0, 1, row, row + 1, Gtk::SHRINK);
- Gtk::Label* facet = manage(new Gtk::Label("[" + i->first.name() + "] " + i->first.sdesc(), Gtk::ALIGN_LEFT));
+ Gtk::Label* facet = manage(new Gtk::Label("[" + i->first.name() + "] " + i->first.shortDescription(), Gtk::ALIGN_LEFT));
table->attach(*facet, 1, 2, row, row + 1);
int px, py;
facet->get_padding(px, py);
@@ -330,7 +329,7 @@
++row;
- for (OpSet<Tag>::const_iterator j = i->second.begin(); j != i->second.end(); j++)
+ for (typename OpSet<Tag>::const_iterator j = i->second.begin(); j != i->second.end(); j++)
{
//printf("Add tag: %.*s\n", PFSTR(*j));
//table->attach(*manage(new Gtk::Label("")), 0, 1, row, row+1, Gtk::SHRINK);
@@ -341,7 +340,7 @@
sigc::mem_fun(*this, &TagEditor<DOC>::on_del_from_selection),
*j));
- Gtk::Label* tag = manage(new Gtk::Label("[" + j->name() + "] " + j->sdesc(), Gtk::ALIGN_LEFT));
+ Gtk::Label* tag = manage(new Gtk::Label("[" + j->name() + "] " + j->shortDescription(), Gtk::ALIGN_LEFT));
int px, py;
tag->get_padding(px, py);
tag->set_padding(14, py);
Modified: debtags-edit/trunk/src/TagEditor.h
==============================================================================
--- debtags-edit/trunk/src/TagEditor.h (original)
+++ debtags-edit/trunk/src/TagEditor.h Fri Sep 9 10:09:43 2005
@@ -24,16 +24,18 @@
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/box.h>
#include <gtkmm/table.h>
-#include <debtags/Tag.h>
-
template<class DOC>
class TagEditor : public Gtk::VBox
{
+protected:
+ typedef typename DOC::Facet Facet;
+ typedef typename DOC::Tag Tag;
+
public:
//typedef SigC::Signal0<void> type_signal_changed;
- typedef SigC::Signal1<void, Debtags::Tag> type_signal_add_tag;
- typedef SigC::Signal1<void, Debtags::Tag> type_signal_remove_tag;
+ typedef SigC::Signal1<void, Tag> type_signal_add_tag;
+ typedef SigC::Signal1<void, Tag> type_signal_remove_tag;
protected:
DOC& doc;
@@ -51,15 +53,15 @@
void updateView();
bool on_titleAdd_event(GdkEvent* e);
- bool on_facetAdd_event(GdkEvent* e, Debtags::Facet facet);
- bool on_tag_popup_event(GdkEvent* e, Debtags::Tag tag);
- void on_add_to_selection(Debtags::Tag tag);
- void on_del_from_selection(Debtags::Tag tag);
+ bool on_facetAdd_event(GdkEvent* e, Facet facet);
+ bool on_tag_popup_event(GdkEvent* e, Tag tag);
+ void on_add_to_selection(Tag tag);
+ void on_del_from_selection(Tag tag);
void on_changed();
void on_selectedTagList_drag_data_get(
- const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data, guint, guint, Debtags::Tag tag);
+ const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data, guint, guint, Tag tag);
public:
TagEditor(DOC& doc);
@@ -70,8 +72,8 @@
type_signal_remove_tag signal_remove_tag() throw () { return _signal_remove_tag; }
//void do_changed();
- void do_add_tag(Debtags::Tag tag);
- void do_remove_tag(Debtags::Tag tag);
+ void do_add_tag(Tag tag);
+ void do_remove_tag(Tag tag);
/*
void setSelected(const Debtags::TagSet& tagset) throw ();
Modified: debtags-edit/trunk/src/TagMenu.cc
==============================================================================
--- debtags-edit/trunk/src/TagMenu.cc (original)
+++ debtags-edit/trunk/src/TagMenu.cc Fri Sep 9 10:09:43 2005
@@ -23,7 +23,7 @@
#include "Environment.h"
#include "DebtagsDocument.h"
-//#include <debtags/Utils.h>
+#include <apt-front/cache/component/debtags/utils.h>
#include <tagcoll/CardinalityStore.h>
#include <tagcoll/SmartHierarchy.h>
@@ -33,6 +33,7 @@
using namespace std;
using namespace Tagcoll;
+using namespace aptFront::cache::component::debtags;
//template class TagMenu<DebtagsDocument>;
Modified: debtags-edit/trunk/src/TagSelector.cc
==============================================================================
--- debtags-edit/trunk/src/TagSelector.cc (original)
+++ debtags-edit/trunk/src/TagSelector.cc Fri Sep 9 10:09:43 2005
@@ -27,19 +27,18 @@
using namespace std;
using namespace Tagcoll;
-using namespace Debtags;
void TagSelector::do_changed()
{
_signal_changed.emit();
}
-void TagSelector::do_add_tag(Tag tag)
+void TagSelector::do_add_tag(DebtagsDocument::Tag tag)
{
_signal_add_tag.emit(tag);
}
-void TagSelector::do_remove_tag(Tag tag)
+void TagSelector::do_remove_tag(DebtagsDocument::Tag tag)
{
_signal_remove_tag.emit(tag);
}
@@ -64,7 +63,7 @@
return false;
}
-bool TagSelector::on_facetAdd_event(GdkEvent* e, Facet facet)
+bool TagSelector::on_facetAdd_event(GdkEvent* e, DebtagsDocument::Facet facet)
{
if (e->type == GDK_BUTTON_PRESS)
{
@@ -78,7 +77,7 @@
return false;
}
-bool TagSelector::on_tag_popup_event(GdkEvent* e, Tag tag)
+bool TagSelector::on_tag_popup_event(GdkEvent* e, DebtagsDocument::Tag tag)
{
if (e->type == GDK_BUTTON_PRESS && e->button.button == 3)
{
@@ -86,11 +85,11 @@
itemPopup->items().push_back(Gtk::Menu_Helpers::MenuElem(
"Add to all/selected items",
- sigc::bind<Tag>(
+ sigc::bind<DebtagsDocument::Tag>(
sigc::mem_fun(*this, &TagSelector::do_add_tag), tag)));
itemPopup->items().push_back(Gtk::Menu_Helpers::MenuElem(
"Remove from all/selected items",
- sigc::bind<Tag>(
+ sigc::bind<DebtagsDocument::Tag>(
sigc::mem_fun(*this, &TagSelector::do_remove_tag), tag)));
itemPopup->popup(e->button.button, e->button.time);
@@ -99,7 +98,7 @@
return false;
}
-void TagSelector::on_add_to_selection(Tag tag)
+void TagSelector::on_add_to_selection(DebtagsDocument::Tag tag)
{
//printf("Add to sel: %.*s\n", PFSTR(tag));
unsigned int count_pre = _selected.size();
@@ -111,7 +110,7 @@
}
}
-void TagSelector::on_del_from_selection(Tag tag)
+void TagSelector::on_del_from_selection(DebtagsDocument::Tag tag)
{
//printf("Del from sel: %.*s\n", PFSTR(tag));
unsigned int count_pre = _selected.size();
@@ -126,7 +125,7 @@
void TagSelector::on_document_changed()
{
time_t start = time(NULL);
- OpSet<Tag> allTags = doc.vocabulary().getTags();
+ OpSet<DebtagsDocument::Tag> allTags = doc.vocabulary().tags();
_selected = _selected ^ allTags;
updateView();
time_t end = time(NULL);
@@ -197,7 +196,7 @@
}
void TagSelector::on_selectedTagList_drag_data_get(
- const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data, guint, guint, Tag tag)
+ const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data, guint, guint, DebtagsDocument::Tag tag)
{
string stag = tag.fullname();
selection_data.set(selection_data.get_target(), 8, (const guchar*)stag.data(), stag.size());
@@ -216,10 +215,10 @@
// Create the facet/tag hierarchy
int facets = 0, tags = 0;
- std::map<Facet, std::vector<Tag> > contents;
- for (OpSet<Tag>::const_iterator i = _selected.begin(); i != _selected.end(); i++)
+ std::map<DebtagsDocument::Facet, std::vector<DebtagsDocument::Tag> > contents;
+ for (OpSet<DebtagsDocument::Tag>::const_iterator i = _selected.begin(); i != _selected.end(); i++)
{
- std::map<Facet, vector<Tag> >::iterator j = contents.find(i->facet());
+ std::map<DebtagsDocument::Facet, vector<DebtagsDocument::Tag> >::iterator j = contents.find(i->facet());
if (j != contents.end())
{
j->second.push_back(*i);
@@ -227,9 +226,9 @@
}
else
{
- std::vector<Tag> v;
+ std::vector<DebtagsDocument::Tag> v;
v.push_back(*i);
- contents.insert(pair<Facet, vector<Tag> >(i->facet(), v));
+ contents.insert(pair<DebtagsDocument::Facet, vector<DebtagsDocument::Tag> >(i->facet(), v));
facets++;
tags++;
}
@@ -248,7 +247,7 @@
// Add facets and tags
int row = 0;
- for (std::map<Facet, std::vector<Tag> >::const_iterator i = contents.begin(); i != contents.end(); i++)
+ for (std::map<DebtagsDocument::Facet, std::vector<DebtagsDocument::Tag> >::const_iterator i = contents.begin(); i != contents.end(); i++)
{
//printf("Add facet: %.*s\n", PFSTR(i->first));
@@ -264,20 +263,20 @@
Gtk::Button* addTag = manage(new Gtk::Button("+"));
table->attach(*addTag, 2, 3, row, row + 1, Gtk::SHRINK);
addTag->add_events(Gdk::BUTTON_PRESS_MASK);
- addTag->signal_event().connect(sigc::bind<Facet>(
+ addTag->signal_event().connect(sigc::bind<DebtagsDocument::Facet>(
sigc::mem_fun(*this, &TagSelector::on_facetAdd_event),
i->first));
++row;
- for (vector<Tag>::const_iterator j = i->second.begin(); j != i->second.end(); j++)
+ for (vector<DebtagsDocument::Tag>::const_iterator j = i->second.begin(); j != i->second.end(); j++)
{
//printf("Add tag: %.*s\n", PFSTR(*j));
//table->attach(*manage(new Gtk::Label("")), 0, 1, row, row+1, Gtk::SHRINK);
Gtk::Button* delTag = manage(new Gtk::Button("-"));
table->attach(*delTag, 0, 1, row, row + 1, Gtk::SHRINK);
- delTag->signal_clicked().connect(sigc::bind<Tag>(
+ delTag->signal_clicked().connect(sigc::bind<DebtagsDocument::Tag>(
sigc::mem_fun(*this, &TagSelector::on_del_from_selection),
*j));
@@ -288,12 +287,12 @@
Gtk::EventBox* ebox = manage(new Gtk::EventBox());
ebox->add(*tag);
ebox->add_events(Gdk::BUTTON_PRESS_MASK);
- ebox->signal_event().connect(sigc::bind<Tag>(
+ ebox->signal_event().connect(sigc::bind<DebtagsDocument::Tag>(
sigc::mem_fun(*this, &TagSelector::on_tag_popup_event),
*j));
//ebox->drag_source_set(listTargets, Gdk::ModifierType(GDK_BUTTON1_MASK), Gdk::ACTION_COPY);
ebox->drag_source_set(listTargets);
- ebox->signal_drag_data_get().connect(sigc::bind<Tag>(
+ ebox->signal_drag_data_get().connect(sigc::bind<DebtagsDocument::Tag>(
sigc::mem_fun(*this, &TagSelector::on_selectedTagList_drag_data_get),
*j));
Modified: debtags-edit/trunk/src/TagSelector.h
==============================================================================
--- debtags-edit/trunk/src/TagSelector.h (original)
+++ debtags-edit/trunk/src/TagSelector.h Fri Sep 9 10:09:43 2005
@@ -30,13 +30,13 @@
{
public:
typedef SigC::Signal0<void> type_signal_changed;
- typedef SigC::Signal1<void, Debtags::Tag> type_signal_add_tag;
- typedef SigC::Signal1<void, Debtags::Tag> type_signal_remove_tag;
+ typedef SigC::Signal1<void, DebtagsDocument::Tag> type_signal_add_tag;
+ typedef SigC::Signal1<void, DebtagsDocument::Tag> type_signal_remove_tag;
protected:
DebtagsDocument& doc;
- Tagcoll::OpSet<Debtags::Tag> _selected;
+ Tagcoll::OpSet<DebtagsDocument::Tag> _selected;
Gtk::Table* table;
Gtk::VBox tableBox;
@@ -49,15 +49,15 @@
void updateView();
bool on_titleAdd_event(GdkEvent* e);
- bool on_facetAdd_event(GdkEvent* e, Debtags::Facet facet);
- bool on_tag_popup_event(GdkEvent* e, Debtags::Tag tag);
- void on_add_to_selection(Debtags::Tag tag);
- void on_del_from_selection(Debtags::Tag tag);
+ bool on_facetAdd_event(GdkEvent* e, DebtagsDocument::Facet facet);
+ bool on_tag_popup_event(GdkEvent* e, DebtagsDocument::Tag tag);
+ void on_add_to_selection(DebtagsDocument::Tag tag);
+ void on_del_from_selection(DebtagsDocument::Tag tag);
void on_document_changed();
void on_selectedTagList_drag_data_get(
- const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data, guint, guint, Debtags::Tag tag);
+ const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data, guint, guint, DebtagsDocument::Tag tag);
public:
TagSelector(DebtagsDocument& doc);
@@ -68,11 +68,11 @@
type_signal_remove_tag signal_remove_tag() throw () { return _signal_remove_tag; }
virtual void do_changed();
- virtual void do_add_tag(Debtags::Tag tag);
- virtual void do_remove_tag(Debtags::Tag tag);
+ virtual void do_add_tag(DebtagsDocument::Tag tag);
+ virtual void do_remove_tag(DebtagsDocument::Tag tag);
- const Tagcoll::OpSet<Debtags::Tag>& selected() const throw () { return _selected; }
- const Tagcoll::OpSet<Debtags::Tag>& selected(const Tagcoll::OpSet<Debtags::Tag>& tagset) throw ()
+ const Tagcoll::OpSet<DebtagsDocument::Tag>& selected() const throw () { return _selected; }
+ const Tagcoll::OpSet<DebtagsDocument::Tag>& selected(const Tagcoll::OpSet<DebtagsDocument::Tag>& tagset) throw ()
{
_selected = tagset;
updateView();
Modified: debtags-edit/trunk/src/debtags-edit.cc
==============================================================================
--- debtags-edit/trunk/src/debtags-edit.cc (original)
+++ debtags-edit/trunk/src/debtags-edit.cc Fri Sep 9 10:09:43 2005
@@ -29,7 +29,6 @@
#include <tagcoll/Exception.h>
#include <tagcoll/stringf.h>
-#include <debtags/Tags.h>
#include <apt-front/init.h>
#include <apt-front/cache/cache.h>
@@ -80,7 +79,7 @@
if (opts.get("debug").defined())
Environment::get().debug(true);
- if (!Debtags::Tags<aptFront::cache::entity::Package>::hasTagDatabase())
+ if (!aptFront::cache::component::PackageTags::hasTagDatabase())
{
fprintf(stderr, "Debtags database has not been found. Please run debtags update and try again\n");
return 1;
@@ -91,6 +90,7 @@
// 0 is a pointer to an optional OpProgress object for status feedback
aptFront::cache::Global::get().open(aptFront::cache::Cache::OpenDefault
| aptFront::cache::Cache::OpenReadOnly
+ | aptFront::cache::Cache::OpenTags
| aptFront::cache::Cache::OpenDebtagsEditable);
More information about the Debtags-commits
mailing list