Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
03d0b577
Commit
03d0b577
authored
Nov 20, 2009
by
Friedemann Kleint
Browse files
First polish of options dialog find: Set item flags, match on category.
Strip buddy markers.
parent
1d9af6cc
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/coreplugin/dialogs/settingsdialog.cpp
View file @
03d0b577
...
...
@@ -66,6 +66,7 @@ template<class Parent>
IOptionsPage
*
page
=
0
)
{
QStandardItem
*
rc
=
new
QStandardItem
(
text
);
rc
->
setFlags
(
Qt
::
ItemIsEnabled
|
Qt
::
ItemIsSelectable
);
rc
->
setData
(
QVariant
(
int
(
type
)),
TypeRole
);
rc
->
setData
(
QVariant
(
index
),
IndexRole
);
rc
->
setData
(
qVariantFromValue
(
page
),
PageRole
);
...
...
@@ -115,8 +116,11 @@ bool PageFilterModel::filterAcceptsRow(int source_row, const QModelIndex &source
// Regular contents check, then check page-filter.
if
(
QSortFilterProxyModel
::
filterAcceptsRow
(
source_row
,
source_parent
))
return
true
;
if
(
const
IOptionsPage
*
page
=
pageOfItem
(
sourceModel
(),
source_parent
.
child
(
source_row
,
0
)))
return
page
->
matches
(
filterRegExp
().
pattern
());
if
(
const
IOptionsPage
*
page
=
pageOfItem
(
sourceModel
(),
source_parent
.
child
(
source_row
,
0
)))
{
const
QString
pattern
=
filterRegExp
().
pattern
();
return
page
->
trCategory
().
contains
(
pattern
,
Qt
::
CaseInsensitive
)
||
page
->
matches
(
pattern
);
}
return
false
;
}
...
...
src/plugins/vcsbase/vcsbasesettingspage.cpp
View file @
03d0b577
...
...
@@ -88,6 +88,7 @@ QString VCSBaseSettingsWidget::searchKeyWordMatchString() const
rc
+=
m_ui
->
nickNameMailMapLabel
->
text
();
rc
+=
blank
;
rc
+=
m_ui
->
nickNameFieldsFileLabel
->
text
();
rc
.
remove
(
QLatin1Char
(
'&'
));
// Strip buddy markers.
return
rc
;
}
...
...
@@ -130,7 +131,8 @@ QWidget *VCSBaseSettingsPage::createPage(QWidget *parent)
{
m_widget
=
new
VCSBaseSettingsWidget
(
parent
);
m_widget
->
setSettings
(
m_settings
);
m_searchKeyWords
=
m_widget
->
searchKeyWordMatchString
();
if
(
m_searchKeyWords
.
isEmpty
())
m_searchKeyWords
=
m_widget
->
searchKeyWordMatchString
();
return
m_widget
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment