4399b29 · unity8 · git.iko.soy

plugins/Unity/checkoptionfilter.cpp+3−1

compare with xenial

unifiedsplit

@@ -52,9 +52,11 @@ void CheckOptionFilter::onOptionsChanged(unity::dash::CheckOptionFilter::CheckOp

52

53 m_options = new UnityOptionsModel(this, options,

54 m_unityCheckOptionFilter->option_added,

55− m_unityCheckOptionFilter->option_removed);

55+ m_unityCheckOptionFilter->option_removed,

56+ true);

56

57

57 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));

58 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));

59+ connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));

58

60

59 /* Property change signals */

61 /* Property change signals */

60 m_signals << m_unityCheckOptionFilter->options.changed.connect(sigc::mem_fun(this, &CheckOptionFilter::onOptionsChanged));

62 m_signals << m_unityCheckOptionFilter->options.changed.connect(sigc::mem_fun(this, &CheckOptionFilter::onOptionsChanged));

plugins/Unity/filter.h+3−2

@@ -56,11 +56,12 @@ public:

56 bool filtering() const;

57 virtual GenericOptionsModel* options() const = 0;

58

59− Q_INVOKABLE void clear();

60−

61 static Filter* newFromUnityFilter(unity::dash::Filter::Ptr unityFilter);

59 static Filter* newFromUnityFilter(unity::dash::Filter::Ptr unityFilter);

62 bool hasUnityFilter(unity::dash::Filter::Ptr unityFilter) const;

60 bool hasUnityFilter(unity::dash::Filter::Ptr unityFilter) const;

63

61

62+public Q_SLOTS:

63+ void clear();

64+

64Q_SIGNALS:

65Q_SIGNALS:

65 void optionsChanged();

66 void optionsChanged();

66

67

plugins/Unity/genericoptionsmodel.cpp+7−6

@@ -32,7 +32,7 @@ GenericOptionsModel::GenericOptionsModel(bool showAllOption, QObject *parent)

32 auto showAll = new ShowAllFilterOption(this);

33 connect(showAll, SIGNAL(activeChanged(bool)), this, SLOT(onOptionChanged()));

34 connect(showAll, SIGNAL(activeChanged(bool)), this, SLOT(onShowAllClicked(bool)));

35− addOption(showAll, 0);

35+ addOption(showAll);

36 }

37}

38

@@ -111,11 +111,6 @@ AbstractFilterOption* GenericOptionsModel::getRawOption(QVector<AbstractFilterOp

111 return nullptr;

112}

113

114−void GenericOptionsModel::onShowAllClicked(bool active)

115−{

116− ensureTheOnlyActive(m_options[0]);

117−}

118−

119void GenericOptionsModel::ensureTheOnlyActive(AbstractFilterOption *activeOption)

114void GenericOptionsModel::ensureTheOnlyActive(AbstractFilterOption *activeOption)

120{

115{

121 if (activeOption->active()) {

116 if (activeOption->active()) {

@@ -181,3 +176,9 @@ void GenericOptionsModel::onActiveChanged()

181 Q_EMIT activeChanged(option);

176 Q_EMIT activeChanged(option);

182 }

177 }

183}

178}

179+

180+void GenericOptionsModel::onShowAllClicked(bool active)

181+{

182+ if (active)

183+ Q_EMIT showAllActivated();

184+}

plugins/Unity/genericoptionsmodel.h+2−1

@@ -59,6 +59,7 @@ public Q_SLOTS:

59

60Q_SIGNALS:

61 void activeChanged(AbstractFilterOption *option);

62+ void showAllActivated();

62

63

63protected Q_SLOTS:

64protected Q_SLOTS:

64 void onOptionChanged();

65 void onOptionChanged();

@@ -66,7 +67,7 @@ protected Q_SLOTS:

66 void onShowAllClicked(bool active);

67 void onShowAllClicked(bool active);

67

68

68protected:

69protected:

69− void addOption(AbstractFilterOption *option, int index);

70+ void addOption(AbstractFilterOption *option, int index = -1);

70 void removeOption(int index);

71 void removeOption(int index);

71 int indexOf(const QString &option_id);

72 int indexOf(const QString &option_id);

72

73

plugins/Unity/multirangefilter.cpp+3−1

@@ -52,9 +52,11 @@ void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options o

52

53 m_options = new UnityOptionsModel(this, options,

54 m_unityMultiRangeFilter->option_added,

55− m_unityMultiRangeFilter->option_removed);

55+ m_unityMultiRangeFilter->option_removed,

56+ true);

56

57

57 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));

58 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));

59+ connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));

58

60

59 /* Property change signals */

61 /* Property change signals */

60 m_signals << m_unityMultiRangeFilter->options.changed.connect(sigc::mem_fun(this, &MultiRangeFilter::onOptionsChanged));

62 m_signals << m_unityMultiRangeFilter->options.changed.connect(sigc::mem_fun(this, &MultiRangeFilter::onOptionsChanged));

plugins/Unity/radiooptionfilter.cpp+3−1

@@ -51,7 +51,9 @@ void RadioOptionFilter::onOptionsChanged(unity::dash::RadioOptionFilter::RadioOp

51 }

