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
2b5cb724
Commit
2b5cb724
authored
Jun 08, 2012
by
Ludovic Fauvet
Committed by
Jean-Baptiste Kempf
Jun 09, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt4: rename a couple of methods to be more explicit
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
7317861d
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
16 deletions
+16
-16
modules/gui/qt4/dialogs/bookmarks.cpp
modules/gui/qt4/dialogs/bookmarks.cpp
+2
-2
modules/gui/qt4/dialogs/epg.cpp
modules/gui/qt4/dialogs/epg.cpp
+2
-2
modules/gui/qt4/dialogs/help.cpp
modules/gui/qt4/dialogs/help.cpp
+2
-2
modules/gui/qt4/dialogs/mediainfo.cpp
modules/gui/qt4/dialogs/mediainfo.cpp
+2
-2
modules/gui/qt4/dialogs/messages.cpp
modules/gui/qt4/dialogs/messages.cpp
+2
-2
modules/gui/qt4/dialogs/plugins.cpp
modules/gui/qt4/dialogs/plugins.cpp
+4
-4
modules/gui/qt4/util/qvlcframe.hpp
modules/gui/qt4/util/qvlcframe.hpp
+2
-2
No files found.
modules/gui/qt4/dialogs/bookmarks.cpp
View file @
2b5cb724
...
@@ -94,13 +94,13 @@ BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf ):QVLCFrame( _p_intf )
...
@@ -94,13 +94,13 @@ BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf ):QVLCFrame( _p_intf )
#endif
#endif
CONNECT
(
buttonsBox
,
rejected
(),
this
,
close
()
);
CONNECT
(
buttonsBox
,
rejected
(),
this
,
close
()
);
re
adSettings
(
"Bookmarks"
,
QSize
(
435
,
280
)
);
re
storeWidgetPosition
(
"Bookmarks"
,
QSize
(
435
,
280
)
);
updateGeometry
();
updateGeometry
();
}
}
BookmarksDialog
::~
BookmarksDialog
()
BookmarksDialog
::~
BookmarksDialog
()
{
{
writeSettings
(
"Bookmarks"
);
saveWidgetPosition
(
"Bookmarks"
);
}
}
void
BookmarksDialog
::
update
()
void
BookmarksDialog
::
update
()
...
...
modules/gui/qt4/dialogs/epg.cpp
View file @
2b5cb724
...
@@ -96,12 +96,12 @@ EpgDialog::EpgDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
...
@@ -96,12 +96,12 @@ EpgDialog::EpgDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
CONNECT
(
timer
,
timeout
(),
this
,
updateInfos
()
);
CONNECT
(
timer
,
timeout
(),
this
,
updateInfos
()
);
updateInfos
();
updateInfos
();
re
adSettings
(
"EPGDialog"
,
QSize
(
650
,
450
)
);
re
storeWidgetPosition
(
"EPGDialog"
,
QSize
(
650
,
450
)
);
}
}
EpgDialog
::~
EpgDialog
()
EpgDialog
::~
EpgDialog
()
{
{
writeSettings
(
"EPGDialog"
);
saveWidgetPosition
(
"EPGDialog"
);
}
}
void
EpgDialog
::
displayEvent
(
EPGItem
*
epgItem
)
void
EpgDialog
::
displayEvent
(
EPGItem
*
epgItem
)
...
...
modules/gui/qt4/dialogs/help.cpp
View file @
2b5cb724
...
@@ -70,12 +70,12 @@ HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
...
@@ -70,12 +70,12 @@ HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
layout
->
addWidget
(
closeButtonBox
);
layout
->
addWidget
(
closeButtonBox
);
CONNECT
(
closeButtonBox
,
rejected
(),
this
,
close
()
);
CONNECT
(
closeButtonBox
,
rejected
(),
this
,
close
()
);
re
adSettings
(
"Help"
,
QSize
(
500
,
450
)
);
re
storeWidgetPosition
(
"Help"
,
QSize
(
500
,
450
)
);
}
}
HelpDialog
::~
HelpDialog
()
HelpDialog
::~
HelpDialog
()
{
{
writeSettings
(
"Help"
);
saveWidgetPosition
(
"Help"
);
}
}
AboutDialog
::
AboutDialog
(
intf_thread_t
*
_p_intf
)
AboutDialog
::
AboutDialog
(
intf_thread_t
*
_p_intf
)
...
...
modules/gui/qt4/dialogs/mediainfo.cpp
View file @
2b5cb724
...
@@ -125,12 +125,12 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf,
...
@@ -125,12 +125,12 @@ MediaInfoDialog::MediaInfoDialog( intf_thread_t *_p_intf,
if
(
p_item
)
if
(
p_item
)
updateAllTabs
(
p_item
);
updateAllTabs
(
p_item
);
re
adSettings
(
"Mediainfo"
,
QSize
(
600
,
480
)
);
re
storeWidgetPosition
(
"Mediainfo"
,
QSize
(
600
,
480
)
);
}
}
MediaInfoDialog
::~
MediaInfoDialog
()
MediaInfoDialog
::~
MediaInfoDialog
()
{
{
writeSettings
(
"Mediainfo"
);
saveWidgetPosition
(
"Mediainfo"
);
}
}
void
MediaInfoDialog
::
showTab
(
int
i_tab
=
0
)
void
MediaInfoDialog
::
showTab
(
int
i_tab
=
0
)
...
...
modules/gui/qt4/dialogs/messages.cpp
View file @
2b5cb724
...
@@ -114,7 +114,7 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
...
@@ -114,7 +114,7 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
CONNECT
(
ui
.
mainTab
,
currentChanged
(
int
),
this
,
tabChanged
(
int
)
);
CONNECT
(
ui
.
mainTab
,
currentChanged
(
int
),
this
,
tabChanged
(
int
)
);
/* General action */
/* General action */
re
adSettings
(
"Messages"
,
QSize
(
600
,
450
)
);
re
storeWidgetPosition
(
"Messages"
,
QSize
(
600
,
450
)
);
/* Hook up to LibVLC messaging */
/* Hook up to LibVLC messaging */
vlc_Subscribe
(
&
sub
,
MsgCallback
,
this
);
vlc_Subscribe
(
&
sub
,
MsgCallback
,
this
);
...
@@ -122,7 +122,7 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
...
@@ -122,7 +122,7 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf)
MessagesDialog
::~
MessagesDialog
()
MessagesDialog
::~
MessagesDialog
()
{
{
writeSettings
(
"Messages"
);
saveWidgetPosition
(
"Messages"
);
vlc_Unsubscribe
(
&
sub
);
vlc_Unsubscribe
(
&
sub
);
};
};
...
...
modules/gui/qt4/dialogs/plugins.cpp
View file @
2b5cb724
...
@@ -75,12 +75,12 @@ PluginDialog::PluginDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
...
@@ -75,12 +75,12 @@ PluginDialog::PluginDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
box
->
addButton
(
okButton
,
QDialogButtonBox
::
RejectRole
);
box
->
addButton
(
okButton
,
QDialogButtonBox
::
RejectRole
);
layout
->
addWidget
(
box
);
layout
->
addWidget
(
box
);
BUTTONACT
(
okButton
,
close
()
);
BUTTONACT
(
okButton
,
close
()
);
re
adSettings
(
"PluginsDialog"
,
QSize
(
435
,
280
)
);
re
storeWidgetPosition
(
"PluginsDialog"
,
QSize
(
435
,
280
)
);
}
}
PluginDialog
::~
PluginDialog
()
PluginDialog
::~
PluginDialog
()
{
{
writeSettings
(
"PluginsDialog"
);
saveWidgetPosition
(
"PluginsDialog"
);
}
}
/* Plugins tab */
/* Plugins tab */
...
@@ -125,7 +125,7 @@ PluginTab::PluginTab( intf_thread_t *p_intf_ )
...
@@ -125,7 +125,7 @@ PluginTab::PluginTab( intf_thread_t *p_intf_ )
this
,
search
(
const
QString
&
)
);
this
,
search
(
const
QString
&
)
);
setMinimumSize
(
500
,
300
);
setMinimumSize
(
500
,
300
);
re
adSettings
(
"Plugins"
,
QSize
(
540
,
400
)
);
re
storeWidgetPosition
(
"Plugins"
,
QSize
(
540
,
400
)
);
}
}
inline
void
PluginTab
::
FillTree
()
inline
void
PluginTab
::
FillTree
()
...
@@ -164,7 +164,7 @@ void PluginTab::search( const QString& qs )
...
@@ -164,7 +164,7 @@ void PluginTab::search( const QString& qs )
PluginTab
::~
PluginTab
()
PluginTab
::~
PluginTab
()
{
{
writeSettings
(
"Plugins"
);
saveWidgetPosition
(
"Plugins"
);
getSettings
()
->
setValue
(
"Plugins/Header-State"
,
getSettings
()
->
setValue
(
"Plugins/Header-State"
,
treePlugins
->
header
()
->
saveState
()
);
treePlugins
->
header
()
->
saveState
()
);
}
}
...
...
modules/gui/qt4/util/qvlcframe.hpp
View file @
2b5cb724
...
@@ -113,14 +113,14 @@ public:
...
@@ -113,14 +113,14 @@ public:
protected:
protected:
intf_thread_t
*
p_intf
;
intf_thread_t
*
p_intf
;
void
re
adSettings
(
const
QString
&
name
,
void
re
storeWidgetPosition
(
const
QString
&
name
,
QSize
defSize
=
QSize
(
1
,
1
),
QSize
defSize
=
QSize
(
1
,
1
),
QPoint
defPos
=
QPoint
(
0
,
0
)
)
QPoint
defPos
=
QPoint
(
0
,
0
)
)
{
{
QVLCTools
::
restoreWidgetPosition
(
p_intf
,
name
,
this
,
defSize
,
defPos
);
QVLCTools
::
restoreWidgetPosition
(
p_intf
,
name
,
this
,
defSize
,
defPos
);
}
}
void
writeSettings
(
const
QString
&
name
)
void
saveWidgetPosition
(
const
QString
&
name
)
{
{
QVLCTools
::
saveWidgetPosition
(
p_intf
,
name
,
this
);
QVLCTools
::
saveWidgetPosition
(
p_intf
,
name
,
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