git.iko.soy/unity8
on xenial help sign in
Actually pass show_all_button value from UnityCore when creating filter options.
commitfd4e062c390782a9fc0824e0ca61f1b0342a300f authorPawel Stolowski <pawel.stolowski@canonical.com> dateWed 28 Aug 2013, 16:30 (13 years ago) parentda4d7db
6 files changed+11−11
compare with xenial
unifiedsplit
plugins/Unity/checkoptionfilter.cpp+1−1 plugins/Unity/multirangefilter.cpp+1−1 plugins/Unity/radiooptionfilter.cpp+1−1 plugins/Unity/ratingsfilter.cpp+1−1 tests/plugins/Unity/filtersbindingstest.cpp+6−6 tests/plugins/Unity/filtersbindingstest.h+1−1
plugins/Unity/checkoptionfilter.cpp+1−1
@@ -53,7 +53,7 @@ void CheckOptionFilter::onOptionsChanged(unity::dash::CheckOptionFilter::CheckOp
5353 m_options = new UnityOptionsModel(this, options,
5454 m_unityCheckOptionFilter->option_added,
5555 m_unityCheckOptionFilter->option_removed,
56− true);
56+ m_unityCheckOptionFilter->show_all_button);
5757
5858 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));
5959 connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));
plugins/Unity/multirangefilter.cpp+1−1
@@ -53,7 +53,7 @@ void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options o
5353 m_options = new UnityOptionsModel(this, options,
5454 m_unityMultiRangeFilter->option_added,
5555 m_unityMultiRangeFilter->option_removed,
56− true);
56+ m_unityMultiRangeFilter->show_all_button);
5757
5858 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));
5959 connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));
plugins/Unity/radiooptionfilter.cpp+1−1
@@ -52,7 +52,7 @@ void RadioOptionFilter::onOptionsChanged(unity::dash::RadioOptionFilter::RadioOp
5252 m_options = new UnityOptionsModel(this, m_unityRadioOptionFilter->options,
5353 m_unityRadioOptionFilter->option_added,
5454 m_unityRadioOptionFilter->option_removed,
55− this);
55+ m_unityRadioOptionFilter->show_all_button);
5656 connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));
5757
5858 m_signals << m_unityRadioOptionFilter->options.changed.connect(sigc::mem_fun(this, &RadioOptionFilter::onOptionsChanged));
plugins/Unity/ratingsfilter.cpp+1−1
@@ -53,7 +53,7 @@ void RatingsFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
5353
5454 delete m_options;
5555
56− m_options = new RatingOptionsModel(true, this);
56+ m_options = new RatingOptionsModel(m_unityRatingsFilter->show_all_button, this);
5757 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), m_options, SLOT(ensureTheOnlyActive(AbstractFilterOption *)));
5858 connect(m_options, SIGNAL(activeChanged(AbstractFilterOption *)), this, SLOT(onActiveChanged(AbstractFilterOption *)));
5959 connect(m_options, SIGNAL(showAllActivated()), this, SLOT(clear()));
tests/plugins/Unity/filtersbindingstest.cpp+6−6
@@ -65,17 +65,17 @@ DeeModel* FiltersBindingsTest::createFilterModel()
6565
6666void FiltersBindingsTest::createMultiRangeFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount)
6767{
68− createFilter(model, "filter-multirange", id, name, optionCount);
68+ createFilter(model, "filter-multirange", id, name, optionCount, true);
6969}
7070
7171void FiltersBindingsTest::createRadioOptionFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount)
7272{
73− createFilter(model, "filter-radiooption", id, name, optionCount);
73+ createFilter(model, "filter-radiooption", id, name, optionCount, true);
7474}
7575
7676void FiltersBindingsTest::createCheckOptionFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount)
7777{
78− createFilter(model, "filter-checkoption", id, name, optionCount);
78+ createFilter(model, "filter-checkoption", id, name, optionCount, true);
7979}
8080
8181void FiltersBindingsTest::createRatingsFilter(DeeModel *model, const std::string &id, const std::string &name)
@@ -90,7 +90,7 @@ void FiltersBindingsTest::createRatingsFilter(DeeModel *model, const std::string
9090 GVariant *children[2];
9191 GVariant *key1 = g_variant_new_string("show-all-button");
9292 GVariant *key2 = g_variant_new_string("rating");
93− children[0] = g_variant_new_dict_entry(key1, g_variant_new_variant(g_variant_new_boolean(false)));
93+ children[0] = g_variant_new_dict_entry(key1, g_variant_new_variant(g_variant_new_boolean(true)));
9494 children[1] = g_variant_new_dict_entry(key2, g_variant_new_variant(g_variant_new_double(0.0f)));
9595 auto fhints = g_variant_new_array(G_VARIANT_TYPE("{sv}"), children, 2);
9696
@@ -102,7 +102,7 @@ void FiltersBindingsTest::createRatingsFilter(DeeModel *model, const std::string
102102 dee_model_append_row(model, row);
103103}
104104
105−void FiltersBindingsTest::createFilter(DeeModel *model, const std::string &renderer, const std::string &id, const std::string &name, int optionCount)
105+void FiltersBindingsTest::createFilter(DeeModel *model, const std::string &renderer, const std::string &id, const std::string &name, int optionCount, bool showAll)
106106{
107107 GVariant* row[8];
108108
@@ -114,7 +114,7 @@ void FiltersBindingsTest::createFilter(DeeModel *model, const std::string &rende
114114 GVariant *children[2];
115115 GVariant *key1 = g_variant_new_string("show-all-button");
116116 GVariant *key2 = g_variant_new_string("options");
117− children[0] = g_variant_new_dict_entry(key1, g_variant_new_variant(g_variant_new_boolean(false)));
117+ children[0] = g_variant_new_dict_entry(key1, g_variant_new_variant(g_variant_new_boolean(showAll)));
118118 children[1] = g_variant_new_dict_entry(key2, g_variant_new_variant(createOptions(optionCount)));
119119 auto fhints = g_variant_new_array(G_VARIANT_TYPE("{sv}"), children, 2);
120120
tests/plugins/Unity/filtersbindingstest.h+1−1
@@ -41,7 +41,7 @@ class FiltersBindingsTest : public QObject
4141 void createCheckOptionFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount);
4242 void createRadioOptionFilter(DeeModel *model, const std::string &id, const std::string &name, int optionCount);
4343 void createRatingsFilter(DeeModel *model, const std::string &id, const std::string &name);
44− void createFilter(DeeModel *model, const std::string &renderer, const std::string &id, const std::string &name, int optionCount);
44+ void createFilter(DeeModel *model, const std::string &renderer, const std::string &id, const std::string &name, int optionCount, bool showAll);
4545};
4646
4747#endif // FILTERSBINDINGSTEST_H