865b871 · unity8 · git.iko.soy

plugins/Unity/checkoptionfilter.h−1

compare with xenial

unifiedsplit

@@ -29,7 +29,6 @@

29

30// Local

31#include "filter.h"

32−#include "filteroption.h"

33#include "signalslist.h"

32#include "signalslist.h"

34

33

35class Q_DECL_EXPORT CheckOptionFilter : public Filter

34class Q_DECL_EXPORT CheckOptionFilter : public Filter

plugins/Unity/filter.cpp+16−2

@@ -44,45 +44,59 @@ Filter::Filter(QObject *parent) :

44

45QString Filter::id() const

46{

47+ if (!m_unityFilter)

48+ return QString::Null();

47 return QString::fromStdString(m_unityFilter->id());

49 return QString::fromStdString(m_unityFilter->id());

48}

50}

49

51

50QString Filter::name() const

52QString Filter::name() const

51{

53{

54+ if (!m_unityFilter)

55+ return QString::Null();

52 return QString::fromStdString(m_unityFilter->name());

56 return QString::fromStdString(m_unityFilter->name());

53}

57}

54

58

55QString Filter::iconHint() const

59QString Filter::iconHint() const

56{

60{

61+ if (!m_unityFilter)

62+ return QString::Null();

57 return QString::fromStdString(m_unityFilter->icon_hint());

63 return QString::fromStdString(m_unityFilter->icon_hint());

58}

64}

59

65

60QString Filter::rendererName() const

66QString Filter::rendererName() const

61{

67{

68+ if (!m_unityFilter)

69+ return QString::Null();

62 return QString::fromStdString(m_unityFilter->renderer_name());

70 return QString::fromStdString(m_unityFilter->renderer_name());

63}

71}

64

72

65bool Filter::visible() const

73bool Filter::visible() const

66{

74{

75+ if (!m_unityFilter)

76+ return false;

67 return m_unityFilter->visible();

77 return m_unityFilter->visible();

68}

78}

69

79

70bool Filter::collapsed() const

80bool Filter::collapsed() const

71{

81{

82+ if (!m_unityFilter)

83+ return false;

72 return m_unityFilter->collapsed();

84 return m_unityFilter->collapsed();

73}

85}

74

86

75bool Filter::filtering() const

87bool Filter::filtering() const

76{

88{

89+ if (!m_unityFilter)

90+ return false;

77 return m_unityFilter->filtering();

91 return m_unityFilter->filtering();

78}

92}

79

93

80void Filter::clear()

94void Filter::clear()

81{

95{

96+ if (m_unityFilter)

82− m_unityFilter->Clear();

97+ m_unityFilter->Clear();

83}

98}

84

99

85−

86void Filter::setUnityFilter(unity::dash::Filter::Ptr unityFilter)

100void Filter::setUnityFilter(unity::dash::Filter::Ptr unityFilter)

