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
d67929b6
Commit
d67929b6
authored
Dec 17, 2007
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - trailing spaces... Post-commit script ?
parent
cfddc73a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+7
-7
modules/gui/qt4/menus.hpp
modules/gui/qt4/menus.hpp
+1
-1
modules/gui/qt4/qt4.hpp
modules/gui/qt4/qt4.hpp
+1
-1
No files found.
modules/gui/qt4/main_interface.cpp
View file @
d67929b6
...
@@ -205,12 +205,12 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -205,12 +205,12 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
* Input Manager *
* Input Manager *
********************/
********************/
MainInputManager
::
getInstance
(
p_intf
);
MainInputManager
::
getInstance
(
p_intf
);
/********************
/********************
* Various CONNECTs *
* Various CONNECTs *
********************/
********************/
/* Connect the input manager to the GUI elements it manages */
/* Connect the input manager to the GUI elements it manages */
/* It is also connected to the control->slider, see the ControlsWidget */
/* It is also connected to the control->slider, see the ControlsWidget */
CONNECT
(
THEMIM
->
getIM
(),
positionUpdated
(
float
,
int
,
int
),
CONNECT
(
THEMIM
->
getIM
(),
positionUpdated
(
float
,
int
,
int
),
this
,
setDisplayPosition
(
float
,
int
,
int
)
);
this
,
setDisplayPosition
(
float
,
int
,
int
)
);
...
@@ -239,7 +239,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -239,7 +239,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
}
}
/**
/**
* CONNECTS on PLAY_STATUS
* CONNECTS on PLAY_STATUS
**/
**/
/* Status on the main controller */
/* Status on the main controller */
CONNECT
(
THEMIM
->
getIM
(),
statusChanged
(
int
),
this
,
setStatus
(
int
)
);
CONNECT
(
THEMIM
->
getIM
(),
statusChanged
(
int
),
this
,
setStatus
(
int
)
);
...
@@ -274,12 +274,12 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -274,12 +274,12 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* VideoWidget connect mess to avoid different threads speaking to each other */
/* VideoWidget connect mess to avoid different threads speaking to each other */
CONNECT
(
this
,
askReleaseVideo
(
void
*
),
this
,
releaseVideoSlot
(
void
*
)
);
CONNECT
(
this
,
askReleaseVideo
(
void
*
),
this
,
releaseVideoSlot
(
void
*
)
);
CONNECT
(
this
,
askVideoToResize
(
unsigned
int
,
unsigned
int
),
CONNECT
(
this
,
askVideoToResize
(
unsigned
int
,
unsigned
int
),
videoWidget
,
SetSizing
(
unsigned
int
,
unsigned
int
)
);
videoWidget
,
SetSizing
(
unsigned
int
,
unsigned
int
)
);
CONNECT
(
this
,
askUpdate
(),
this
,
doComponentsUpdate
()
);
CONNECT
(
this
,
askUpdate
(),
this
,
doComponentsUpdate
()
);
CONNECT
(
dockPL
,
topLevelChanged
(
bool
),
this
,
doComponentsUpdate
()
);
CONNECT
(
dockPL
,
topLevelChanged
(
bool
),
this
,
doComponentsUpdate
()
);
CONNECT
(
controls
,
advancedControlsToggled
(
bool
),
CONNECT
(
controls
,
advancedControlsToggled
(
bool
),
this
,
doComponentsUpdate
()
);
this
,
doComponentsUpdate
()
);
resize
(
settings
->
value
(
"size"
,
QSize
(
350
,
60
)
).
toSize
()
);
resize
(
settings
->
value
(
"size"
,
QSize
(
350
,
60
)
).
toSize
()
);
...
@@ -295,7 +295,7 @@ MainInterface::~MainInterface()
...
@@ -295,7 +295,7 @@ MainInterface::~MainInterface()
settings
->
beginGroup
(
"MainWindow"
);
settings
->
beginGroup
(
"MainWindow"
);
settings
->
setValue
(
"playlist-floats"
,
dockPL
->
isFloating
()
);
settings
->
setValue
(
"playlist-floats"
,
dockPL
->
isFloating
()
);
settings
->
setValue
(
"adv-controls"
,
settings
->
setValue
(
"adv-controls"
,
getControlsVisibilityStatus
()
&
CONTROLS_ADVANCED
);
getControlsVisibilityStatus
()
&
CONTROLS_ADVANCED
);
settings
->
setValue
(
"pos"
,
pos
()
);
settings
->
setValue
(
"pos"
,
pos
()
);
settings
->
setValue
(
"size"
,
size
()
);
settings
->
setValue
(
"size"
,
size
()
);
...
@@ -518,7 +518,7 @@ QSize MainInterface::sizeHint() const
...
@@ -518,7 +518,7 @@ QSize MainInterface::sizeHint() const
{
{
int
nwidth
=
controls
->
sizeHint
().
width
();
int
nwidth
=
controls
->
sizeHint
().
width
();
int
nheight
=
controls
->
sizeHint
().
height
();
int
nheight
=
controls
->
sizeHint
().
height
();
+
menuBar
()
->
size
().
height
()
+
menuBar
()
->
size
().
height
()
+
statusBar
()
->
size
().
height
();
+
statusBar
()
->
size
().
height
();
msg_Dbg
(
p_intf
,
"1 %i %i"
,
nheight
,
nwidth
);
msg_Dbg
(
p_intf
,
"1 %i %i"
,
nheight
,
nwidth
);
...
...
modules/gui/qt4/menus.hpp
View file @
d67929b6
...
@@ -91,7 +91,7 @@ public:
...
@@ -91,7 +91,7 @@ public:
static
void
MiscPopupMenu
(
intf_thread_t
*
);
static
void
MiscPopupMenu
(
intf_thread_t
*
);
static
void
PopupMenu
(
intf_thread_t
*
,
bool
);
static
void
PopupMenu
(
intf_thread_t
*
,
bool
);
static
void
PopupMenuStaticEntries
(
intf_thread_t
*
p_intf
,
QMenu
*
menu
);
static
void
PopupMenuStaticEntries
(
intf_thread_t
*
p_intf
,
QMenu
*
menu
);
static
void
PopupMenuControlEntries
(
QMenu
*
menu
,
intf_thread_t
*
p_intf
,
static
void
PopupMenuControlEntries
(
QMenu
*
menu
,
intf_thread_t
*
p_intf
,
input_thread_t
*
p_input
);
input_thread_t
*
p_input
);
/* Systray */
/* Systray */
static
void
updateSystrayMenu
(
MainInterface
*
,
intf_thread_t
*
,
static
void
updateSystrayMenu
(
MainInterface
*
,
intf_thread_t
*
,
...
...
modules/gui/qt4/qt4.hpp
View file @
d67929b6
...
@@ -92,7 +92,7 @@ struct intf_sys_t
...
@@ -92,7 +92,7 @@ struct intf_sys_t
#define TOGGLEV( x ) { if( x->isVisible() ) x->hide(); \
#define TOGGLEV( x ) { if( x->isVisible() ) x->hide(); \
else x->show(); }
else x->show(); }
#define MAX(A,B) ( (A) > (B) ? (A):(B))
#define MAX(A,B) ( (A) > (B) ? (A):(B))
static
int
DialogEvent_Type
=
QEvent
::
User
+
1
;
static
int
DialogEvent_Type
=
QEvent
::
User
+
1
;
...
...
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