Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
500c1902
Commit
500c1902
authored
Feb 08, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: add Linux discs choices once, not once per focus
Pointed-out-by:
Rafaël Carré
<
funman@videolan.org
>
parent
63eb4c52
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
modules/gui/qt4/components/open_panels.cpp
modules/gui/qt4/components/open_panels.cpp
+12
-12
No files found.
modules/gui/qt4/components/open_panels.cpp
View file @
500c1902
...
@@ -338,6 +338,18 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
...
@@ -338,6 +338,18 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
ui
.
deviceCombo
->
setToolTip
(
qtr
(
I_DEVICE_TOOLTIP
)
);
ui
.
deviceCombo
->
setToolTip
(
qtr
(
I_DEVICE_TOOLTIP
)
);
ui
.
deviceCombo
->
setInsertPolicy
(
QComboBox
::
InsertAtTop
);
ui
.
deviceCombo
->
setInsertPolicy
(
QComboBox
::
InsertAtTop
);
#ifndef WIN32
char
const
*
const
ppsz_discdevices
[]
=
{
"sr*"
,
"sg*"
,
"scd*"
,
"dvd*"
,
"cd*"
};
QComboBox
*
discCombo
=
ui
.
deviceCombo
;
/* avoid namespacing in macro */
POPULATE_WITH_DEVS
(
ppsz_discdevices
,
discCombo
);
#endif
/* CONNECTs */
/* CONNECTs */
BUTTONACT
(
ui
.
dvdRadioButton
,
updateButtons
()
);
BUTTONACT
(
ui
.
dvdRadioButton
,
updateButtons
()
);
BUTTONACT
(
ui
.
bdRadioButton
,
updateButtons
()
);
BUTTONACT
(
ui
.
bdRadioButton
,
updateButtons
()
);
...
@@ -388,19 +400,7 @@ void DiscOpenPanel::onFocus()
...
@@ -388,19 +400,7 @@ void DiscOpenPanel::onFocus()
}
}
SetErrorMode
(
oldMode
);
SetErrorMode
(
oldMode
);
}
}
#else
/* Linux */
char
const
*
const
ppsz_discdevices
[]
=
{
"sr*"
,
"sg*"
,
"scd*"
,
"dvd*"
,
"cd*"
};
QComboBox
*
discCombo
=
ui
.
deviceCombo
;
/* avoid namespacing in macro */
POPULATE_WITH_DEVS
(
ppsz_discdevices
,
discCombo
);
#endif
#endif
}
}
DiscOpenPanel
::~
DiscOpenPanel
()
DiscOpenPanel
::~
DiscOpenPanel
()
...
...
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