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
a210fb14
Commit
a210fb14
authored
Apr 06, 2007
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - Small modifications on Preferences layout (specially aimed at Windows).
Remove and add comments.
parent
7fe7324d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
11 deletions
+13
-11
modules/gui/qt4/dialogs/help.cpp
modules/gui/qt4/dialogs/help.cpp
+5
-5
modules/gui/qt4/dialogs/mediainfo.cpp
modules/gui/qt4/dialogs/mediainfo.cpp
+1
-1
modules/gui/qt4/dialogs/preferences.cpp
modules/gui/qt4/dialogs/preferences.cpp
+6
-4
modules/gui/qt4/dialogs/sout.cpp
modules/gui/qt4/dialogs/sout.cpp
+1
-1
No files found.
modules/gui/qt4/dialogs/help.cpp
View file @
a210fb14
...
@@ -81,13 +81,13 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf )
...
@@ -81,13 +81,13 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf )
/* GPL License */
/* GPL License */
QFile
*
licenseFile
=
new
QFile
(
"/usr/src/vlc/COPYING"
);
QFile
*
licenseFile
=
new
QFile
(
"/usr/src/vlc/COPYING"
);
QTextEdit
*
licenseEdit
=
new
QTextEdit
(
this
);
QTextEdit
*
licenseEdit
=
new
QTextEdit
(
this
);
// licenseEdit->setText( licenseFile->readAll() );
licenseEdit
->
setText
(
licenseFile
->
readAll
()
);
licenseEdit
->
setReadOnly
(
true
);
licenseEdit
->
setReadOnly
(
true
);
/* People who helped */
/* People who helped */
QFile
*
thanksFile
=
new
QFile
(
"/usr/src/vlc/THANKS"
);
QFile
*
thanksFile
=
new
QFile
(
"/usr/src/vlc/THANKS"
);
QTextEdit
*
thanksEdit
=
new
QTextEdit
(
this
);
QTextEdit
*
thanksEdit
=
new
QTextEdit
(
this
);
//
thanksEdit->setText( thanksFile->readAll() );
thanksEdit
->
setText
(
thanksFile
->
readAll
()
);
thanksEdit
->
setReadOnly
(
true
);
thanksEdit
->
setReadOnly
(
true
);
/* add the tabs to the Tabwidget */
/* add the tabs to the Tabwidget */
...
...
modules/gui/qt4/dialogs/mediainfo.cpp
View file @
a210fb14
...
@@ -94,7 +94,7 @@ void MediaInfoDialog::setInput(input_item_t *p_input)
...
@@ -94,7 +94,7 @@ void MediaInfoDialog::setInput(input_item_t *p_input)
void
MediaInfoDialog
::
update
()
void
MediaInfoDialog
::
update
()
{
{
/
/ Timer runs at 150 ms, dont' update more than 2 times per second
/
* Timer runs at 150 ms, dont' update more than 2 times per second */
i_runs
++
;
i_runs
++
;
if
(
i_runs
%
3
!=
0
)
return
;
if
(
i_runs
%
3
!=
0
)
return
;
...
...
modules/gui/qt4/dialogs/preferences.cpp
View file @
a210fb14
...
@@ -50,6 +50,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
...
@@ -50,6 +50,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
setMaximumHeight
(
650
);
setMaximumHeight
(
650
);
setMaximumWidth
(
700
);
setMaximumWidth
(
700
);
/* Create Panels */
tree_panel
=
new
QWidget
(
0
);
tree_panel
=
new
QWidget
(
0
);
tree_panel_l
=
new
QHBoxLayout
;
tree_panel_l
=
new
QHBoxLayout
;
tree_panel
->
setLayout
(
tree_panel_l
);
tree_panel
->
setLayout
(
tree_panel_l
);
...
@@ -57,7 +58,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
...
@@ -57,7 +58,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
main_panel_l
=
new
QHBoxLayout
;
main_panel_l
=
new
QHBoxLayout
;
main_panel
->
setLayout
(
main_panel_l
);
main_panel
->
setLayout
(
main_panel_l
);
/
/ Choice for types
/
* Choice for types */
types
=
new
QGroupBox
(
"Show settings"
);
types
=
new
QGroupBox
(
"Show settings"
);
types
->
setAlignment
(
Qt
::
AlignHCenter
);
types
->
setAlignment
(
Qt
::
AlignHCenter
);
QHBoxLayout
*
types_l
=
new
QHBoxLayout
(
0
);
QHBoxLayout
*
types_l
=
new
QHBoxLayout
(
0
);
...
@@ -67,19 +68,20 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
...
@@ -67,19 +68,20 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
types
->
setLayout
(
types_l
);
types
->
setLayout
(
types_l
);
small
->
setChecked
(
true
);
small
->
setChecked
(
true
);
/* Tree and panel initialisations */
advanced_tree
=
NULL
;
advanced_tree
=
NULL
;
simple_tree
=
NULL
;
simple_tree
=
NULL
;
simple_panel
=
NULL
;
simple_panel
=
NULL
;
advanced_panel
=
NULL
;
advanced_panel
=
NULL
;
main_layout
->
addWidget
(
tree_panel
,
0
,
0
,
3
,
1
);
main_layout
->
addWidget
(
tree_panel
,
0
,
0
,
3
,
1
);
main_layout
->
addWidget
(
types
,
3
,
0
,
1
,
1
);
main_layout
->
addWidget
(
types
,
3
,
0
,
2
,
1
);
main_layout
->
addWidget
(
main_panel
,
0
,
1
,
4
,
1
);
main_layout
->
addWidget
(
main_panel
,
0
,
1
,
4
,
1
);
main_layout
->
setColumnMinimumWidth
(
0
,
150
);
main_layout
->
setColumnMinimumWidth
(
0
,
150
);
main_layout
->
setColumnStretch
(
0
,
1
);
main_layout
->
setColumnStretch
(
0
,
1
);
main_layout
->
setColumnStretch
(
1
,
3
);
main_layout
->
setColumnStretch
(
1
,
3
);
main_layout
->
setRowStretch
(
2
,
4
);
main_layout
->
setRowStretch
(
2
,
4
);
...
@@ -94,7 +96,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
...
@@ -94,7 +96,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
buttonsBox
->
addButton
(
cancel
,
QDialogButtonBox
::
RejectRole
);
buttonsBox
->
addButton
(
cancel
,
QDialogButtonBox
::
RejectRole
);
buttonsBox
->
addButton
(
reset
,
QDialogButtonBox
::
ActionRole
);
buttonsBox
->
addButton
(
reset
,
QDialogButtonBox
::
ActionRole
);
main_layout
->
addWidget
(
buttonsBox
,
4
,
0
,
1
,
3
);
main_layout
->
addWidget
(
buttonsBox
,
4
,
1
,
1
,
2
);
setLayout
(
main_layout
);
setLayout
(
main_layout
);
BUTTONACT
(
save
,
save
()
);
BUTTONACT
(
save
,
save
()
);
...
...
modules/gui/qt4/dialogs/sout.cpp
View file @
a210fb14
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
SoutDialog
::
SoutDialog
(
QWidget
*
parent
,
intf_thread_t
*
_p_intf
)
:
SoutDialog
::
SoutDialog
(
QWidget
*
parent
,
intf_thread_t
*
_p_intf
)
:
QVLCDialog
(
parent
,
_p_intf
)
QVLCDialog
(
parent
,
_p_intf
)
{
{
//
setWindowTitle( qtr( "Stream output") );
setWindowTitle
(
qtr
(
"Stream output"
)
);
setModal
(
true
);
setModal
(
true
);
/* UI stuff */
/* UI stuff */
ui
.
setupUi
(
this
);
ui
.
setupUi
(
this
);
...
...
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