[MPlayer-cvslog] r38052 - in trunk/gui/dialog: fileselect.c menu.c pixmaps/aspect11.xpm pixmaps/aspect169.xpm pixmaps/aspect235.xpm pixmaps/aspect43.xpm pixmaps/aspect_16_9.xpm pixmaps/aspect_2_35_1.xpm pixmaps/asp...
ib
subversion at mplayerhq.hu
Thu Apr 5 16:26:10 EEST 2018
Author: ib
Date: Thu Apr 5 16:26:10 2018
New Revision: 38052
Log:
Rename X PixMap files.
The (sometimes) messy naming of the xpm files has evolved historically.
Bring some order into it by renaming.
Concerning "file" and "file2", we don't need two similar icons. Remove
"file" and rename "file2" "file".
Added:
trunk/gui/dialog/pixmaps/aspect_16_9.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/aspect169.xpm
trunk/gui/dialog/pixmaps/aspect_2_35_1.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/aspect235.xpm
trunk/gui/dialog/pixmaps/aspect_4_3.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/aspect43.xpm
trunk/gui/dialog/pixmaps/aspect_original.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/aspect11.xpm
trunk/gui/dialog/pixmaps/audio_dolby.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/dolby.xpm
trunk/gui/dialog/pixmaps/audio_track.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/audio.xpm
trunk/gui/dialog/pixmaps/audio_track_load.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/loadeaf.xpm
trunk/gui/dialog/pixmaps/blank.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/empty.xpm
trunk/gui/dialog/pixmaps/blank_1px.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/empty1px.xpm
trunk/gui/dialog/pixmaps/cd_play.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/playcd.xpm
trunk/gui/dialog/pixmaps/dir_up.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/up.xpm
trunk/gui/dialog/pixmaps/dvd_play.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/playdvd.xpm
trunk/gui/dialog/pixmaps/image.xpm (contents, props changed)
- copied, changed from r38051, trunk/gui/dialog/pixmaps/playimage.xpm
trunk/gui/dialog/pixmaps/play_next.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/next.xpm
trunk/gui/dialog/pixmaps/play_pause.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/pause.xpm
trunk/gui/dialog/pixmaps/play_previous.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/prev.xpm
trunk/gui/dialog/pixmaps/play_stop.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/stop.xpm
trunk/gui/dialog/pixmaps/preferences.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/prefs.xpm
trunk/gui/dialog/pixmaps/rotate_0.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/rotate0.xpm
trunk/gui/dialog/pixmaps/rotate_180.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/rotate180.xpm
trunk/gui/dialog/pixmaps/rotate_90ccw.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/rotate90ccw.xpm
trunk/gui/dialog/pixmaps/rotate_90cw.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/rotate90cw.xpm
trunk/gui/dialog/pixmaps/size_double.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/double.xpm
trunk/gui/dialog/pixmaps/size_full.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/full.xpm
trunk/gui/dialog/pixmaps/size_half.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/half.xpm
trunk/gui/dialog/pixmaps/size_normal.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/normal.xpm
trunk/gui/dialog/pixmaps/subtitle_drop.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/nosub.xpm
trunk/gui/dialog/pixmaps/subtitle_load.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/sub.xpm
trunk/gui/dialog/pixmaps/subtitle_track.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/subtitle.xpm
trunk/gui/dialog/pixmaps/vcd_play.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/playvcd.xpm
trunk/gui/dialog/pixmaps/video_track.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/video.xpm
trunk/gui/dialog/pixmaps/volume_mute.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/sound.xpm
Replaced:
trunk/gui/dialog/pixmaps/file.xpm
- copied, changed from r38051, trunk/gui/dialog/pixmaps/file2.xpm
Deleted:
trunk/gui/dialog/pixmaps/aspect11.xpm
trunk/gui/dialog/pixmaps/aspect169.xpm
trunk/gui/dialog/pixmaps/aspect235.xpm
trunk/gui/dialog/pixmaps/aspect43.xpm
trunk/gui/dialog/pixmaps/audio.xpm
trunk/gui/dialog/pixmaps/dolby.xpm
trunk/gui/dialog/pixmaps/double.xpm
trunk/gui/dialog/pixmaps/empty.xpm
trunk/gui/dialog/pixmaps/empty1px.xpm
trunk/gui/dialog/pixmaps/file2.xpm
trunk/gui/dialog/pixmaps/full.xpm
trunk/gui/dialog/pixmaps/half.xpm
trunk/gui/dialog/pixmaps/loadeaf.xpm
trunk/gui/dialog/pixmaps/next.xpm
trunk/gui/dialog/pixmaps/normal.xpm
trunk/gui/dialog/pixmaps/nosub.xpm
trunk/gui/dialog/pixmaps/pause.xpm
trunk/gui/dialog/pixmaps/playcd.xpm
trunk/gui/dialog/pixmaps/playdvd.xpm
trunk/gui/dialog/pixmaps/playimage.xpm
trunk/gui/dialog/pixmaps/playvcd.xpm
trunk/gui/dialog/pixmaps/prefs.xpm
trunk/gui/dialog/pixmaps/prev.xpm
trunk/gui/dialog/pixmaps/rotate0.xpm
trunk/gui/dialog/pixmaps/rotate180.xpm
trunk/gui/dialog/pixmaps/rotate90ccw.xpm
trunk/gui/dialog/pixmaps/rotate90cw.xpm
trunk/gui/dialog/pixmaps/sound.xpm
trunk/gui/dialog/pixmaps/stop.xpm
trunk/gui/dialog/pixmaps/sub.xpm
trunk/gui/dialog/pixmaps/subtitle.xpm
trunk/gui/dialog/pixmaps/up.xpm
trunk/gui/dialog/pixmaps/video.xpm
Modified:
trunk/gui/dialog/fileselect.c
trunk/gui/dialog/menu.c
Modified: trunk/gui/dialog/fileselect.c
==============================================================================
--- trunk/gui/dialog/fileselect.c Thu Apr 5 03:10:18 2018 (r38051)
+++ trunk/gui/dialog/fileselect.c Thu Apr 5 16:26:10 2018 (r38052)
@@ -29,7 +29,7 @@
#include "tools.h"
#include "pixmaps/dir.xpm"
#include "pixmaps/file.xpm"
-#include "pixmaps/up.xpm"
+#include "pixmaps/dir_up.xpm"
#include "gui/interface.h"
#include "gui/app/app.h"
#include "gui/app/cfg.h"
@@ -657,7 +657,7 @@ static GtkWidget *CreateFileSelect(void)
gtk_box_pack_start(GTK_BOX(hbox4), vseparator1, FALSE, TRUE, 0);
upstyle = gtk_widget_get_style(FileSelector);
- uppixmap = gdk_pixmap_colormap_create_from_xpm_d(FileSelector->window, fsColorMap, &upmask, &upstyle->bg[GTK_STATE_NORMAL], (gchar **)up_xpm);
+ uppixmap = gdk_pixmap_colormap_create_from_xpm_d(FileSelector->window, fsColorMap, &upmask, &upstyle->bg[GTK_STATE_NORMAL], (gchar **)dir_up_xpm);
uppixmapwid = gtk_pixmap_new(uppixmap, upmask);
gtk_widget_show(uppixmapwid);
Modified: trunk/gui/dialog/menu.c
==============================================================================
--- trunk/gui/dialog/menu.c Thu Apr 5 03:10:18 2018 (r38051)
+++ trunk/gui/dialog/menu.c Thu Apr 5 16:26:10 2018 (r38052)
@@ -49,63 +49,63 @@
#include "libavutil/avstring.h"
#include "pixmaps/about.xpm"
-#include "pixmaps/audio.xpm"
-#include "pixmaps/video.xpm"
-#include "pixmaps/half.xpm"
-#include "pixmaps/normal.xpm"
-#include "pixmaps/double.xpm"
-#include "pixmaps/full.xpm"
+#include "pixmaps/audio_track.xpm"
+#include "pixmaps/video_track.xpm"
+#include "pixmaps/size_half.xpm"
+#include "pixmaps/size_normal.xpm"
+#include "pixmaps/size_double.xpm"
+#include "pixmaps/size_full.xpm"
#include "pixmaps/exit.xpm"
-#include "pixmaps/prefs.xpm"
+#include "pixmaps/preferences.xpm"
#include "pixmaps/equalizer.xpm"
#include "pixmaps/playlist.xpm"
#include "pixmaps/skin.xpm"
-#include "pixmaps/sound.xpm"
+#include "pixmaps/volume_mute.xpm"
#include "pixmaps/open.xpm"
#include "pixmaps/play.xpm"
-#include "pixmaps/stop.xpm"
-#include "pixmaps/pause.xpm"
-#include "pixmaps/prev.xpm"
-#include "pixmaps/next.xpm"
+#include "pixmaps/play_stop.xpm"
+#include "pixmaps/play_pause.xpm"
+#include "pixmaps/play_previous.xpm"
+#include "pixmaps/play_next.xpm"
#include "pixmaps/aspect.xpm"
-#include "pixmaps/aspect11.xpm"
-#include "pixmaps/aspect169.xpm"
-#include "pixmaps/aspect235.xpm"
-#include "pixmaps/aspect43.xpm"
-#include "pixmaps/file2.xpm"
+#include "pixmaps/aspect_original.xpm"
+#include "pixmaps/aspect_16_9.xpm"
+#include "pixmaps/aspect_2_35_1.xpm"
+#include "pixmaps/aspect_4_3.xpm"
+#include "pixmaps/file.xpm"
#include "pixmaps/url.xpm"
-#include "pixmaps/sub.xpm"
-#include "pixmaps/nosub.xpm"
-#include "pixmaps/empty.xpm"
-#include "pixmaps/loadeaf.xpm"
+#include "pixmaps/subtitle_load.xpm"
+#include "pixmaps/subtitle_drop.xpm"
+#include "pixmaps/blank.xpm"
+#include "pixmaps/audio_track_load.xpm"
#include "pixmaps/title.xpm"
-#include "pixmaps/subtitle.xpm"
+#include "pixmaps/subtitle_track.xpm"
#ifdef CONFIG_CDDA
#include "pixmaps/cd.xpm"
-#include "pixmaps/playcd.xpm"
+#include "pixmaps/cd_play.xpm"
#endif
#ifdef CONFIG_VCD
#include "pixmaps/vcd.xpm"
-#include "pixmaps/playvcd.xpm"
+#include "pixmaps/vcd_play.xpm"
#endif
#ifdef CONFIG_DVDREAD
#include "pixmaps/dvd.xpm"
-#include "pixmaps/playdvd.xpm"
+#include "pixmaps/dvd_play.xpm"
#include "pixmaps/chapter.xpm"
-#include "pixmaps/dolby.xpm"
+#include "pixmaps/audio_dolby.xpm"
#endif
#ifdef CONFIG_TV
#include "pixmaps/tv.xpm"
#endif
#if defined(CONFIG_LIBCDIO) || defined(CONFIG_DVDREAD)
-#include "pixmaps/playimage.xpm"
+#include "pixmaps/image.xpm"
#endif
-#include "pixmaps/empty1px.xpm"
+#include "pixmaps/blank_1px.xpm"
#include "pixmaps/rotate.xpm"
-#include "pixmaps/rotate0.xpm"
-#include "pixmaps/rotate180.xpm"
-#include "pixmaps/rotate90ccw.xpm"
-#include "pixmaps/rotate90cw.xpm"
+#include "pixmaps/rotate_0.xpm"
+#include "pixmaps/rotate_180.xpm"
+#include "pixmaps/rotate_90ccw.xpm"
+#include "pixmaps/rotate_90cw.xpm"
int gtkPopupMenu;
int gtkPopupMenuParam;
@@ -416,13 +416,13 @@ static const Languages_t Languages[] =
#ifdef CONFIG_DVDREAD
static const char * const *ChannelTypes[] =
{
- dolby_xpm, // Dolby Digital
- empty_xpm,
- empty_xpm, // Mpeg-1
- empty_xpm, // Mpeg-2
- empty_xpm, // LPCM
- empty_xpm,
- empty_xpm // Digital Theatre System
+ audio_dolby_xpm, // Dolby Digital
+ blank_xpm,
+ blank_xpm, // Mpeg-1
+ blank_xpm, // Mpeg-2
+ blank_xpm, // LPCM
+ blank_xpm,
+ blank_xpm // Digital Theatre System
};
static char * ChannelNumbers[] =
{ "\b1.0", "\b2.0", "\b2.1", "\b3.1", "\b5.0", "\b5.1" };
@@ -493,11 +493,11 @@ GtkWidget * CreatePopUpMenu( int wType )
AddMenuItem( window1, (const char*)about_xpm, Menu,MSGTR_GUI_AboutMPlayer" ", evAbout );
AddSeparator( Menu );
SubMenu=AddSubMenu( window1, (const char*)open_xpm, Menu,MSGTR_GUI_Open );
- AddMenuItem( window1, (const char*)file2_xpm, SubMenu,MSGTR_GUI_File"... ", evLoadPlay );
+ AddMenuItem( window1, (const char*)file_xpm, SubMenu,MSGTR_GUI_File"... ", evLoadPlay );
#ifdef CONFIG_CDDA
- AddMenuItem( window1, (const char*)playcd_xpm, SubMenu,MSGTR_GUI_CD, evPlayCD );
+ AddMenuItem( window1, (const char*)cd_play_xpm, SubMenu,MSGTR_GUI_CD, evPlayCD );
CDSubMenu=AddSubMenu( window1, (const char*)cd_xpm, Menu,MSGTR_GUI_CD );
- AddMenuItem( window1, (const char*)playcd_xpm, CDSubMenu,MSGTR_GUI_Play,evPlayCD );
+ AddMenuItem( window1, (const char*)cd_play_xpm, CDSubMenu,MSGTR_GUI_Play,evPlayCD );
AddSeparator( CDSubMenu );
CDTitleMenu=AddSubMenu( window1, (const char*)title_xpm, CDSubMenu,MSGTR_GUI_Titles );
if ( guiInfo.Tracks && ( guiInfo.StreamType == STREAMTYPE_CDDA ) )
@@ -506,19 +506,19 @@ GtkWidget * CreatePopUpMenu( int wType )
for ( i=1;i <= guiInfo.Tracks;i++ )
{
snprintf( tmp,32,MSGTR_GUI_TitleNN,i );
- AddMenuCheckItem(window1, (const char*)empty1px_xpm, CDTitleMenu,tmp, guiInfo.Track == i, ( i << 16 ) + ivSetCDTrack );
+ AddMenuCheckItem(window1, (const char*)blank_1px_xpm, CDTitleMenu,tmp, guiInfo.Track == i, ( i << 16 ) + ivSetCDTrack );
}
}
else
{
- MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, CDTitleMenu,MSGTR_GUI__none_,evNone );
+ MenuItem=AddMenuItem( window1, (const char*)blank_1px_xpm, CDTitleMenu,MSGTR_GUI__none_,evNone );
gtk_widget_set_sensitive( MenuItem,FALSE );
}
#endif
#ifdef CONFIG_VCD
- AddMenuItem( window1, (const char*)playvcd_xpm, SubMenu,MSGTR_GUI_VCD, evPlayVCD );
+ AddMenuItem( window1, (const char*)vcd_play_xpm, SubMenu,MSGTR_GUI_VCD, evPlayVCD );
VCDSubMenu=AddSubMenu( window1, (const char*)vcd_xpm, Menu,MSGTR_GUI_VCD );
- AddMenuItem( window1, (const char*)playvcd_xpm, VCDSubMenu,MSGTR_GUI_Play,evPlayVCD );
+ AddMenuItem( window1, (const char*)vcd_play_xpm, VCDSubMenu,MSGTR_GUI_Play,evPlayVCD );
AddSeparator( VCDSubMenu );
VCDTitleMenu=AddSubMenu( window1, (const char*)title_xpm, VCDSubMenu,MSGTR_GUI_Titles );
if ( guiInfo.Tracks && ( guiInfo.StreamType == STREAMTYPE_VCD ) )
@@ -527,19 +527,19 @@ GtkWidget * CreatePopUpMenu( int wType )
for ( i=1;i < guiInfo.Tracks;i++ )
{
snprintf( tmp,32,MSGTR_GUI_TitleNN,i );
- AddMenuCheckItem(window1, (const char*)empty1px_xpm, VCDTitleMenu,tmp, guiInfo.Track == i + 1, ( ( i + 1 ) << 16 ) + ivSetVCDTrack );
+ AddMenuCheckItem(window1, (const char*)blank_1px_xpm, VCDTitleMenu,tmp, guiInfo.Track == i + 1, ( ( i + 1 ) << 16 ) + ivSetVCDTrack );
}
}
else
{
- MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, VCDTitleMenu,MSGTR_GUI__none_,evNone );
+ MenuItem=AddMenuItem( window1, (const char*)blank_1px_xpm, VCDTitleMenu,MSGTR_GUI__none_,evNone );
gtk_widget_set_sensitive( MenuItem,FALSE );
}
#endif
#ifdef CONFIG_DVDREAD
- AddMenuItem( window1, (const char*)playdvd_xpm, SubMenu,MSGTR_GUI_DVD, evPlayDVD );
+ AddMenuItem( window1, (const char*)dvd_play_xpm, SubMenu,MSGTR_GUI_DVD, evPlayDVD );
DVDSubMenu=AddSubMenu( window1, (const char*)dvd_xpm, Menu,MSGTR_GUI_DVD );
- AddMenuItem( window1, (const char*)playdvd_xpm, DVDSubMenu,MSGTR_GUI_Play" ", evPlayDVD );
+ AddMenuItem( window1, (const char*)dvd_play_xpm, DVDSubMenu,MSGTR_GUI_Play" ", evPlayDVD );
AddSeparator( DVDSubMenu );
DVDTitleMenu=AddSubMenu( window1, (const char*)title_xpm, DVDSubMenu,MSGTR_GUI_Titles );
if ( guiInfo.Tracks && ( guiInfo.StreamType == STREAMTYPE_DVD ) )
@@ -548,14 +548,14 @@ GtkWidget * CreatePopUpMenu( int wType )
for ( i=1 ; i<= guiInfo.Tracks;i++ )
{
snprintf( tmp,32,MSGTR_GUI_TitleNN,i);
- AddMenuCheckItem( window1, (const char*)empty1px_xpm, DVDTitleMenu,tmp,
+ AddMenuCheckItem( window1, (const char*)blank_1px_xpm, DVDTitleMenu,tmp,
guiInfo.Track == i,
(i << 16) + ivSetDVDTitle );
}
}
else
{
- MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, DVDTitleMenu,MSGTR_GUI__none_,evNone );
+ MenuItem=AddMenuItem( window1, (const char*)blank_1px_xpm, DVDTitleMenu,MSGTR_GUI__none_,evNone );
gtk_widget_set_sensitive( MenuItem,FALSE );
}
DVDChapterMenu=AddSubMenu( window1, (const char*)chapter_xpm, DVDSubMenu,MSGTR_GUI_Chapters );
@@ -565,39 +565,39 @@ GtkWidget * CreatePopUpMenu( int wType )
for ( i=1;i <= guiInfo.Chapters;i++ )
{
snprintf( tmp,32,MSGTR_GUI_ChapterNN,i );
- AddMenuCheckItem( window1, (const char*)empty1px_xpm, DVDChapterMenu,tmp,guiInfo.Chapter == i,
+ AddMenuCheckItem( window1, (const char*)blank_1px_xpm, DVDChapterMenu,tmp,guiInfo.Chapter == i,
( i << 16 ) + ivSetDVDChapter );
}
}
else
{
- MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, DVDChapterMenu,MSGTR_GUI__none_,evNone );
+ MenuItem=AddMenuItem( window1, (const char*)blank_1px_xpm, DVDChapterMenu,MSGTR_GUI__none_,evNone );
gtk_widget_set_sensitive( MenuItem,FALSE );
}
#endif
#if defined(CONFIG_LIBCDIO) || defined(CONFIG_DVDREAD)
- AddMenuItem( window1, (const char*)playimage_xpm, SubMenu,MSGTR_GUI_Image"... ", evPlayImage );
+ AddMenuItem( window1, (const char*)image_xpm, SubMenu,MSGTR_GUI_Image"... ", evPlayImage );
#endif
AddMenuItem( window1, (const char*)url_xpm, SubMenu,MSGTR_GUI_URL"...", evLoadURL );
#ifdef CONFIG_TV
AddMenuItem( window1, (const char*)tv_xpm, SubMenu,MSGTR_GUI_TV, evPlayTV );
#endif
AddSeparator( SubMenu );
- AddMenuItem( window1, (const char*)loadeaf_xpm, SubMenu,MSGTR_GUI_AudioTrack"...", evLoadAudioFile );
- AddMenuItem( window1, (const char*)sub_xpm, SubMenu,MSGTR_GUI_Subtitle"... ", evLoadSubtitle );
+ AddMenuItem( window1, (const char*)audio_track_load_xpm, SubMenu,MSGTR_GUI_AudioTrack"...", evLoadAudioFile );
+ AddMenuItem( window1, (const char*)subtitle_load_xpm, SubMenu,MSGTR_GUI_Subtitle"... ", evLoadSubtitle );
SubMenu=AddSubMenu(window1, (const char*)play_xpm, Menu,MSGTR_GUI_Playback );
D = AddMenuItem( window1, (const char*)play_xpm, SubMenu,MSGTR_GUI_Play" ", evPlay );
- F = AddMenuItem( window1, (const char*)pause_xpm, SubMenu,MSGTR_GUI_Pause, evPause );
- H = AddMenuItem( window1, (const char*)stop_xpm, SubMenu,MSGTR_GUI_Stop, evStop );
- N = AddMenuItem( window1, (const char*)next_xpm, SubMenu,MSGTR_GUI_Next, evNext );
- I = AddMenuItem( window1, (const char*)prev_xpm, SubMenu,MSGTR_GUI_Previous, evPrev );
+ F = AddMenuItem( window1, (const char*)play_pause_xpm, SubMenu,MSGTR_GUI_Pause, evPause );
+ H = AddMenuItem( window1, (const char*)play_stop_xpm, SubMenu,MSGTR_GUI_Stop, evStop );
+ N = AddMenuItem( window1, (const char*)play_next_xpm, SubMenu,MSGTR_GUI_Next, evNext );
+ I = AddMenuItem( window1, (const char*)play_previous_xpm, SubMenu,MSGTR_GUI_Previous, evPrev );
AddSeparator( SubMenu );
- I2 = AddMenuItem( window1, (const char*)empty_xpm, SubMenu,MSGTR_GUI_SeekForward10sec, evForward10sec );
- I3 = AddMenuItem( window1, (const char*)empty_xpm, SubMenu,MSGTR_GUI_SeekForward1min, evForward1min );
- I4 = AddMenuItem( window1, (const char*)empty_xpm, SubMenu,MSGTR_GUI_SeekForward10min, evForward10min );
- I5 = AddMenuItem( window1, (const char*)empty_xpm, SubMenu,MSGTR_GUI_SeekBackward10sec, evBackward10sec );
- I6 = AddMenuItem( window1, (const char*)empty_xpm, SubMenu,MSGTR_GUI_SeekBackward1min, evBackward1min );
- I7 = AddMenuItem( window1, (const char*)empty_xpm, SubMenu,MSGTR_GUI_SeekBackward10min, evBackward10min );
+ I2 = AddMenuItem( window1, (const char*)blank_xpm, SubMenu,MSGTR_GUI_SeekForward10sec, evForward10sec );
+ I3 = AddMenuItem( window1, (const char*)blank_xpm, SubMenu,MSGTR_GUI_SeekForward1min, evForward1min );
+ I4 = AddMenuItem( window1, (const char*)blank_xpm, SubMenu,MSGTR_GUI_SeekForward10min, evForward10min );
+ I5 = AddMenuItem( window1, (const char*)blank_xpm, SubMenu,MSGTR_GUI_SeekBackward10sec, evBackward10sec );
+ I6 = AddMenuItem( window1, (const char*)blank_xpm, SubMenu,MSGTR_GUI_SeekBackward1min, evBackward1min );
+ I7 = AddMenuItem( window1, (const char*)blank_xpm, SubMenu,MSGTR_GUI_SeekBackward10min, evBackward10min );
if ( !guiInfo.Playing )
{
@@ -664,10 +664,10 @@ GtkWidget * CreatePopUpMenu( int wType )
AddSeparator( Menu );
AspectMenu=AddSubMenu( window1, (const char*)aspect_xpm, Menu,MSGTR_GUI_AspectRatio );
- H=AddMenuCheckItem( window1, (const char*)aspect11_xpm, AspectMenu,tmp, a11, evSetAspect + ( 1 << 16 ) );
- D=AddMenuCheckItem( window1, (const char*)aspect43_xpm, AspectMenu,"4:3", a43, evSetAspect + ( 3 << 16 ) );
- N=AddMenuCheckItem( window1, (const char*)aspect169_xpm, AspectMenu,"16:9", a169, evSetAspect + ( 2 << 16 ) );
- F=AddMenuCheckItem( window1, (const char*)aspect235_xpm, AspectMenu,MSGTR_GUI_235To1, a235, evSetAspect + ( 4 << 16 ) );
+ H=AddMenuCheckItem( window1, (const char*)aspect_original_xpm, AspectMenu,tmp, a11, evSetAspect + ( 1 << 16 ) );
+ D=AddMenuCheckItem( window1, (const char*)aspect_4_3_xpm, AspectMenu,"4:3", a43, evSetAspect + ( 3 << 16 ) );
+ N=AddMenuCheckItem( window1, (const char*)aspect_16_9_xpm, AspectMenu,"16:9", a169, evSetAspect + ( 2 << 16 ) );
+ F=AddMenuCheckItem( window1, (const char*)aspect_2_35_1_xpm, AspectMenu,MSGTR_GUI_235To1, a235, evSetAspect + ( 4 << 16 ) );
if ( !guiInfo.Playing )
{
@@ -681,10 +681,10 @@ GtkWidget * CreatePopUpMenu( int wType )
if ( guiInfo.VideoWindow )
{
RotationMenu=AddSubMenu( window1, (const char*)rotate_xpm, Menu,MSGTR_GUI_Rotation );
- N=AddMenuCheckItem( window1, (const char*)rotate0_xpm, RotationMenu,MSGTR_GUI__none_, guiInfo.Rotation == -1, evSetRotation );
- D=AddMenuCheckItem( window1, (const char*)rotate90cw_xpm, RotationMenu,MSGTR_GUI_Rotation90CW, guiInfo.Rotation == 1, evSetRotation + ( 90 << 16 ) );
- F=AddMenuCheckItem( window1, (const char*)rotate90ccw_xpm, RotationMenu,MSGTR_GUI_Rotation90CCW, guiInfo.Rotation == 2, evSetRotation + ( -90 << 16 ) );
- H=AddMenuCheckItem( window1, (const char*)rotate180_xpm, RotationMenu,MSGTR_GUI_Rotation180, guiInfo.Rotation == 8, evSetRotation + ( 180 << 16 ) );
+ N=AddMenuCheckItem( window1, (const char*)rotate_0_xpm, RotationMenu,MSGTR_GUI__none_, guiInfo.Rotation == -1, evSetRotation );
+ D=AddMenuCheckItem( window1, (const char*)rotate_90cw_xpm, RotationMenu,MSGTR_GUI_Rotation90CW, guiInfo.Rotation == 1, evSetRotation + ( 90 << 16 ) );
+ F=AddMenuCheckItem( window1, (const char*)rotate_90ccw_xpm, RotationMenu,MSGTR_GUI_Rotation90CCW, guiInfo.Rotation == 2, evSetRotation + ( -90 << 16 ) );
+ H=AddMenuCheckItem( window1, (const char*)rotate_180_xpm, RotationMenu,MSGTR_GUI_Rotation180, guiInfo.Rotation == 8, evSetRotation + ( 180 << 16 ) );
if ( !guiInfo.Playing )
{
@@ -707,10 +707,10 @@ GtkWidget * CreatePopUpMenu( int wType )
( guiApp.videoWindow.Height == guiInfo.VideoHeight / 2 ) ) b_half=True;
else b1=( guiApp.videoWindow.Width == guiInfo.VideoWidth && guiApp.videoWindow.Height == guiInfo.VideoHeight );
} else b1=!guiApp.videoWindow.isFullScreen;
- F=AddMenuCheckItem( window1, (const char*)full_xpm, Menu,MSGTR_GUI_SizeFullscreen,guiApp.videoWindow.isFullScreen,evFullScreen + ( True << 16 ) );
- D=AddMenuCheckItem( window1, (const char*)double_xpm, Menu,MSGTR_GUI_SizeDouble,b2,evDoubleSize );
- N=AddMenuCheckItem( window1, (const char*)normal_xpm, Menu,MSGTR_GUI_SizeNormal" ",b1,evNormalSize );
- H=AddMenuCheckItem( window1, (const char*)half_xpm, Menu,MSGTR_GUI_SizeHalf,b_half,evHalfSize );
+ F=AddMenuCheckItem( window1, (const char*)size_full_xpm, Menu,MSGTR_GUI_SizeFullscreen,guiApp.videoWindow.isFullScreen,evFullScreen + ( True << 16 ) );
+ D=AddMenuCheckItem( window1, (const char*)size_double_xpm, Menu,MSGTR_GUI_SizeDouble,b2,evDoubleSize );
+ N=AddMenuCheckItem( window1, (const char*)size_normal_xpm, Menu,MSGTR_GUI_SizeNormal" ",b1,evNormalSize );
+ H=AddMenuCheckItem( window1, (const char*)size_half_xpm, Menu,MSGTR_GUI_SizeHalf,b_half,evHalfSize );
if ( !guiInfo.Playing )
{
gtk_widget_set_sensitive( H,FALSE );
@@ -729,7 +729,7 @@ GtkWidget * CreatePopUpMenu( int wType )
if ( c > 1 )
{
- SubMenu=AddSubMenu( window1, (const char*)video_xpm, Menu,MSGTR_GUI_VideoTracks );
+ SubMenu=AddSubMenu( window1, (const char*)video_track_xpm, Menu,MSGTR_GUI_VideoTracks );
for ( i=0;i < MAX_V_STREAMS;i++ )
if ( demuxer->v_streams[i] )
{
@@ -737,15 +737,15 @@ GtkWidget * CreatePopUpMenu( int wType )
char tmp[32];
int selected_id = (video_id == vid || (video_id == -1 && vid == demuxer_default_video_track(demuxer)));
snprintf( tmp,32,MSGTR_GUI_TrackN,vid );
- AddMenuCheckItem( window1, (const char*)empty1px_xpm, SubMenu,tmp,selected_id,( vid << 16 ) + ivSetVideo );
+ AddMenuCheckItem( window1, (const char*)blank_1px_xpm, SubMenu,tmp,selected_id,( vid << 16 ) + ivSetVideo );
}
}
}
AddSeparator( Menu );
- VolumeMenu = AddSubMenu( window1, (const char *) empty_xpm, Menu, MSGTR_Volume );
- H = AddMenuItem( window1, (const char *) empty_xpm, VolumeMenu, MSGTR_GUI_Increase, evIncVolume );
- D = AddMenuItem( window1, (const char *) empty_xpm, VolumeMenu, MSGTR_GUI_Decrease, evDecVolume );
+ VolumeMenu = AddSubMenu( window1, (const char *) blank_xpm, Menu, MSGTR_Volume );
+ H = AddMenuItem( window1, (const char *) blank_xpm, VolumeMenu, MSGTR_GUI_Increase, evIncVolume );
+ D = AddMenuItem( window1, (const char *) blank_xpm, VolumeMenu, MSGTR_GUI_Decrease, evDecVolume );
if ( !guiInfo.AudioChannels )
{
@@ -753,7 +753,7 @@ GtkWidget * CreatePopUpMenu( int wType )
gtk_widget_set_sensitive( D, FALSE );
}
- MenuItem=AddMenuCheckItem( window1, (const char*)sound_xpm, Menu,MSGTR_GUI_Mute,mixer->muted,evMute );
+ MenuItem=AddMenuCheckItem( window1, (const char*)volume_mute_xpm, Menu,MSGTR_GUI_Mute,mixer->muted,evMute );
if ( !guiInfo.AudioChannels ) gtk_widget_set_sensitive( MenuItem,FALSE );
if ( guiInfo.Playing && demuxer && guiInfo.StreamType != STREAMTYPE_DVD )
@@ -765,7 +765,7 @@ GtkWidget * CreatePopUpMenu( int wType )
if ( c > 1 )
{
- SubMenu=AddSubMenu( window1, (const char*)audio_xpm, Menu,MSGTR_GUI_AudioTracks );
+ SubMenu=AddSubMenu( window1, (const char*)audio_track_xpm, Menu,MSGTR_GUI_AudioTracks );
for ( i=0;i < MAX_A_STREAMS;i++ )
if ( demuxer->a_streams[i] )
{
@@ -774,7 +774,7 @@ GtkWidget * CreatePopUpMenu( int wType )
char lng[32], tmp[64];
if ( demuxer_audio_lang( demuxer, i, lng, sizeof(lng) ) == 0 ) snprintf( tmp,sizeof(tmp),MSGTR_GUI_TrackN" - %s",aid,GetLanguage( lng, GET_LANG_CHR ) );
else snprintf( tmp,sizeof(tmp),MSGTR_GUI_TrackN,aid );
- AddMenuCheckItem( window1, (const char*)empty1px_xpm, SubMenu,tmp,selected_id,( aid << 16 ) + ivSetAudio );
+ AddMenuCheckItem( window1, (const char*)blank_1px_xpm, SubMenu,tmp,selected_id,( aid << 16 ) + ivSetAudio );
}
}
}
@@ -784,7 +784,7 @@ GtkWidget * CreatePopUpMenu( int wType )
{
char tmp[64]; int i;
- DVDAudioLanguageMenu=AddSubMenu( window1, (const char*)audio_xpm, Menu,MSGTR_GUI_AudioTracks );
+ DVDAudioLanguageMenu=AddSubMenu( window1, (const char*)audio_track_xpm, Menu,MSGTR_GUI_AudioTracks );
for ( i=0;i < guiInfo.AudioStreams;i++ )
{
@@ -801,13 +801,13 @@ GtkWidget * CreatePopUpMenu( int wType )
{
char tmp[64]; int i;
- DVDSubtitleLanguageMenu=AddSubMenu( window1, (const char*)subtitle_xpm, Menu,MSGTR_GUI_Subtitles );
- AddMenuCheckItem( window1, (const char*)empty1px_xpm, DVDSubtitleLanguageMenu,MSGTR_GUI__none_, guiInfo.mpcontext->d_sub->id == -2, ( -2 << 16 ) + ivSetDVDSubtitle );
+ DVDSubtitleLanguageMenu=AddSubMenu( window1, (const char*)subtitle_track_xpm, Menu,MSGTR_GUI_Subtitles );
+ AddMenuCheckItem( window1, (const char*)blank_1px_xpm, DVDSubtitleLanguageMenu,MSGTR_GUI__none_, guiInfo.mpcontext->d_sub->id == -2, ( -2 << 16 ) + ivSetDVDSubtitle );
for ( i=0;i < guiInfo.Subtitles;i++ )
{
snprintf(tmp, sizeof(tmp), MSGTR_GUI_TrackN" - %s", i, GetLanguage(&guiInfo.Subtitle[i].language, GET_LANG_INT));
- AddMenuCheckItem( window1, (const char*)empty1px_xpm, DVDSubtitleLanguageMenu,tmp,
+ AddMenuCheckItem( window1, (const char*)blank_1px_xpm, DVDSubtitleLanguageMenu,tmp,
guiInfo.mpcontext->d_sub->id == guiInfo.Subtitle[i].id,
( guiInfo.Subtitle[i].id << 16 ) + ivSetDVDSubtitle );
}
@@ -821,8 +821,8 @@ GtkWidget * CreatePopUpMenu( int wType )
if ( subs && guiInfo.StreamType != STREAMTYPE_DVD )
{
int i, j, subs0 = guiInfo.mpcontext->sub_counts[SUB_SOURCE_SUBS], subs1 = guiInfo.mpcontext->sub_counts[SUB_SOURCE_VOBSUB];
- SubMenu=AddSubMenu( window1, (const char*)subtitle_xpm, Menu, MSGTR_GUI_Subtitles );
- AddMenuCheckItem( window1, (const char*)empty1px_xpm, SubMenu, MSGTR_GUI__none_, sub_pos == -1, (-1 << 16) + ivSetSubtitle );
+ SubMenu=AddSubMenu( window1, (const char*)subtitle_track_xpm, Menu, MSGTR_GUI_Subtitles );
+ AddMenuCheckItem( window1, (const char*)blank_1px_xpm, SubMenu, MSGTR_GUI__none_, sub_pos == -1, (-1 << 16) + ivSetSubtitle );
for ( i=0;i < subs;i++ )
{
int ret = -1;
@@ -866,19 +866,19 @@ GtkWidget * CreatePopUpMenu( int wType )
}
if ( ret == 0 ) snprintf( tmp, sizeof(tmp), MSGTR_GUI_TrackN" - %s", i, GetLanguage( lng, GET_LANG_CHR ) );
else snprintf( tmp, sizeof(tmp), MSGTR_GUI_TrackN, i );
- AddMenuCheckItem( window1,(const char*)empty1px_xpm,SubMenu,tmp,sub_pos == i,( i << 16 ) + ivSetSubtitle );
+ AddMenuCheckItem( window1,(const char*)blank_1px_xpm,SubMenu,tmp,sub_pos == i,( i << 16 ) + ivSetSubtitle );
}
}
- if ( subdata ) AddMenuItem( window1, (const char*)nosub_xpm, Menu,MSGTR_GUI_DropSubtitle,evDropSubtitle );
+ if ( subdata ) AddMenuItem( window1, (const char*)subtitle_drop_xpm, Menu,MSGTR_GUI_DropSubtitle,evDropSubtitle );
AddSeparator( Menu );
AddMenuItem( window1, (const char*)equalizer_xpm, Menu,MSGTR_GUI_Equalizer, evEqualizer );
AddMenuItem( window1, (const char*)skin_xpm, Menu,MSGTR_GUI_SkinBrowser, evSkinBrowser );
- AddMenuItem( window1, (const char*)prefs_xpm, Menu,MSGTR_GUI_Preferences, evPreferences );
+ AddMenuItem( window1, (const char*)preferences_xpm, Menu,MSGTR_GUI_Preferences, evPreferences );
AddSeparator( Menu );
- if ( wType == wMain || wType == wVideo ) AddMenuItem( window1, (const char *) empty_xpm, Menu, MSGTR_GUI_Minimize, (wType << 16) + evIconify );
+ if ( wType == wMain || wType == wVideo ) AddMenuItem( window1, (const char *) blank_xpm, Menu, MSGTR_GUI_Minimize, (wType << 16) + evIconify );
AddMenuItem( window1, (const char*)exit_xpm, Menu,MSGTR_GUI_Quit, evExit );
return Menu;
Copied and modified: trunk/gui/dialog/pixmaps/aspect_16_9.xpm (from r38051, trunk/gui/dialog/pixmaps/aspect169.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/aspect169.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/aspect_16_9.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char *const aspect169_xpm[] = {
+static const char *const aspect_16_9_xpm[] = {
"19 16 4 1 0 0",
" c #000000",
"! c #FFFFFF",
Copied and modified: trunk/gui/dialog/pixmaps/aspect_2_35_1.xpm (from r38051, trunk/gui/dialog/pixmaps/aspect235.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/aspect235.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/aspect_2_35_1.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char *const aspect235_xpm[] = {
+static const char *const aspect_2_35_1_xpm[] = {
"19 16 5 1 0 0",
" c #000000",
"! c #FFFFFF",
Copied and modified: trunk/gui/dialog/pixmaps/aspect_4_3.xpm (from r38051, trunk/gui/dialog/pixmaps/aspect43.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/aspect43.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/aspect_4_3.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char *const aspect43_xpm[] = {
+static const char *const aspect_4_3_xpm[] = {
"19 16 4 1 0 0",
" c #000000",
"! c #FFFFFF",
Copied and modified: trunk/gui/dialog/pixmaps/aspect_original.xpm (from r38051, trunk/gui/dialog/pixmaps/aspect11.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/aspect11.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/aspect_original.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char *const aspect11_xpm[] = {
+static const char *const aspect_original_xpm[] = {
"19 16 3 1 0 0",
" c #000000",
"! c #FFFFFF",
Copied and modified: trunk/gui/dialog/pixmaps/audio_dolby.xpm (from r38051, trunk/gui/dialog/pixmaps/dolby.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/dolby.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/audio_dolby.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const dolby_xpm[] = {
+static const char * const audio_dolby_xpm[] = {
"16 11 9 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/dialog/pixmaps/audio_track.xpm (from r38051, trunk/gui/dialog/pixmaps/audio.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/audio.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/audio_track.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char *const audio_xpm[] = {
+static const char *const audio_track_xpm[] = {
"16 16 163 2 0 0",
" c #5C5958",
"! c #72706F",
Copied and modified: trunk/gui/dialog/pixmaps/audio_track_load.xpm (from r38051, trunk/gui/dialog/pixmaps/loadeaf.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/loadeaf.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/audio_track_load.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const loadeaf_xpm[] = {
+static const char * const audio_track_load_xpm[] = {
"16 16 132 2",
" c None",
". c #5C5C5C",
Copied and modified: trunk/gui/dialog/pixmaps/blank.xpm (from r38051, trunk/gui/dialog/pixmaps/empty.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/empty.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/blank.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const empty_xpm[] = {
+static const char * const blank_xpm[] = {
"16 16 1 1",
" c None",
" ",
Copied and modified: trunk/gui/dialog/pixmaps/blank_1px.xpm (from r38051, trunk/gui/dialog/pixmaps/empty1px.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/empty1px.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/blank_1px.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const empty1px_xpm[] = {
+static const char * const blank_1px_xpm[] = {
"1 1 1 1",
" c None",
" "};
Copied and modified: trunk/gui/dialog/pixmaps/cd_play.xpm (from r38051, trunk/gui/dialog/pixmaps/playcd.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/playcd.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/cd_play.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const playcd_xpm[] = {
+static const char * const cd_play_xpm[] = {
"16 16 118 2",
" c None",
". c #CACCD2",
Copied and modified: trunk/gui/dialog/pixmaps/dir_up.xpm (from r38051, trunk/gui/dialog/pixmaps/up.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/up.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/dir_up.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const up_xpm[] = {
+static const char * const dir_up_xpm[] = {
"16 16 93 2",
" c None",
". c #000000",
Copied and modified: trunk/gui/dialog/pixmaps/dvd_play.xpm (from r38051, trunk/gui/dialog/pixmaps/playdvd.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/playdvd.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/dvd_play.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const playdvd_xpm[] = {
+static const char * const dvd_play_xpm[] = {
"16 16 109 2",
" c #000000",
"! c #0A0A0A",
Copied and modified: trunk/gui/dialog/pixmaps/file.xpm (from r38051, trunk/gui/dialog/pixmaps/file2.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/file2.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/file.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const file2_xpm[] = {
+static const char * const file_xpm[] = {
"16 16 8 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/dialog/pixmaps/image.xpm (from r38051, trunk/gui/dialog/pixmaps/playimage.xpm)
==============================================================================
Binary file (source and/or target). No diff available.
Copied and modified: trunk/gui/dialog/pixmaps/play_next.xpm (from r38051, trunk/gui/dialog/pixmaps/next.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/next.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/play_next.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const next_xpm[] = {
+static const char * const play_next_xpm[] = {
"16 16 60 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/dialog/pixmaps/play_pause.xpm (from r38051, trunk/gui/dialog/pixmaps/pause.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/pause.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/play_pause.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const pause_xpm[] = {
+static const char * const play_pause_xpm[] = {
"16 16 29 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/dialog/pixmaps/play_previous.xpm (from r38051, trunk/gui/dialog/pixmaps/prev.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/prev.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/play_previous.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const prev_xpm[] = {
+static const char * const play_previous_xpm[] = {
"16 16 58 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/dialog/pixmaps/play_stop.xpm (from r38051, trunk/gui/dialog/pixmaps/stop.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/stop.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/play_stop.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const stop_xpm[] = {
+static const char * const play_stop_xpm[] = {
"16 16 29 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/dialog/pixmaps/preferences.xpm (from r38051, trunk/gui/dialog/pixmaps/prefs.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/prefs.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/preferences.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const prefs_xpm[] = {
+static const char * const preferences_xpm[] = {
"16 16 50 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/dialog/pixmaps/rotate_0.xpm (from r38051, trunk/gui/dialog/pixmaps/rotate0.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/rotate0.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/rotate_0.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const rotate0_xpm[] = {
+static const char * const rotate_0_xpm[] = {
"16 16 3 1 0 0",
" c #6E6E70",
"! c #4E4E50",
Copied and modified: trunk/gui/dialog/pixmaps/rotate_180.xpm (from r38051, trunk/gui/dialog/pixmaps/rotate180.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/rotate180.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/rotate_180.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const rotate180_xpm[] = {
+static const char * const rotate_180_xpm[] = {
"16 16 2 1 0 0",
" c #4E4E50",
"! c None",
Copied and modified: trunk/gui/dialog/pixmaps/rotate_90ccw.xpm (from r38051, trunk/gui/dialog/pixmaps/rotate90ccw.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/rotate90ccw.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/rotate_90ccw.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const rotate90ccw_xpm[] = {
+static const char * const rotate_90ccw_xpm[] = {
"16 16 5 1 0 0",
" c #4E4E50",
"! c #4E4E51",
Copied and modified: trunk/gui/dialog/pixmaps/rotate_90cw.xpm (from r38051, trunk/gui/dialog/pixmaps/rotate90cw.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/rotate90cw.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/rotate_90cw.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const rotate90cw_xpm[] = {
+static const char * const rotate_90cw_xpm[] = {
"16 16 5 1 0 0",
" c #4E4E50",
"! c #4E4E51",
Copied and modified: trunk/gui/dialog/pixmaps/size_double.xpm (from r38051, trunk/gui/dialog/pixmaps/double.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/double.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/size_double.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const double_xpm[] = {
+static const char * const size_double_xpm[] = {
"16 16 132 2",
" c None",
". c #000000",
Copied and modified: trunk/gui/dialog/pixmaps/size_full.xpm (from r38051, trunk/gui/dialog/pixmaps/full.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/full.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/size_full.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const full_xpm[] = {
+static const char * const size_full_xpm[] = {
"16 16 90 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/dialog/pixmaps/size_half.xpm (from r38051, trunk/gui/dialog/pixmaps/half.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/half.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/size_half.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const half_xpm[] = {
+static const char * const size_half_xpm[] = {
"16 16 125 2",
" c None",
". c #000000",
Copied and modified: trunk/gui/dialog/pixmaps/size_normal.xpm (from r38051, trunk/gui/dialog/pixmaps/normal.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/normal.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/size_normal.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const normal_xpm[] = {
+static const char * const size_normal_xpm[] = {
"16 16 111 2",
" c None",
". c #000000",
Copied and modified: trunk/gui/dialog/pixmaps/subtitle_drop.xpm (from r38051, trunk/gui/dialog/pixmaps/nosub.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/nosub.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/subtitle_drop.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const nosub_xpm[] = {
+static const char * const subtitle_drop_xpm[] = {
"16 16 3 1",
" c None",
". c #CD0909",
Copied and modified: trunk/gui/dialog/pixmaps/subtitle_load.xpm (from r38051, trunk/gui/dialog/pixmaps/sub.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/sub.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/subtitle_load.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const sub_xpm[] = {
+static const char * const subtitle_load_xpm[] = {
"16 16 2 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/dialog/pixmaps/subtitle_track.xpm (from r38051, trunk/gui/dialog/pixmaps/subtitle.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/subtitle.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/subtitle_track.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char *const subtitle_xpm[] = {
+static const char *const subtitle_track_xpm[] = {
"16 16 3 1 0 0",
" c #000000",
"! c #FFFFFF",
Copied and modified: trunk/gui/dialog/pixmaps/vcd_play.xpm (from r38051, trunk/gui/dialog/pixmaps/playvcd.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/playvcd.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/vcd_play.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const playvcd_xpm[] = {
+static const char * const vcd_play_xpm[] = {
"16 16 182 2",
" c None",
". c #CC9665",
Copied and modified: trunk/gui/dialog/pixmaps/video_track.xpm (from r38051, trunk/gui/dialog/pixmaps/video.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/video.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/video_track.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char *const video_xpm[] = {
+static const char *const video_track_xpm[] = {
"16 16 101 2 0 0",
" c #535355",
"! c #6D6D6E",
Copied and modified: trunk/gui/dialog/pixmaps/volume_mute.xpm (from r38051, trunk/gui/dialog/pixmaps/sound.xpm)
==============================================================================
--- trunk/gui/dialog/pixmaps/sound.xpm Thu Apr 5 03:10:18 2018 (r38051, copy source)
+++ trunk/gui/dialog/pixmaps/volume_mute.xpm Thu Apr 5 16:26:10 2018 (r38052)
@@ -1,5 +1,5 @@
/* XPM */
-static const char *const sound_xpm[] = {
+static const char *const volume_mute_xpm[] = {
"16 16 188 2 0 0",
" c #8C8B8B",
"! c #888787",
More information about the MPlayer-cvslog
mailing list