87{

101{

88 if (m_unityFilter != nullptr) {

102 if (m_unityFilter != nullptr) {

plugins/Unity/filteroption.cpp+6−6

@@ -70,19 +70,19 @@ void FilterOption::setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilt

70 << m_unityFilterOption->active.changed.connect(sigc::mem_fun(this, &FilterOption::onActiveChanged));

71}

72

73−void FilterOption::onIdChanged(const std::string &/* id */)

73+void FilterOption::onIdChanged(const std::string &id)

74{

75− Q_EMIT idChanged(id());

75+ Q_EMIT idChanged(QString::fromStdString(id));

76}

77

78−void FilterOption::onNameChanged(const std::string &/* name */)

78+void FilterOption::onNameChanged(const std::string &name)

79{

80− Q_EMIT nameChanged(name());

80+ Q_EMIT nameChanged(QString::fromStdString(name));

81}

82

83−void FilterOption::onIconHintChanged(const std::string &/* iconHint */)

83+void FilterOption::onIconHintChanged(const std::string &iconHint)

84{

85− Q_EMIT iconHintChanged(iconHint());

85+ Q_EMIT iconHintChanged(QString::fromStdString(iconHint));

86}

87

88void FilterOption::onActiveChanged(bool active)

plugins/Unity/filters.cpp+1−6

@@ -27,9 +27,6 @@

27// Qt

28#include <QDebug>

29

30−// libunity-core

31−#include <UnityCore/Filters.h>

32−

33Filters::Filters(unity::dash::Filters::Ptr unityFilters, QObject *parent) :

30Filters::Filters(unity::dash::Filters::Ptr unityFilters, QObject *parent) :

34 QAbstractListModel(parent), m_unityFilters(unityFilters)

31 QAbstractListModel(parent), m_unityFilters(unityFilters)

35{

32{

@@ -155,9 +152,7 @@ void Filters::removeFilter(int index)

155

152

156int Filters::indexForFilter(unity::dash::Filter::Ptr unityFilter)

153int Filters::indexForFilter(unity::dash::Filter::Ptr unityFilter)

157{

154{

158− // TODO: use a map

159− int index;

160− for (index=0; index<m_filters.count(); index++) {

155+ for (int index=0; index<m_filters.count(); index++) {

161 if (m_filters[index]->hasUnityFilter(unityFilter)) {

156 if (m_filters[index]->hasUnityFilter(unityFilter)) {

162 return index;

157 return index;

163 }

158 }

plugins/Unity/filters.h+5−5

@@ -55,13 +55,9 @@ public:

55 int rowCount(const QModelIndex& parent = QModelIndex()) const override;

56 QHash<int, QByteArray> roleNames() const override;

57

58− Q_INVOKABLE Filter* getFilter(const QString& id) const;

58+ Filter* getFilter(const QString& id) const;

59

60private:

61− unity::dash::Filters::Ptr m_unityFilters;

62− QList<Filter*> m_filters;

63− QHash<int, QByteArray> m_roles;

64−

65 void onFilterAdded(unity::dash::Filter::Ptr unityFilter);

61 void onFilterAdded(unity::dash::Filter::Ptr unityFilter);

66 void onFilterChanged(unity::dash::Filter::Ptr unityFilter);

62 void onFilterChanged(unity::dash::Filter::Ptr unityFilter);

67 void onFilterRemoved(unity::dash::Filter::Ptr unityFilter);

63 void onFilterRemoved(unity::dash::Filter::Ptr unityFilter);

@@ -70,6 +66,10 @@ private:

70 void removeFilter(int index);

66 void removeFilter(int index);

71

67

72 int indexForFilter(unity::dash::Filter::Ptr unityFilter);

68 int indexForFilter(unity::dash::Filter::Ptr unityFilter);

69+

70+ unity::dash::Filters::Ptr m_unityFilters;

71+ QList<Filter*> m_filters;

72+ QHash<int, QByteArray> m_roles;

73};

74

75Q_DECLARE_METATYPE(Filters*)

plugins/Unity/genericoptionsmodel.h+1

@@ -67,6 +67,7 @@ protected:

67 int indexOf(const QString &option_id);

68

69 QVector<AbstractFilterOption *> m_options;

70+

70private:

71private:

71 void setupRoles();

72 void setupRoles();

72 QHash<int, QByteArray> m_roles;

73 QHash<int, QByteArray> m_roles;

plugins/Unity/multirangefilter.cpp+2−2

@@ -42,7 +42,7 @@ void MultiRangeFilter::setUnityFilter(unity::dash::Filter::Ptr filter)

42 onOptionsChanged(m_unityMultiRangeFilter->options);

43}

44

45−void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options /* options */)

45+void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options options)

46{

47 if (m_options != nullptr) {

48 m_signals.disconnectAll();

@@ -50,7 +50,7 @@ void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options /

50 m_options = nullptr;

51 }

52

53− m_options = new UnityOptionsModel(this, m_unityMultiRangeFilter->options,

53+ m_options = new UnityOptionsModel(this, options,

54 m_unityMultiRangeFilter->option_added,

55 m_unityMultiRangeFilter->option_removed);

56

plugins/Unity/multirangefilter.h−1

@@ -30,7 +30,6 @@

30

31// Local

32#include "filter.h"

33−#include "filteroption.h"

34#include "signalslist.h"

33#include "signalslist.h"

35

34

36class GenericOptionsModel;

35class GenericOptionsModel;

plugins/Unity/ratingfilteroption.cpp+1−1

@@ -17,6 +17,7 @@

17 * along with this program. If not, see <http://www.gnu.org/licenses/>.

18 */

19

20+// self

20#include "ratingfilteroption.h"

21#include "ratingfilteroption.h"

21

22

22RatingFilterOption::RatingFilterOption(const QString &id, float value, QObject *parent) :

23RatingFilterOption::RatingFilterOption(const QString &id, float value, QObject *parent) :

@@ -32,7 +33,6 @@ QString RatingFilterOption::id() const

32 return m_id;

33 return m_id;

33}

34}

34

35

35−

36QString RatingFilterOption::name() const

37{

38 return QString::Null();

plugins/Unity/ratingfilteroption.h+3

@@ -20,12 +20,15 @@

20#ifndef RATINGFILTEROPTION_H

21#define RATINGFILTEROPTION_H

22

23+// local

23#include "abstractfilteroption.h"

24#include "abstractfilteroption.h"

24

25

25class Q_DECL_EXPORT RatingFilterOption : public AbstractFilterOption

26class Q_DECL_EXPORT RatingFilterOption : public AbstractFilterOption

26{

27{

27 Q_OBJECT

28 Q_OBJECT

28

29

30+ Q_PROPERTY(float value READ value CONSTANT)

31+

29public:

32public:

30 explicit RatingFilterOption(const QString &id, float ratingValue, QObject *parent = nullptr);

33 explicit RatingFilterOption(const QString &id, float ratingValue, QObject *parent = nullptr);

31

34

plugins/Unity/ratingsfilter.cpp+3−1

@@ -65,6 +65,8 @@ void RatingsFilter::onActiveChanged(AbstractFilterOption *option)

65 RatingFilterOption *ratingOption = dynamic_cast<RatingFilterOption*>(option);

66 if (ratingOption != nullptr)

67 {

68− m_unityRatingsFilter->rating = ratingOption->active() ? ratingOption->value() : 0.0f;

68+ const float val = ratingOption->active() ? ratingOption->value() : 0.0f;

69+ m_unityRatingsFilter->rating = val;

70+ Q_EMIT ratingChanged(val);

69 }

71 }

70}

72}