13e3d90 · unity8 · git.iko.soy

debian/changelog+11

compare with xenial

unifiedsplit

@@ -1,3 +1,14 @@

1+unity8 (7.81.3+13.10.20130820.2-0ubuntu1) saucy; urgency=low

2+

3+ [ Michael Zanetti ]

4+ * initial support for quicklists For now they support pinning and

5+ removing of items.

6+

7+ [ Ubuntu daily release ]

8+ * Automatic snapshot from revision 217

9+

10+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 20 Aug 2013 10:09:36 +0000

11+

1unity8 (7.81.3+13.10.20130820-0ubuntu1) saucy; urgency=low

12unity8 (7.81.3+13.10.20130820-0ubuntu1) saucy; urgency=low

2

13

3 [ Andrea Cimitan ]

14 [ Andrea Cimitan ]

plugins/Unity/IndicatorsLegacy/flatmenuproxymodel.cpp+13

@@ -80,6 +80,19 @@ void FlatMenuProxyModel::setSourceModel(QAbstractItemModel *source)

80 SIGNAL(modelReset()),

81 SLOT(onModelReset()), Qt::QueuedConnection);

82

83+ //Connection args

84+ connect(source,

85+ SIGNAL(busTypeChanged(DBusEnums::BusType)),

86+ SIGNAL(busTypeChanged()));

87+

88+ connect(source,

89+ SIGNAL(busNameChanged(const QString&)),

90+ SIGNAL(busNameChanged()));

91+

92+ connect(source,

93+ SIGNAL(objectPathChanged(const QString&)),

94+ SIGNAL(objectPathChanged()));

95+

83 connect(source,

96 connect(source,

84 SIGNAL(statusChanged(DBusEnums::ConnectionStatus)),

97 SIGNAL(statusChanged(DBusEnums::ConnectionStatus)),

85 SIGNAL(statusChanged()), Qt::QueuedConnection);

98 SIGNAL(statusChanged()), Qt::QueuedConnection);

plugins/Unity/filters.cpp+4

@@ -23,6 +23,7 @@

23

24// Local

25#include "filter.h"

26+#include "genericoptionsmodel.h"

26

27

27// Qt

28// Qt

28#include <QDebug>

29#include <QDebug>

@@ -77,6 +78,8 @@ QVariant Filters::data(const QModelIndex& index, int role) const

77 return filter->collapsed();

78 return filter->collapsed();

78 case Filters::RoleFiltering:

79 case Filters::RoleFiltering:

79 return filter->filtering();

80 return filter->filtering();

81+ case Filters::RoleOptions:

82+ return QVariant::fromValue(filter->options());

80 default:

83 default:

81 break;

84 break;

82 }

85 }

@@ -93,6 +96,7 @@ QHash<int, QByteArray> Filters::roleNames() const

93 roles[Filters::RoleVisible] = "visible";

96 roles[Filters::RoleVisible] = "visible";

94 roles[Filters::RoleCollapsed] = "collapsed";

97 roles[Filters::RoleCollapsed] = "collapsed";

95 roles[Filters::RoleFiltering] = "filtering";

98 roles[Filters::RoleFiltering] = "filtering";

99+ roles[Filters::RoleOptions] = "options";

96 return roles;

100 return roles;

97}

101}

98

102

plugins/Unity/filters.h+2−1

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

48 RoleRendererName,

49 RoleVisible,

50 RoleCollapsed,

51− RoleFiltering

51+ RoleFiltering,

52+ RoleOptions

52 };

53 };

53

54

54 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

55 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

plugins/Unity/genericoptionsmodel.cpp+18

@@ -76,6 +76,24 @@ int GenericOptionsModel::rowCount(const QModelIndex& /* parent */) const

76 return m_options.size ();

77}

78

79+void GenericOptionsModel::setActive(QVector<AbstractFilterOption *>::size_type idx, bool value)

80+{

81+ if (idx < m_options.size())

82+ {

83+ m_options[idx]->setActive(value);

84+ }

85+}

86+

87+void GenericOptionsModel::setActive(const QString &id, bool value)

88+{

89+ Q_FOREACH(auto opt, m_options) {

90+ if (opt->id() == id) {

91+ opt->setActive(value);

92+ break;

93+ }

94+ }

95+}

96+

79AbstractFilterOption* GenericOptionsModel::getRawOption(QVector<AbstractFilterOption *>::size_type idx) const

97AbstractFilterOption* GenericOptionsModel::getRawOption(QVector<AbstractFilterOption *>::size_type idx) const

80{

98{

81 if (idx < m_options.size())

99 if (idx < m_options.size())

plugins/Unity/genericoptionsmodel.h+3

@@ -49,6 +49,9 @@ public:

49 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

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

51

52+ Q_INVOKABLE void setActive(QVector<AbstractFilterOption *>::size_type idx, bool value);

53+ Q_INVOKABLE void setActive(const QString &id, bool value);

54+

52 AbstractFilterOption* getRawOption(QVector<AbstractFilterOption *>::size_type idx) const;

55 AbstractFilterOption* getRawOption(QVector<AbstractFilterOption *>::size_type idx) const;

53

56

54public Q_SLOTS:

57public Q_SLOTS: