Differential D14219 Diff 38056 src/project/projectwidget.cpp

Changeset View

Standalone View

View Options

src/project/projectwidget.cpp

Show First 20 Lines • Show All 137 Lines • ▼ Show 20 Line(s)
138{ 138​{
139public: 139​public:
140 SortFilterProxyModel(QObject* parent=0) 140​ SortFilterProxyModel(QObject* parent=0)
141 : KDirSortFilterProxyModel(parent) 141​ : KDirSortFilterProxyModel(parent)
142 { 142​ {
143 connect(Project::instance()->model(),SIGNAL(totalsChanged(int,int,int,bool)),this,SLOT(invalidate())); 143​ connect(Project::instance()->model(),SIGNAL(totalsChanged(int,int,int,bool)),this,SLOT(invalidate()));
144 } 144​ }
145 ~SortFilterProxyModel(){} 145​ ~SortFilterProxyModel(){}
146​ void toggleTranslatedFiles();
146protected: 147​protected:
147 bool lessThan(const QModelIndex& left, 148​ bool lessThan(const QModelIndex& left,
148 const QModelIndex& right) const; 149​ const QModelIndex& right) const;
149 bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; 150​ bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
151​private:
152​ bool m_hideTranslatedFiles = false;
150}; 153​};
151 154​
155​void SortFilterProxyModel::toggleTranslatedFiles() {
mlaurentUnsubmitted
Done

coding style:
::foo()
{
...
}

mlaurent: coding style: ::foo() { ... }
aacidUnsubmitted
Done

You still need to move the { down.

aacid: You still need to move the { down.
156​ m_hideTranslatedFiles = !m_hideTranslatedFiles;
157​}
152 158​
153bool SortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const 159​bool SortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
154{ 160​{
155 bool result=false; 161​ bool result=false;
156 const QAbstractItemModel* model=sourceModel(); 162​ const QAbstractItemModel* model=sourceModel();
157 QModelIndex item=model->index(source_row,0,source_parent); 163​ QModelIndex item=model->index(source_row,0,source_parent);
158/* 164​/*
159 if (model->hasChildren(item)) 165​ if (model->hasChildren(item))
160 model->fetchMore(item); 166​ model->fetchMore(item);
161*/ 167​*/
162 if (item.data(ProjectModel::TotalRole) == 0) 168​ if (item.data(ProjectModel::TotalRole) == 0)
163 return false; // Hide rows with no translations 169​ return false; // Hide rows with no translations
164 170​
171​ if (item.data(ProjectModel::FuzzyUntrCountAllRole) == 0 && m_hideTranslatedFiles)
172​ return false; // Hide rows with no untranslated items if the filter is enabled
173​
165 int i=model->rowCount(item); 174​ int i=model->rowCount(item);
166 while(--i>=0 && !result) 175​ while(--i>=0 && !result)
167 result=filterAcceptsRow(i,item); 176​ result=filterAcceptsRow(i,item);
168 177​
169 return result || QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent); 178​ return result || QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent);
170} 179​}
171 180​
172bool SortFilterProxyModel::lessThan(const QModelIndex& left, 181​bool SortFilterProxyModel::lessThan(const QModelIndex& left,
▲ Show 20 Lines • Show All 323 Lines • ▼ Show 20 Line(s)
496void ProjectWidget::gotoPrevFuzzy() {gotoIndex(currentIndex(), ProjectModel::FuzzyCountRole, -1);} 505​void ProjectWidget::gotoPrevFuzzy() {gotoIndex(currentIndex(), ProjectModel::FuzzyCountRole, -1);}
497void ProjectWidget::gotoNextFuzzy() {gotoIndex(currentIndex(), ProjectModel::FuzzyCountRole, +1);} 506​void ProjectWidget::gotoNextFuzzy() {gotoIndex(currentIndex(), ProjectModel::FuzzyCountRole, +1);}
498void ProjectWidget::gotoPrevUntranslated() {gotoIndex(currentIndex(), ProjectModel::UntransCountRole, -1);} 507​void ProjectWidget::gotoPrevUntranslated() {gotoIndex(currentIndex(), ProjectModel::UntransCountRole, -1);}
499void ProjectWidget::gotoNextUntranslated() {gotoIndex(currentIndex(), ProjectModel::UntransCountRole, +1);} 508​void ProjectWidget::gotoNextUntranslated() {gotoIndex(currentIndex(), ProjectModel::UntransCountRole, +1);}
500void ProjectWidget::gotoPrevTemplateOnly() {gotoIndex(currentIndex(), ProjectModel::TemplateOnlyRole, -1);} 509​void ProjectWidget::gotoPrevTemplateOnly() {gotoIndex(currentIndex(), ProjectModel::TemplateOnlyRole, -1);}
501void ProjectWidget::gotoNextTemplateOnly() {gotoIndex(currentIndex(), ProjectModel::TemplateOnlyRole, +1);} 510​void ProjectWidget::gotoNextTemplateOnly() {gotoIndex(currentIndex(), ProjectModel::TemplateOnlyRole, +1);}
502void ProjectWidget::gotoPrevTransOnly() {gotoIndex(currentIndex(), ProjectModel::TransOnlyRole, -1);} 511​void ProjectWidget::gotoPrevTransOnly() {gotoIndex(currentIndex(), ProjectModel::TransOnlyRole, -1);}
503void ProjectWidget::gotoNextTransOnly() {gotoIndex(currentIndex(), ProjectModel::TransOnlyRole, +1);} 512​void ProjectWidget::gotoNextTransOnly() {gotoIndex(currentIndex(), ProjectModel::TransOnlyRole, +1);}
513​void ProjectWidget::toggleTranslatedFiles()
514​{
515​ m_proxyModel->toggleTranslatedFiles();
516​ m_proxyModel->invalidate();
aacidUnsubmitted
Done

Can you try with invalidateFilter ? Reading the documentation it seems it would make more sense.

Also IMHO it makes more sense to call this inside toggletranslatedfiles than here.

aacid: Can you try with invalidateFilter ? Reading the documentation it seems it would make more sense.
517​}
504 518​
505QSortFilterProxyModel* ProjectWidget::proxyModel(){return m_proxyModel;} 519​QSortFilterProxyModel* ProjectWidget::proxyModel(){return m_proxyModel;}
506 520​