52 m_options = new UnityOptionsModel(this, m_unityRadioOptionFilter->options,

53 m_unityRadioOptionFilter->option_added,

54− m_unityRadioOptionFilter->option_removed);

54+ m_unityRadioOptionFilter->option_removed,

55+ this);

56+ connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));

55

57

56 m_signals << m_unityRadioOptionFilter->options.changed.connect(sigc::mem_fun(this, &RadioOptionFilter::onOptionsChanged));

58 m_signals << m_unityRadioOptionFilter->options.changed.connect(sigc::mem_fun(this, &RadioOptionFilter::onOptionsChanged));

57

59

plugins/Unity/ratingoptionsmodel.cpp+3−3

@@ -23,11 +23,11 @@

23// local

24#include "ratingfilteroption.h"

25

26−RatingOptionsModel::RatingOptionsModel(QObject *parent) :

26+RatingOptionsModel::RatingOptionsModel(bool showAllOption, QObject *parent) :

27− GenericOptionsModel(parent)

27+ GenericOptionsModel(showAllOption, parent)

28{

29 for (int i=1; i<=5; i++) {

30 auto opt = new RatingFilterOption(QString::number(i), i*0.2f, this);

31− addOption(opt, i-1);

31+ addOption(opt);

32 }

33}

plugins/Unity/ratingoptionsmodel.h+1−1

@@ -27,7 +27,7 @@ class RatingOptionsModel : public GenericOptionsModel

27 Q_OBJECT

28

29public:

30− RatingOptionsModel(QObject *parent);

30+ RatingOptionsModel(bool showAllOption, QObject *parent);

31};

32

33#endif // RATINGOPTIONSMODEL_H

plugins/Unity/ratingsfilter.cpp+2−1

@@ -53,9 +53,10 @@ void RatingsFilter::setUnityFilter(unity::dash::Filter::Ptr filter)

53

54 delete m_options;

55

56− m_options = new RatingOptionsModel(this);

56+ m_options = new RatingOptionsModel(true, this);

57 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));

58 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), this, SLOT(onActiveChanged(AbstractFilterOption *)));

59+ connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));

59

60

60 Q_EMIT optionsChanged();

61 Q_EMIT optionsChanged();

61}

62}

plugins/Unity/unityoptionsmodel.cpp+5−4

@@ -26,8 +26,9 @@

26UnityOptionsModel::UnityOptionsModel(QObject *parent,

27 const std::vector<unity::dash::FilterOption::Ptr> options,

28 sigc::signal<void, unity::dash::FilterOption::Ptr> optionAdded,

29− sigc::signal<void, unity::dash::FilterOption::Ptr> optionRemoved) :

29+ sigc::signal<void, unity::dash::FilterOption::Ptr> optionRemoved,

30+ bool showAllOption) :

30− GenericOptionsModel(parent)

31+ GenericOptionsModel(showAllOption, parent)

31{

32{

32 setOptions(options, optionAdded, optionRemoved);

33 setOptions(options, optionAdded, optionRemoved);

33}

34}

@@ -38,7 +39,7 @@ void UnityOptionsModel::setOptions(const std::vector<unity::dash::FilterOption::

38{

39{

39 for (unsigned int i=0; i<options.size(); i++)

40 for (unsigned int i=0; i<options.size(); i++)

40 {

41 {

41− addOption(new FilterOption(options[i], this), i);

42+ addOption(new FilterOption(options[i], this));

42 }

43 }

43 optionAdded.connect(sigc::mem_fun(this, &UnityOptionsModel::onOptionAdded));

44 optionAdded.connect(sigc::mem_fun(this, &UnityOptionsModel::onOptionAdded));

44 optionRemoved.connect(sigc::mem_fun(this, &UnityOptionsModel::onOptionRemoved));

45 optionRemoved.connect(sigc::mem_fun(this, &UnityOptionsModel::onOptionRemoved));

@@ -50,7 +51,7 @@ void UnityOptionsModel::onOptionAdded(unity::dash::FilterOption::Ptr option)

50 if (index >= 0)

51 if (index >= 0)

51 {

52 {

52 beginInsertRows(QModelIndex(), index, index);

53 beginInsertRows(QModelIndex(), index, index);

53− addOption(new FilterOption(option, this), index);

54+ addOption(new FilterOption(option, this));

54 endInsertRows();

55 endInsertRows();

55 }

56 }

56}

57}

plugins/Unity/unityoptionsmodel.h+2−1

@@ -35,7 +35,8 @@ public:

35 UnityOptionsModel(QObject *parent,

36 const std::vector<unity::dash::FilterOption::Ptr> options,

37 sigc::signal<void, unity::dash::FilterOption::Ptr> optionAdded,

38− sigc::signal<void, unity::dash::FilterOption::Ptr> optionRemoved);

38+ sigc::signal<void, unity::dash::FilterOption::Ptr> optionRemoved,

39+ bool showAllOption);

39

40

40private:

41private:

41 void setOptions(const std::vector<unity::dash::FilterOption::Ptr> options,

42 void setOptions(const std::vector<unity::dash::FilterOption::Ptr> options,