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
d1b5547c
Commit
d1b5547c
authored
Jun 14, 2010
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop the icons resolution from their name
The less acrobatic way
parent
2b727d16
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
15 additions
and
14 deletions
+15
-14
Makefile.am
Makefile.am
+1
-1
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+2
-2
modules/gui/qt4/vlc.qrc
modules/gui/qt4/vlc.qrc
+5
-5
share/Makefile.am
share/Makefile.am
+7
-6
share/icons/128x128/vlc-christmas.png
share/icons/128x128/vlc-christmas.png
+0
-0
share/icons/128x128/vlc.png
share/icons/128x128/vlc.png
+0
-0
share/icons/16x16/vlc.png
share/icons/16x16/vlc.png
+0
-0
share/icons/16x16/vlc.xpm
share/icons/16x16/vlc.xpm
+0
-0
share/icons/256x256/vlc.png
share/icons/256x256/vlc.png
+0
-0
share/icons/32x32/vlc-christmas.xpm
share/icons/32x32/vlc-christmas.xpm
+0
-0
share/icons/32x32/vlc.png
share/icons/32x32/vlc.png
+0
-0
share/icons/32x32/vlc.xpm
share/icons/32x32/vlc.xpm
+0
-0
share/icons/48x48/vlc-christmas.png
share/icons/48x48/vlc-christmas.png
+0
-0
share/icons/48x48/vlc.png
share/icons/48x48/vlc.png
+0
-0
share/icons/vlc.ico
share/icons/vlc.ico
+0
-0
No files found.
Makefile.am
View file @
d1b5547c
...
...
@@ -735,7 +735,7 @@ package-win-common:
$(U2D) "$(win32_destdir)/"*.txt || echo "WARNING
:
this shouldn't happen"
# Necessary icons
cp
$(srcdir)/share/vlc.ico
$(win32_destdir)/
cp
$(srcdir)/share/
icons/
vlc.ico
$(win32_destdir)/
# Copy the locales
mkdir
-p
$(win32_destdir)/locale
...
...
modules/gui/qt4/qt4.cpp
View file @
d1b5547c
...
...
@@ -42,8 +42,8 @@
#include <vlc_xlib.h>
#endif
#include "../../../share/
vlc32x32
.xpm"
#include "../../../share/
vlc32x32
-christmas.xpm"
#include "../../../share/
icons/32x32/vlc
.xpm"
#include "../../../share/
icons/32x32/vlc
-christmas.xpm"
#include <vlc_plugin.h>
#ifdef WIN32
/* For static builds */
...
...
modules/gui/qt4/vlc.qrc
View file @
d1b5547c
<RCC>
<qresource prefix="/logo" >
<file alias="vlc128.png" >../../../share/
vlc128x128
.png</file>
<file alias="vlc16.png" >../../../share/
vlc16x16
.png</file>
<file alias="vlc48.png" >../../../share/
vlc48x48
.png</file>
<file alias="vlc128-christmas.png" >../../../share/
vlc128x128
-christmas.png</file>
<file alias="vlc48-christmas.png" >../../../share/
vlc48x48
-christmas.png</file>
<file alias="vlc128.png" >../../../share/
icons/128x128/vlc
.png</file>
<file alias="vlc16.png" >../../../share/
icons/16x16/vlc
.png</file>
<file alias="vlc48.png" >../../../share/
icons/48x48/vlc
.png</file>
<file alias="vlc128-christmas.png" >../../../share/
icons/128x128/vlc
-christmas.png</file>
<file alias="vlc48-christmas.png" >../../../share/
icons/48x48/vlc
-christmas.png</file>
</qresource>
<qresource prefix="/menu" >
<file alias="help" >pixmaps/menus/help_16px.png</file>
...
...
share/Makefile.am
View file @
d1b5547c
...
...
@@ -12,12 +12,13 @@ icons256dir = $(iconsdatadir)/256x256/apps/
dist_appdata_DATA
=
vlc.desktop
dist_vlcdata_DATA
=
vlc.ico
dist_icons16_DATA
=
vlc16x16.png vlc16x16.xpm
dist_icons32_DATA
=
vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm
dist_icons48_DATA
=
vlc48x48.png vlc48x48-christmas.png
dist_icons128_DATA
=
vlc128x128.png vlc128x128-christmas.png
dist_icons256_DATA
=
vlc256x256.png
dist_vlcdata_DATA
=
icons/vlc.ico
dist_icons16_DATA
=
icons/16x16/vlc.png icons/16x16/vlc.xpm
dist_icons32_DATA
=
icons/32x32/vlc.png icons/32x32/vlc.xpm
\
icons/32x32/vlc-christmas.xpm
dist_icons48_DATA
=
icons/48x48/vlc.png icons/48x48/vlc-christmas.png
dist_icons128_DATA
=
icons/128x128/vlc.png icons/128x128/vlc-christmas.png
dist_icons256_DATA
=
icons/256x256/vlc.png
nobase_dist_vlcdata_SCRIPTS
=
\
utils/gnome-vlc-default.sh
\
...
...
share/
vlc128x128
-christmas.png
→
share/
icons/128x128/vlc
-christmas.png
View file @
d1b5547c
File moved
share/
vlc128x128
.png
→
share/
icons/128x128/vlc
.png
View file @
d1b5547c
File moved
share/
vlc16x16
.png
→
share/
icons/16x16/vlc
.png
View file @
d1b5547c
File moved
share/
vlc16x16
.xpm
→
share/
icons/16x16/vlc
.xpm
View file @
d1b5547c
File moved
share/
vlc256x256
.png
→
share/
icons/256x256/vlc
.png
View file @
d1b5547c
File moved
share/
vlc32x32
-christmas.xpm
→
share/
icons/32x32/vlc
-christmas.xpm
View file @
d1b5547c
File moved
share/
vlc32x32
.png
→
share/
icons/32x32/vlc
.png
View file @
d1b5547c
File moved
share/
vlc32x32
.xpm
→
share/
icons/32x32/vlc
.xpm
View file @
d1b5547c
File moved
share/
vlc48x48
-christmas.png
→
share/
icons/48x48/vlc
-christmas.png
View file @
d1b5547c
File moved
share/
vlc48x48
.png
→
share/
icons/48x48/vlc
.png
View file @
d1b5547c
File moved
share/vlc.ico
→
share/
icons/
vlc.ico
View file @
d1b5547c
File moved
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