Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
bb317003
Commit
bb317003
authored
Jan 02, 2015
by
Jeffrey Oliver
Browse files
Save filters after a filter clear.
Remove some duplicated code.
parent
f01d26bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/gameselector.cpp
View file @
bb317003
...
@@ -33,7 +33,6 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup
...
@@ -33,7 +33,6 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup
if
(
_room
)
if
(
_room
)
gameListView
->
header
()
->
hideSection
(
gameListModel
->
roomColIndex
());
gameListView
->
header
()
->
hideSection
(
gameListModel
->
roomColIndex
());
GameTypeMap
gameTypeMap
;
if
(
room
)
if
(
room
)
gameTypeMap
=
gameListModel
->
getGameTypes
().
value
(
room
->
getRoomId
());
gameTypeMap
=
gameListModel
->
getGameTypes
().
value
(
room
->
getRoomId
());
...
@@ -87,9 +86,6 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup
...
@@ -87,9 +86,6 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup
void
GameSelector
::
actSetFilter
()
void
GameSelector
::
actSetFilter
()
{
{
GameTypeMap
gameTypeMap
;
if
(
room
)
gameTypeMap
=
gameListModel
->
getGameTypes
().
value
(
room
->
getRoomId
());
DlgFilterGames
dlg
(
gameTypeMap
,
gameListProxyModel
,
this
);
DlgFilterGames
dlg
(
gameTypeMap
,
gameListProxyModel
,
this
);
if
(
!
dlg
.
exec
())
if
(
!
dlg
.
exec
())
...
@@ -111,6 +107,7 @@ void GameSelector::actClearFilter()
...
@@ -111,6 +107,7 @@ void GameSelector::actClearFilter()
clearFilterButton
->
setEnabled
(
false
);
clearFilterButton
->
setEnabled
(
false
);
gameListProxyModel
->
resetFilterParameters
();
gameListProxyModel
->
resetFilterParameters
();
gameListProxyModel
->
saveFilterParameters
(
gameTypeMap
);
}
}
void
GameSelector
::
actCreate
()
void
GameSelector
::
actCreate
()
...
...
cockatrice/src/gameselector.h
View file @
bb317003
...
@@ -34,6 +34,7 @@ private:
...
@@ -34,6 +34,7 @@ private:
GamesModel
*
gameListModel
;
GamesModel
*
gameListModel
;
GamesProxyModel
*
gameListProxyModel
;
GamesProxyModel
*
gameListProxyModel
;
QPushButton
*
filterButton
,
*
clearFilterButton
,
*
createButton
,
*
joinButton
,
*
spectateButton
;
QPushButton
*
filterButton
,
*
clearFilterButton
,
*
createButton
,
*
joinButton
,
*
spectateButton
;
GameTypeMap
gameTypeMap
;
public:
public:
GameSelector
(
AbstractClient
*
_client
,
const
TabSupervisor
*
_tabSupervisor
,
TabRoom
*
_room
,
const
QMap
<
int
,
QString
>
&
_rooms
,
const
QMap
<
int
,
GameTypeMap
>
&
_gameTypes
,
QWidget
*
parent
=
0
);
GameSelector
(
AbstractClient
*
_client
,
const
TabSupervisor
*
_tabSupervisor
,
TabRoom
*
_room
,
const
QMap
<
int
,
QString
>
&
_rooms
,
const
QMap
<
int
,
GameTypeMap
>
&
_gameTypes
,
QWidget
*
parent
=
0
);
void
retranslateUi
();
void
retranslateUi
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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