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
6a5f2d24
Commit
6a5f2d24
authored
Feb 18, 2014
by
Buce
Browse files
Allow sorting on different columns
parent
a62ba91a
Changes
2
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/decklistmodel.cpp
View file @
6a5f2d24
...
@@ -296,9 +296,10 @@ void DeckListModel::sortHelper(InnerDecklistNode *node, Qt::SortOrder order)
...
@@ -296,9 +296,10 @@ void DeckListModel::sortHelper(InnerDecklistNode *node, Qt::SortOrder order)
}
}
}
}
void
DeckListModel
::
sort
(
int
/*
column
*/
,
Qt
::
SortOrder
order
)
void
DeckListModel
::
sort
(
int
column
,
Qt
::
SortOrder
order
)
{
{
emit
layoutAboutToBeChanged
();
emit
layoutAboutToBeChanged
();
root
->
setSortMethod
(
column
);
sortHelper
(
root
,
order
);
sortHelper
(
root
,
order
);
emit
layoutChanged
();
emit
layoutChanged
();
}
}
...
...
cockatrice/src/tab_deck_editor.cpp
View file @
6a5f2d24
...
@@ -110,6 +110,8 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
...
@@ -110,6 +110,8 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
deckView
=
new
QTreeView
();
deckView
=
new
QTreeView
();
deckView
->
setModel
(
deckModel
);
deckView
->
setModel
(
deckModel
);
deckView
->
setUniformRowHeights
(
true
);
deckView
->
setUniformRowHeights
(
true
);
deckView
->
setSortingEnabled
(
true
);
deckView
->
sortByColumn
(
1
,
Qt
::
AscendingOrder
);
deckView
->
header
()
->
setResizeMode
(
QHeaderView
::
ResizeToContents
);
deckView
->
header
()
->
setResizeMode
(
QHeaderView
::
ResizeToContents
);
connect
(
deckView
->
selectionModel
(),
SIGNAL
(
currentRowChanged
(
const
QModelIndex
&
,
const
QModelIndex
&
)),
this
,
SLOT
(
updateCardInfoRight
(
const
QModelIndex
&
,
const
QModelIndex
&
)));
connect
(
deckView
->
selectionModel
(),
SIGNAL
(
currentRowChanged
(
const
QModelIndex
&
,
const
QModelIndex
&
)),
this
,
SLOT
(
updateCardInfoRight
(
const
QModelIndex
&
,
const
QModelIndex
&
)));
...
@@ -606,10 +608,10 @@ void TabDeckEditor::setDeck(DeckLoader *_deck)
...
@@ -606,10 +608,10 @@ void TabDeckEditor::setDeck(DeckLoader *_deck)
nameEdit
->
setText
(
deckModel
->
getDeckList
()
->
getName
());
nameEdit
->
setText
(
deckModel
->
getDeckList
()
->
getName
());
commentsEdit
->
setText
(
deckModel
->
getDeckList
()
->
getComments
());
commentsEdit
->
setText
(
deckModel
->
getDeckList
()
->
getComments
());
updateHash
();
updateHash
();
deckModel
->
sort
(
1
);
deckModel
->
sort
(
deckView
->
header
()
->
sortIndicatorSection
(),
deckView
->
header
()
->
sortIndicatorOrder
()
);
deckView
->
expandAll
();
deckView
->
expandAll
();
setModified
(
false
);
setModified
(
false
);
db
->
cacheCardPixmaps
(
deckModel
->
getDeckList
()
->
getCardList
());
db
->
cacheCardPixmaps
(
deckModel
->
getDeckList
()
->
getCardList
());
deckView
->
expandAll
();
deckView
->
expandAll
();
setModified
(
false
);
setModified
(
false
);
...
...
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