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
fcbecde7
Commit
fcbecde7
authored
Nov 26, 2005
by
Yoann Peronneau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* wx/vlm: cosmetic changes
parent
06a38890
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp
modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp
+13
-6
modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp
modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp
+1
-1
No files found.
modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp
View file @
fcbecde7
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
#include "dialogs/vlm/vlm_wrapper.hpp"
#include "dialogs/vlm/vlm_wrapper.hpp"
#include "dialogs/vlm/vlm_stream.hpp"
#include "dialogs/vlm/vlm_stream.hpp"
#include "dialogs/vlm/vlm_streampanel.hpp"
#include "dialogs/vlm/vlm_streampanel.hpp"
#include <wx/statline.h>
enum
enum
{
{
...
@@ -248,6 +249,9 @@ wxPanel * VLMPanel::BroadcastPanel( wxWindow *parent )
...
@@ -248,6 +249,9 @@ wxPanel * VLMPanel::BroadcastPanel( wxWindow *parent )
broadcasts_sizer
->
Add
(
box_sizer
,
0
,
wxEXPAND
|
wxALL
,
5
);
broadcasts_sizer
->
Add
(
box_sizer
,
0
,
wxEXPAND
|
wxALL
,
5
);
wxStaticLine
*
static_line
=
new
wxStaticLine
(
broadcasts_panel
);
broadcasts_sizer
->
Add
(
static_line
,
0
,
wxEXPAND
|
wxALL
,
5
);
scrolled_broadcasts
=
new
wxScrolledWindow
(
broadcasts_panel
,
-
1
,
scrolled_broadcasts
=
new
wxScrolledWindow
(
broadcasts_panel
,
-
1
,
wxDefaultPosition
,
wxDefaultSize
,
wxDefaultPosition
,
wxDefaultSize
,
wxBORDER_NONE
|
wxVSCROLL
);
wxBORDER_NONE
|
wxVSCROLL
);
...
@@ -355,16 +359,18 @@ VLMAddStreamPanel::VLMAddStreamPanel( intf_thread_t *_p_intf,
...
@@ -355,16 +359,18 @@ VLMAddStreamPanel::VLMAddStreamPanel( intf_thread_t *_p_intf,
wxBoxSizer
*
panel_sizer
=
new
wxBoxSizer
(
wxVERTICAL
);
wxBoxSizer
*
panel_sizer
=
new
wxBoxSizer
(
wxVERTICAL
);
wxFlexGridSizer
*
upper_sizer
=
new
wxFlexGridSizer
(
5
,
2
);
wxFlexGridSizer
*
upper_sizer
=
new
wxFlexGridSizer
(
5
,
2
);
upper_sizer
->
AddGrowableCol
(
1
,
1
);
upper_sizer
->
AddGrowableCol
(
1
);
upper_sizer
->
AddGrowableCol
(
3
,
1
);
upper_sizer
->
AddGrowableCol
(
3
);
upper_sizer
->
Add
(
new
wxStaticText
(
this
,
-
1
,
wxU
(
_
(
"Name"
)
)
)
);
upper_sizer
->
Add
(
new
wxStaticText
(
this
,
-
1
,
wxU
(
_
(
"Name"
)
)
),
0
,
wxALIGN_CENTER_VERTICAL
,
0
);
name_text
=
new
wxTextCtrl
(
this
,
-
1
,
wxU
(
_
(
""
)
),
wxDefaultPosition
,
name_text
=
new
wxTextCtrl
(
this
,
-
1
,
wxU
(
_
(
""
)
),
wxDefaultPosition
,
wxSize
(
150
,
-
1
)
);
wxSize
(
150
,
-
1
)
);
upper_sizer
->
Add
(
name_text
,
1
,
wxEXPAND
|
wxLEFT
|
wxRIGHT
,
5
);
upper_sizer
->
Add
(
name_text
,
1
,
wxEXPAND
|
wxLEFT
|
wxRIGHT
,
5
);
upper_sizer
->
Add
(
new
wxStaticText
(
this
,
-
1
,
wxU
(
_
(
"Input"
)
)
)
);
upper_sizer
->
Add
(
new
wxStaticText
(
this
,
-
1
,
wxU
(
_
(
"Input"
)
)
),
0
,
wxALIGN_CENTER_VERTICAL
,
0
);
input_text
=
new
wxTextCtrl
(
this
,
-
1
,
wxU
(
_
(
""
)
)
,
input_text
=
new
wxTextCtrl
(
this
,
-
1
,
wxU
(
_
(
""
)
)
,
wxDefaultPosition
,
wxSize
(
150
,
-
1
)
);
wxDefaultPosition
,
wxSize
(
150
,
-
1
)
);
upper_sizer
->
Add
(
input_text
,
1
,
wxEXPAND
|
wxLEFT
|
wxRIGHT
,
5
);
upper_sizer
->
Add
(
input_text
,
1
,
wxEXPAND
|
wxLEFT
|
wxRIGHT
,
5
);
...
@@ -373,7 +379,8 @@ VLMAddStreamPanel::VLMAddStreamPanel( intf_thread_t *_p_intf,
...
@@ -373,7 +379,8 @@ VLMAddStreamPanel::VLMAddStreamPanel( intf_thread_t *_p_intf,
upper_sizer
->
Add
(
0
,
0
);
upper_sizer
->
Add
(
0
,
0
);
upper_sizer
->
Add
(
0
,
0
);
upper_sizer
->
Add
(
0
,
0
);
upper_sizer
->
Add
(
new
wxStaticText
(
this
,
-
1
,
wxU
(
_
(
"Output"
)
)
)
);
upper_sizer
->
Add
(
new
wxStaticText
(
this
,
-
1
,
wxU
(
_
(
"Output"
)
)
),
0
,
wxALIGN_CENTER_VERTICAL
,
0
);
output_text
=
new
wxTextCtrl
(
this
,
-
1
,
wxU
(
_
(
""
)
)
,
output_text
=
new
wxTextCtrl
(
this
,
-
1
,
wxU
(
_
(
""
)
)
,
wxDefaultPosition
,
wxSize
(
150
,
-
1
)
);
wxDefaultPosition
,
wxSize
(
150
,
-
1
)
);
upper_sizer
->
Add
(
output_text
,
1
,
wxEXPAND
|
wxLEFT
|
wxRIGHT
,
5
);
upper_sizer
->
Add
(
output_text
,
1
,
wxEXPAND
|
wxLEFT
|
wxRIGHT
,
5
);
...
...
modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp
View file @
fcbecde7
...
@@ -92,7 +92,7 @@ VLMBroadcastStreamPanel::VLMBroadcastStreamPanel( intf_thread_t* _p_intf,
...
@@ -92,7 +92,7 @@ VLMBroadcastStreamPanel::VLMBroadcastStreamPanel( intf_thread_t* _p_intf,
box_sizer
->
Add
(
p_slider
,
1
,
wxEXPAND
|
wxALL
,
5
);
box_sizer
->
Add
(
p_slider
,
1
,
wxEXPAND
|
wxALL
,
5
);
p_time
=
new
wxStaticText
(
this
,
-
1
,
wxU
(
"0:00:00 / 0:00:00"
)
);
p_time
=
new
wxStaticText
(
this
,
-
1
,
wxU
(
"0:00:00 / 0:00:00"
)
);
box_sizer
->
Add
(
p_time
,
0
,
wxEXPAND
|
wxAL
L
,
5
);
box_sizer
->
Add
(
p_time
,
0
,
wxALL
|
wxALIGN_CENTER_VERTICA
L
,
5
);
wxBitmapButton
*
edit_button
=
new
wxBitmapButton
(
this
,
BEdit_Event
,
wxBitmapButton
*
edit_button
=
new
wxBitmapButton
(
this
,
BEdit_Event
,
wxBitmap
(
trash_xpm
)
);
wxBitmap
(
trash_xpm
)
);
...
...
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