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
42980ccc
Commit
42980ccc
authored
Mar 27, 2007
by
Yoann Peronneau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* qt: add a FontConfigControl
parent
e14328ac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
6 deletions
+44
-6
include/vlc_configuration.h
include/vlc_configuration.h
+1
-0
modules/gui/qt4/components/preferences_widgets.cpp
modules/gui/qt4/components/preferences_widgets.cpp
+26
-2
modules/gui/qt4/components/preferences_widgets.hpp
modules/gui/qt4/components/preferences_widgets.hpp
+17
-4
No files found.
include/vlc_configuration.h
View file @
42980ccc
...
...
@@ -61,6 +61,7 @@ extern "C" {
#define CONFIG_ITEM_MODULE_CAT 0x0090
/* Module option */
#define CONFIG_ITEM_MODULE_LIST 0x00A0
/* Module option */
#define CONFIG_ITEM_MODULE_LIST_CAT 0x00B0
/* Module option */
#define CONFIG_ITEM_FONT 0x00C0
/* Font option */
#define CONFIG_ITEM 0x00F0
...
...
modules/gui/qt4/components/preferences_widgets.cpp
View file @
42980ccc
...
...
@@ -46,6 +46,7 @@
#include <QPushButton>
#include <QSlider>
#include <QFileDialog>
#include <QFontDialog>
#include <vlc_keys.h>
...
...
@@ -110,6 +111,10 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
p_control
=
new
DirectoryConfigControl
(
p_this
,
p_item
,
parent
,
l
,
line
,
false
);
break
;
case
CONFIG_ITEM_FONT
:
p_control
=
new
FontConfigControl
(
p_this
,
p_item
,
parent
,
l
,
line
,
false
);
break
;
case
CONFIG_ITEM_KEY
:
p_control
=
new
KeySelectorControl
(
p_this
,
p_item
,
parent
,
l
,
line
);
break
;
...
...
@@ -273,7 +278,6 @@ void FileConfigControl::finish()
}
/********* String / Directory **********/
DirectoryConfigControl
::
DirectoryConfigControl
(
vlc_object_t
*
_p_this
,
module_config_t
*
_p_item
,
QWidget
*
_p_widget
,
QGridLayout
*
_p_layout
,
int
&
_int
,
bool
_pwd
)
:
...
...
@@ -286,7 +290,6 @@ DirectoryConfigControl::DirectoryConfigControl( vlc_object_t *_p_this,
FileConfigControl
(
_p_this
,
_p_item
,
_p_label
,
_p_line
,
_p_button
,
_pwd
)
{}
void
DirectoryConfigControl
::
updateField
()
{
QString
dir
=
QFileDialog
::
getExistingDirectory
(
NULL
,
...
...
@@ -297,6 +300,27 @@ void DirectoryConfigControl::updateField()
text
->
setText
(
dir
);
}
/********* String / Font **********/
FontConfigControl
::
FontConfigControl
(
vlc_object_t
*
_p_this
,
module_config_t
*
_p_item
,
QWidget
*
_p_widget
,
QGridLayout
*
_p_layout
,
int
&
_int
,
bool
_pwd
)
:
FileConfigControl
(
_p_this
,
_p_item
,
_p_widget
,
_p_layout
,
_int
,
_pwd
)
{}
FontConfigControl
::
FontConfigControl
(
vlc_object_t
*
_p_this
,
module_config_t
*
_p_item
,
QLabel
*
_p_label
,
QLineEdit
*
_p_line
,
QPushButton
*
_p_button
,
bool
_pwd
)
:
FileConfigControl
(
_p_this
,
_p_item
,
_p_label
,
_p_line
,
_p_button
,
_pwd
)
{}
void
FontConfigControl
::
updateField
()
{
bool
ok
;
QFont
font
=
QFontDialog
::
getFont
(
&
ok
,
QFont
(
text
->
text
()
),
NULL
);
if
(
!
ok
)
return
;
text
->
setText
(
font
.
family
()
);
}
/********* String / choice list **********/
StringListConfigControl
::
StringListConfigControl
(
vlc_object_t
*
_p_this
,
module_config_t
*
_p_item
,
QWidget
*
_parent
,
bool
bycat
,
...
...
modules/gui/qt4/components/preferences_widgets.hpp
View file @
42980ccc
...
...
@@ -266,9 +266,9 @@ class FileConfigControl : public VStringConfigControl
Q_OBJECT
;
public:
FileConfigControl
(
vlc_object_t
*
,
module_config_t
*
,
QWidget
*
,
QGridLayout
*
,
int
&
,
bool
pwd
);
QGridLayout
*
,
int
&
,
bool
pwd
);
FileConfigControl
(
vlc_object_t
*
,
module_config_t
*
,
QLabel
*
,
QLineEdit
*
,
QPushButton
*
,
bool
pwd
);
QLineEdit
*
,
QPushButton
*
,
bool
pwd
);
virtual
~
FileConfigControl
()
{};
virtual
QString
getValue
()
{
return
text
->
text
();
};
virtual
void
show
()
{
text
->
show
();
label
->
show
();
browse
->
show
();
}
...
...
@@ -287,14 +287,27 @@ class DirectoryConfigControl : public FileConfigControl
Q_OBJECT
;
public:
DirectoryConfigControl
(
vlc_object_t
*
,
module_config_t
*
,
QWidget
*
,
QGridLayout
*
,
int
&
,
bool
pwd
);
QGridLayout
*
,
int
&
,
bool
pwd
);
DirectoryConfigControl
(
vlc_object_t
*
,
module_config_t
*
,
QLabel
*
,
QLineEdit
*
,
QPushButton
*
,
bool
pwd
);
QLineEdit
*
,
QPushButton
*
,
bool
pwd
);
virtual
~
DirectoryConfigControl
()
{};
public
slots
:
virtual
void
updateField
();
};
class
FontConfigControl
:
public
FileConfigControl
{
Q_OBJECT
;
public:
FontConfigControl
(
vlc_object_t
*
,
module_config_t
*
,
QWidget
*
,
QGridLayout
*
,
int
&
,
bool
pwd
);
FontConfigControl
(
vlc_object_t
*
,
module_config_t
*
,
QLabel
*
,
QLineEdit
*
,
QPushButton
*
,
bool
pwd
);
virtual
~
FontConfigControl
()
{};
public
slots
:
virtual
void
updateField
();
};
class
ModuleConfigControl
:
public
VStringConfigControl
{
public:
...
...
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