Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
b1cb50d4
Commit
b1cb50d4
authored
Aug 23, 2009
by
Jakob Leben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt4: fix typo + cosmetics
parent
5dcf1434
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
modules/gui/qt4/components/playlist/playlist_model.cpp
modules/gui/qt4/components/playlist/playlist_model.cpp
+4
-5
modules/gui/qt4/components/playlist/playlist_model.hpp
modules/gui/qt4/components/playlist/playlist_model.hpp
+1
-1
modules/gui/qt4/components/playlist/standardpanel.cpp
modules/gui/qt4/components/playlist/standardpanel.cpp
+1
-1
No files found.
modules/gui/qt4/components/playlist/playlist_model.cpp
View file @
b1cb50d4
...
@@ -649,7 +649,7 @@ meta_col must be contained in shown_flags!
...
@@ -649,7 +649,7 @@ meta_col must be contained in shown_flags!
*/
*/
int
PLModel
::
columnFromMeta
(
int
meta_col
,
int
shown_flags
)
const
int
PLModel
::
columnFromMeta
(
int
meta_col
,
int
shown_flags
)
const
{
{
assert
(
meta
&
shown_flags
);
assert
(
meta
_col
&
shown_flags
);
int
meta
=
1
;
int
meta
=
1
;
int
index
=
-
1
;
int
index
=
-
1
;
...
@@ -1044,15 +1044,14 @@ void PLModel::popup( QModelIndex & index, QPoint &point, QModelIndexList list )
...
@@ -1044,15 +1044,14 @@ void PLModel::popup( QModelIndex & index, QPoint &point, QModelIndexList list )
menu
->
popup
(
point
);
menu
->
popup
(
point
);
}
}
void
PLModel
::
viewchanged
(
int
meta
)
void
PLModel
::
toggleColumnShown
(
int
meta
)
{
{
assert
(
meta
);
assert
(
meta
);
int
_meta
=
meta
;
if
(
rootItem
)
if
(
rootItem
)
{
{
if
(
i_showflags
&
meta
)
if
(
i_showflags
&
meta
)
/* Removing columns */
{
{
/* Removing columns */
int
index
=
columnFromMeta
(
meta
,
i_showflags
);
int
index
=
columnFromMeta
(
meta
,
i_showflags
);
beginRemoveColumns
(
QModelIndex
(),
index
,
index
);
beginRemoveColumns
(
QModelIndex
(),
index
,
index
);
...
@@ -1062,10 +1061,10 @@ void PLModel::viewchanged( int meta )
...
@@ -1062,10 +1061,10 @@ void PLModel::viewchanged( int meta )
}
}
else
else
{
{
/* Adding columns */
int
sf
=
i_showflags
;
int
sf
=
i_showflags
;
sf
|=
meta
;
sf
|=
meta
;
int
index
=
columnFromMeta
(
meta
,
sf
);
int
index
=
columnFromMeta
(
meta
,
sf
);
/* Adding columns */
beginInsertColumns
(
QModelIndex
(),
index
,
index
);
beginInsertColumns
(
QModelIndex
(),
index
,
index
);
i_showflags
=
sf
;
i_showflags
=
sf
;
getSettings
()
->
setValue
(
"qt-pl-showflags"
,
i_showflags
);
getSettings
()
->
setValue
(
"qt-pl-showflags"
,
i_showflags
);
...
...
modules/gui/qt4/components/playlist/playlist_model.hpp
View file @
b1cb50d4
...
@@ -201,7 +201,7 @@ private slots:
...
@@ -201,7 +201,7 @@ private slots:
void
popupAddNode
();
void
popupAddNode
();
void
popupSortAsc
();
void
popupSortAsc
();
void
popupSortDesc
();
void
popupSortDesc
();
void
viewchanged
(
int
);
void
toggleColumnShown
(
int
meta_column
);
void
processInputItemUpdate
(
input_item_t
*
);
void
processInputItemUpdate
(
input_item_t
*
);
void
processInputItemUpdate
(
input_thread_t
*
p_input
);
void
processInputItemUpdate
(
input_thread_t
*
p_input
);
};
};
...
...
modules/gui/qt4/components/playlist/standardpanel.cpp
View file @
b1cb50d4
...
@@ -323,7 +323,7 @@ void StandardPLPanel::popupSelectColumn( QPoint pos )
...
@@ -323,7 +323,7 @@ void StandardPLPanel::popupSelectColumn( QPoint pos )
CONNECT
(
option
,
triggered
(),
ContextUpdateMapper
,
map
()
);
CONNECT
(
option
,
triggered
(),
ContextUpdateMapper
,
map
()
);
}
}
CONNECT
(
ContextUpdateMapper
,
mapped
(
int
),
model
,
viewchanged
(
int
)
);
CONNECT
(
ContextUpdateMapper
,
mapped
(
int
),
model
,
toggleColumnShown
(
int
)
);
selectColMenu
.
exec
(
QCursor
::
pos
()
);
selectColMenu
.
exec
(
QCursor
::
pos
()
);
}
}
...
...
Write
Preview
Markdown
is supported
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