Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
456
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
b7e89391
Commit
b7e89391
authored
17 years ago
by
Rafaël Carré
Browse files
Options
Downloads
Patches
Plain Diff
Makes THANKS & COPYING built in in qt4 about dialog
parent
2fd0b6be
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/gui/qt4/Modules.am
+12
-0
12 additions, 0 deletions
modules/gui/qt4/Modules.am
modules/gui/qt4/dialogs/help.cpp
+6
-4
6 additions, 4 deletions
modules/gui/qt4/dialogs/help.cpp
with
18 additions
and
4 deletions
modules/gui/qt4/Modules.am
+
12
−
0
View file @
b7e89391
...
...
@@ -75,6 +75,17 @@ resources.cpp: res.qrc
sed -i -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp
mv -f $@.tmp $@
dialogs/help.cpp: dialogs/about.hpp
dialogs/about.hpp:
echo "char *psz_licence = { \\" > dialogs/about.hpp
cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\" \\" }' >> dialogs/about.hpp
echo "};" >> dialogs/about.hpp
echo "char *psz_thanks = { \\" >> dialogs/about.hpp
cat $(top_srcdir)/THANKS | grep -v '$$Id:' | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\" \\" }' >> dialogs/about.hpp
echo "};" >> dialogs/about.hpp
SOURCES_qt4 = qt4.cpp \
menus.cpp \
main_interface.cpp \
...
...
@@ -119,6 +130,7 @@ noinst_HEADERS = \
dialogs/preferences.hpp \
dialogs/interaction.hpp \
dialogs/sout.hpp \
dialogs/about.hpp \
dialogs/help.hpp \
dialogs/gototime.hpp \
dialogs/open.hpp \
...
...
This diff is collapsed.
Click to expand it.
modules/gui/qt4/dialogs/help.cpp
+
6
−
4
View file @
b7e89391
...
...
@@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include
"dialogs/about.hpp"
#include
"dialogs/help.hpp"
#include
"dialogs_provider.hpp"
...
...
@@ -31,6 +32,7 @@
#include
<QTabWidget>
#include
<QFile>
#include
<QLabel>
#include
<QString>
HelpDialog
*
HelpDialog
::
instance
=
NULL
;
...
...
@@ -80,15 +82,15 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf )
layout
->
addWidget
(
closeButton
,
2
,
1
,
1
,
1
);
/* GPL License */
QFile
*
licenseFile
=
new
QFile
(
"/usr/src/vlc/COPYING"
);
QTextEdit
*
licenseEdit
=
new
QTextEdit
(
this
);
licenseEdit
->
setText
(
licenseFile
->
readAll
()
);
QString
psz_qlicence
=
QString
::
fromUtf8
(
psz_licence
);
licenseEdit
->
setText
(
psz_qlicence
);
licenseEdit
->
setReadOnly
(
true
);
/* People who helped */
QFile
*
thanksFile
=
new
QFile
(
"/usr/src/vlc/THANKS"
);
QTextEdit
*
thanksEdit
=
new
QTextEdit
(
this
);
thanksEdit
->
setText
(
thanksFile
->
readAll
()
);
QString
psz_qthanks
=
QString
::
fromUtf8
(
psz_thanks
);
thanksEdit
->
setText
(
psz_qthanks
);
thanksEdit
->
setReadOnly
(
true
);
/* add the tabs to the Tabwidget */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment