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
3ba76bd8
Commit
3ba76bd8
authored
Nov 26, 2007
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - Cleaning trailing spaces...
parent
92e69fb4
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
37 additions
and
37 deletions
+37
-37
modules/gui/qt4/components/extended_panels.cpp
modules/gui/qt4/components/extended_panels.cpp
+3
-3
modules/gui/qt4/components/infopanels.hpp
modules/gui/qt4/components/infopanels.hpp
+2
-2
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+1
-1
modules/gui/qt4/components/open.cpp
modules/gui/qt4/components/open.cpp
+2
-2
modules/gui/qt4/dialogs/extended.cpp
modules/gui/qt4/dialogs/extended.cpp
+1
-1
modules/gui/qt4/dialogs/mediainfo.hpp
modules/gui/qt4/dialogs/mediainfo.hpp
+4
-4
modules/gui/qt4/dialogs/open.cpp
modules/gui/qt4/dialogs/open.cpp
+1
-1
modules/gui/qt4/dialogs/playlist.cpp
modules/gui/qt4/dialogs/playlist.cpp
+2
-2
modules/gui/qt4/dialogs/preferences.cpp
modules/gui/qt4/dialogs/preferences.cpp
+4
-4
modules/gui/qt4/dialogs/sout.cpp
modules/gui/qt4/dialogs/sout.cpp
+3
-3
modules/gui/qt4/dialogs/vlm.hpp
modules/gui/qt4/dialogs/vlm.hpp
+1
-1
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+9
-9
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+1
-1
modules/gui/qt4/util/input_slider.cpp
modules/gui/qt4/util/input_slider.cpp
+3
-3
No files found.
modules/gui/qt4/components/extended_panels.cpp
View file @
3ba76bd8
...
...
@@ -417,7 +417,7 @@ void ExtVideo::setWidgetValue( QObject *widget )
sprintf
(
str
,
"%06X"
,
val
.
i_int
);
lineedit
->
setText
(
str
);
}
else
if
(
combobox
)
combobox
->
setCurrentIndex
(
else
if
(
combobox
)
combobox
->
setCurrentIndex
(
combobox
->
findData
(
val
.
i_int
)
);
else
msg_Warn
(
p_intf
,
"Oops %s %s %d"
,
__FILE__
,
__func__
,
__LINE__
);
}
...
...
@@ -431,7 +431,7 @@ void ExtVideo::setWidgetValue( QObject *widget )
else
if
(
i_type
==
VLC_VAR_STRING
)
{
if
(
lineedit
)
lineedit
->
setText
(
qfu
(
val
.
psz_string
)
);
else
if
(
combobox
)
combobox
->
setCurrentIndex
(
else
if
(
combobox
)
combobox
->
setCurrentIndex
(
combobox
->
findData
(
qfu
(
val
.
psz_string
)
)
);
else
msg_Warn
(
p_intf
,
"Oops %s %s %d"
,
__FILE__
,
__func__
,
__LINE__
);
free
(
val
.
psz_string
);
...
...
@@ -517,7 +517,7 @@ void ExtVideo::updateFilterOptions()
{
char
*
psz_string
=
NULL
;
if
(
lineedit
)
psz_string
=
strdup
(
qtu
(
lineedit
->
text
()
)
);
else
if
(
combobox
)
psz_string
=
strdup
(
qtu
(
combobox
->
itemData
(
else
if
(
combobox
)
psz_string
=
strdup
(
qtu
(
combobox
->
itemData
(
combobox
->
currentIndex
()
).
toString
()
)
);
else
msg_Warn
(
p_intf
,
"Oops %s %s %d"
,
__FILE__
,
__func__
,
__LINE__
);
config_PutPsz
(
p_intf
,
option
.
toStdString
().
c_str
(),
psz_string
);
...
...
modules/gui/qt4/components/infopanels.hpp
View file @
3ba76bd8
...
...
@@ -56,7 +56,7 @@ public:
virtual
~
MetaPanel
();
void
saveMeta
();
void
setInput
(
input_item_t
*
);
bool
isInEditMode
();
void
setEditMode
(
bool
);
...
...
@@ -88,7 +88,7 @@ public slots:
private
slots
:
void
enterEditMode
();
signals:
void
uriSet
(
QString
);
void
editing
();
...
...
modules/gui/qt4/components/interface_widgets.cpp
View file @
3ba76bd8
...
...
@@ -771,7 +771,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings ) :
sizeList
<<
180
<<
420
;
setSizes
(
sizeList
);
setSizePolicy
(
QSizePolicy
::
Preferred
,
QSizePolicy
::
Expanding
);
/* In case we want to keep the splitter informations */
settings
->
beginGroup
(
"playlist"
);
restoreState
(
settings
->
value
(
"splitterSizes"
).
toByteArray
());
...
...
modules/gui/qt4/components/open.cpp
View file @
3ba76bd8
...
...
@@ -263,7 +263,7 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
CONNECT
(
ui
.
audioSpin
,
valueChanged
(
int
),
this
,
updateMRL
());
CONNECT
(
ui
.
subtitlesSpin
,
valueChanged
(
int
),
this
,
updateMRL
());
/* Run once the updateButtons function in order to fill correctly the comboBoxes */
/* Run once the updateButtons function in order to fill correctly the comboBoxes */
updateButtons
();
}
...
...
@@ -390,7 +390,7 @@ void DiscOpenPanel::updateMRL()
void
DiscOpenPanel
::
browseDevice
()
{
QString
dir
=
QFileDialog
::
getExistingDirectory
(
0
,
QString
dir
=
QFileDialog
::
getExistingDirectory
(
0
,
qtr
(
"Open a device or a VIDEO_TS directory"
)
);
if
(
!
dir
.
isEmpty
())
{
ui
.
deviceCombo
->
setEditText
(
dir
);
...
...
modules/gui/qt4/dialogs/extended.cpp
View file @
3ba76bd8
...
...
@@ -63,7 +63,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
QPushButton
*
closeButton
=
new
QPushButton
(
qtr
(
"Close"
)
);
layout
->
addWidget
(
closeButton
,
1
,
4
,
1
,
1
);
CONNECT
(
closeButton
,
clicked
(),
this
,
close
()
);
readSettings
(
"EPanel"
,
QSize
(
400
,
300
),
QPoint
(
450
,
0
)
);
}
...
...
modules/gui/qt4/dialogs/mediainfo.hpp
View file @
3ba76bd8
...
...
@@ -51,9 +51,9 @@ public:
void
showTab
(
int
);
void
setInput
(
input_item_t
*
);
bool
b_need_update
;
private:
input_thread_t
*
p_input
;
static
MediaInfoDialog
*
instance
;
...
...
@@ -61,7 +61,7 @@ private:
int
i_runs
;
bool
mainInput
;
bool
stats
;
QTabWidget
*
IT
;
InputStatsPanel
*
ISP
;
...
...
@@ -75,7 +75,7 @@ private:
public
slots
:
void
update
();
void
update
(
input_item_t
*
,
bool
,
bool
);
private
slots
:
void
close
();
...
...
modules/gui/qt4/dialogs/open.cpp
View file @
3ba76bd8
...
...
@@ -211,7 +211,7 @@ void OpenDialog::toggleAdvancedPanel()
/* If Cancel is pressed or escaped */
void
OpenDialog
::
cancel
()
{
for
(
int
i
=
0
;
i
<=
OPEN_TAB_MAX
;
i
++
)
for
(
int
i
=
0
;
i
<=
OPEN_TAB_MAX
;
i
++
)
dynamic_cast
<
OpenPanel
*>
(
ui
.
Tab
->
widget
(
i
))
->
clear
();
toggleVisible
();
if
(
isModal
()
)
reject
();
...
...
modules/gui/qt4/dialogs/playlist.cpp
View file @
3ba76bd8
...
...
@@ -37,7 +37,7 @@
PlaylistDialog
*
PlaylistDialog
::
instance
=
NULL
;
PlaylistDialog
::
PlaylistDialog
(
intf_thread_t
*
_p_intf
)
PlaylistDialog
::
PlaylistDialog
(
intf_thread_t
*
_p_intf
)
:
QVLCMW
(
_p_intf
)
{
QWidget
*
main
=
new
QWidget
(
this
);
...
...
@@ -54,7 +54,7 @@ PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf )
PlaylistDialog
::~
PlaylistDialog
()
{
writeSettings
(
"playlist"
);
writeSettings
(
"playlist"
);
}
void
PlaylistDialog
::
dropEvent
(
QDropEvent
*
event
)
...
...
modules/gui/qt4/dialogs/preferences.cpp
View file @
3ba76bd8
...
...
@@ -147,7 +147,7 @@ void PrefsDialog::setAdvanced()
main_panel_l
->
addWidget
(
advanced_panel
);
}
advanced_panel
->
show
();
all
->
setChecked
(
true
);
}
...
...
@@ -180,7 +180,7 @@ void PrefsDialog::setSmall()
simple_panels
[
SPrefsDefaultCat
]
=
current_simple_panel
;
main_panel_l
->
addWidget
(
current_simple_panel
);
}
current_simple_panel
->
show
();
small
->
setChecked
(
true
);
}
...
...
@@ -198,7 +198,7 @@ void PrefsDialog::changeSimplePanel( int number )
simple_panels
[
number
]
=
current_simple_panel
;
main_panel_l
->
addWidget
(
current_simple_panel
);
}
current_simple_panel
->
show
();
}
...
...
@@ -218,7 +218,7 @@ void PrefsDialog::changeAdvPanel( QTreeWidgetItem *item )
advanced_panel
->
show
();
}
#if 0
#if 0
/*Called from extended settings, is not used anymore, but could be useful one day*/
void PrefsDialog::showModulePrefs( char *psz_module )
{
...
...
modules/gui/qt4/dialogs/sout.cpp
View file @
3ba76bd8
...
...
@@ -299,7 +299,7 @@ void SoutDialog::updateMRL()
if
(
sout
.
b_mms
)
counter
++
;
if
(
sout
.
b_rtp
)
counter
++
;
if
(
sout
.
b_udp
)
counter
++
;
if
(
sout
.
b_icecast
)
counter
++
;
if
(
sout
.
b_icecast
)
counter
++
;
#define SMUX( x, txt ) if( ui.x->isChecked() ) sout.psz_mux = strdup( txt );
SMUX
(
PSMux
,
"ps"
);
...
...
@@ -360,7 +360,7 @@ void SoutDialog::updateMRL()
{
#define ISMORE() if ( more ) mrl.append( "," );
#define ATLEASTONE() if ( counter ) mrl.append( "dst=" );
#define ATLEASTONE() if ( counter ) mrl.append( "dst=" );
#define CHECKMUX() \
if( sout.psz_mux ) \
...
...
@@ -473,7 +473,7 @@ void SoutDialog::updateMRL()
{
// TODO
}
if
(
counter
)
{
mrl
.
append
(
"}"
);
...
...
modules/gui/qt4/dialogs/vlm.hpp
View file @
3ba76bd8
...
...
@@ -57,7 +57,7 @@ public:
return
instance
;
};
virtual
~
VLMDialog
();
private:
VLMDialog
(
intf_thread_t
*
);
static
VLMDialog
*
instance
;
...
...
modules/gui/qt4/main_interface.cpp
View file @
3ba76bd8
...
...
@@ -149,7 +149,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
|
Qt
::
BottomDockWidgetArea
);
/************
* Menu Bar
* Menu Bar
************/
QVLCMenu
::
createMenuBar
(
this
,
p_intf
,
visualSelectorEnabled
);
...
...
@@ -177,7 +177,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
statusBar
()
->
addPermanentWidget
(
timeLabel
,
2
);
/* timeLabel behaviour:
- double clicking opens the goto time dialog
- double clicking opens the goto time dialog
- right-clicking and clicking just toggle between remaining and
elapsed time.*/
CONNECT
(
timeLabel
,
timeLabelClicked
(),
this
,
toggleTimeDisplay
()
);
...
...
@@ -289,9 +289,9 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
MainInterface
::~
MainInterface
()
{
if
(
playlistWidget
)
playlistWidget
->
savingSettings
(
settings
);
if
(
ExtendedDialog
::
exists
()
)
if
(
ExtendedDialog
::
exists
()
)
ExtendedDialog
::
getInstance
(
p_intf
)
->
savingSettings
();
settings
->
beginGroup
(
"MainWindow"
);
settings
->
setValue
(
"playlist-floats"
,
dockPL
->
isFloating
()
);
settings
->
setValue
(
"adv-controls"
,
getControlsVisibilityStatus
()
&
CONTROLS_ADVANCED
);
...
...
@@ -309,7 +309,7 @@ MainInterface::~MainInterface()
var_DelCallback
(
p_playlist
,
"intf-show"
,
IntfShowCB
,
p_intf
);
vlc_object_release
(
p_playlist
);
}
p_intf
->
b_interaction
=
VLC_FALSE
;
var_DelCallback
(
p_intf
,
"interaction"
,
InteractCallback
,
this
);
...
...
@@ -470,7 +470,7 @@ void MainInterface::privacyDialog( QList<ConfigControl *> controls )
privacy
->
exec
();
}
//FIXME remove me at the end...
//FIXME remove me at the end...
void
MainInterface
::
debug
()
{
msg_Dbg
(
p_intf
,
"size: %i - %i"
,
controls
->
size
().
height
(),
controls
->
size
().
width
()
);
...
...
@@ -485,8 +485,8 @@ void MainInterface::debug()
Since we can't know from the playlist Widget if we are inside a dock or not,
because the playlist Widget can be called by THEDP, as a separate windows for
the skins.
Maybe the other solution is to redefine the sizeHint() of the playlist and
ask _parent->isFloating()...
Maybe the other solution is to redefine the sizeHint() of the playlist and
ask _parent->isFloating()...
If you think this would be better, please FIX it...
*/
QSize
MainInterface
::
sizeHint
()
const
...
...
@@ -652,7 +652,7 @@ int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
**/
void
MainInterface
::
togglePlaylist
()
{
/* CREATION
/* CREATION
If no playlist exist, then create one and attach it to the DockPL*/
if
(
!
playlistWidget
)
{
...
...
modules/gui/qt4/qt4.cpp
View file @
3ba76bd8
...
...
@@ -156,7 +156,7 @@ vlc_module_begin();
ADVANCED_PREFS_LONGTEXT
,
VLC_FALSE
);
add_bool
(
"qt-error-dialogs"
,
VLC_TRUE
,
NULL
,
ERROR_TEXT
,
ERROR_TEXT
,
VLC_FALSE
);
add_bool
(
"qt-updates-notif"
,
VLC_TRUE
,
NULL
,
UPDATER_TEXT
,
add_bool
(
"qt-updates-notif"
,
VLC_TRUE
,
NULL
,
UPDATER_TEXT
,
UPDATER_LONGTEXT
,
VLC_FALSE
);
add_integer
(
"qt-pl-showflags"
,
...
...
modules/gui/qt4/util/input_slider.cpp
View file @
3ba76bd8
...
...
@@ -84,7 +84,7 @@ SoundSlider::SoundSlider( QWidget *_parent, int _i_step, bool b_hard )
:
QAbstractSlider
(
_parent
)
{
padding
=
3
;
f_step
=
(
_i_step
*
100
)
/
AOUT_VOLUME_MAX
;
setRange
(
SOUNDMIN
,
b_hard
?
(
2
*
SOUNDMAX
)
:
SOUNDMAX
);
...
...
@@ -92,7 +92,7 @@ SoundSlider::SoundSlider( QWidget *_parent, int _i_step, bool b_hard )
const
QPixmap
temp
(
":/pixmaps/volume-slider-inside.png"
);
const
QBitmap
mask
(
temp
.
createHeuristicMask
()
);
setMinimumSize
(
pixOutside
.
size
()
);
pixGradient
=
QPixmap
(
mask
.
size
()
);
...
...
@@ -178,7 +178,7 @@ void SoundSlider::paintEvent(QPaintEvent *e)
{
QPainter
painter
(
this
);
const
int
offset
=
int
(
double
(
(
width
()
-
2
*
padding
)
*
value
()
)
/
maximum
()
);
const
QRectF
boundsG
(
0
,
0
,
offset
,
pixGradient
.
height
()
);
painter
.
drawPixmap
(
boundsG
,
pixGradient
,
boundsG
);
...
...
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