equal
deleted
inserted
replaced
36 if(isFilteringDLC || isFilteringHidden) |
36 if(isFilteringDLC || isFilteringHidden) |
37 { |
37 { |
38 QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent); |
38 QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent); |
39 bool isDLC = index.data(ThemeModel::IsDlcRole).toBool(); |
39 bool isDLC = index.data(ThemeModel::IsDlcRole).toBool(); |
40 bool isHidden = index.data(ThemeModel::IsHiddenRole).toBool(); |
40 bool isHidden = index.data(ThemeModel::IsHiddenRole).toBool(); |
41 return ( |
41 if( |
42 ((isFilteringDLC && !isDLC) || !isFilteringDLC) && |
42 ((isFilteringDLC && !isDLC) || !isFilteringDLC) && |
43 ((isFilteringHidden && !isHidden) || !isFilteringHidden)); |
43 ((isFilteringHidden && !isHidden) || !isFilteringHidden)) |
44 |
44 { |
|
45 if(!filterRegExp().isEmpty()) |
|
46 { |
|
47 // Also check regular expression set by the theme chooser search |
|
48 QString name = index.data(ThemeModel::ActualNameRole).toString(); |
|
49 int index = filterRegExp().indexIn(name); |
|
50 return index != -1; |
|
51 } |
|
52 else |
|
53 return true; |
|
54 } |
45 } |
55 } |
46 else |
56 else |
47 { |
57 { |
48 return true; |
58 return true; |
49 } |
59 } |