[MPlayer-cvslog] r33658 - in trunk/gui/ui: gtk/about.c gtk/gtk_menu.c pixmaps/a11.xpm pixmaps/a169.xpm pixmaps/a235.xpm pixmaps/a43.xpm pixmaps/ab.xpm pixmaps/about.xpm pixmaps/aspect11.xpm pixmaps/aspect169.xpm pi...
ib
subversion at mplayerhq.hu
Sun Jun 19 15:01:21 CEST 2011
Author: ib
Date: Sun Jun 19 15:01:20 2011
New Revision: 33658
Log:
Rename some pixmaps.
List of changes:
a11 -> aspect11
a169 -> aspect169
a235 -> aspect235
a43 -> aspect43
about -> emblem
ab -> about
delsub -> nosub
eq -> equalizer
fs -> full
pl -> playlist
stop2 -> stop
tongue -> audiolang
tonguebla -> sublang
Added:
trunk/gui/ui/pixmaps/aspect11.xpm
- copied, changed from r33651, trunk/gui/ui/pixmaps/a11.xpm
trunk/gui/ui/pixmaps/aspect169.xpm
- copied, changed from r33651, trunk/gui/ui/pixmaps/a169.xpm
trunk/gui/ui/pixmaps/aspect235.xpm
- copied, changed from r33651, trunk/gui/ui/pixmaps/a235.xpm
trunk/gui/ui/pixmaps/aspect43.xpm
- copied, changed from r33651, trunk/gui/ui/pixmaps/a43.xpm
trunk/gui/ui/pixmaps/audiolang.xpm
- copied, changed from r33651, trunk/gui/ui/pixmaps/tongue.xpm
trunk/gui/ui/pixmaps/emblem.xpm
- copied, changed from r33651, trunk/gui/ui/pixmaps/about.xpm
trunk/gui/ui/pixmaps/equalizer.xpm
- copied, changed from r33651, trunk/gui/ui/pixmaps/eq.xpm
trunk/gui/ui/pixmaps/full.xpm
- copied, changed from r33651, trunk/gui/ui/pixmaps/fs.xpm
trunk/gui/ui/pixmaps/nosub.xpm
- copied, changed from r33651, trunk/gui/ui/pixmaps/delsub.xpm
trunk/gui/ui/pixmaps/playlist.xpm
- copied, changed from r33651, trunk/gui/ui/pixmaps/pl.xpm
trunk/gui/ui/pixmaps/stop.xpm
- copied, changed from r33651, trunk/gui/ui/pixmaps/stop2.xpm
trunk/gui/ui/pixmaps/sublang.xpm
- copied, changed from r33651, trunk/gui/ui/pixmaps/tonguebla.xpm
Replaced:
trunk/gui/ui/pixmaps/about.xpm
- copied, changed from r33651, trunk/gui/ui/pixmaps/ab.xpm
Deleted:
trunk/gui/ui/pixmaps/a11.xpm
trunk/gui/ui/pixmaps/a169.xpm
trunk/gui/ui/pixmaps/a235.xpm
trunk/gui/ui/pixmaps/a43.xpm
trunk/gui/ui/pixmaps/ab.xpm
trunk/gui/ui/pixmaps/delsub.xpm
trunk/gui/ui/pixmaps/eq.xpm
trunk/gui/ui/pixmaps/fs.xpm
trunk/gui/ui/pixmaps/pl.xpm
trunk/gui/ui/pixmaps/stop2.xpm
trunk/gui/ui/pixmaps/tongue.xpm
trunk/gui/ui/pixmaps/tonguebla.xpm
Modified:
trunk/gui/ui/gtk/about.c
trunk/gui/ui/gtk/gtk_menu.c
Modified: trunk/gui/ui/gtk/about.c
==============================================================================
--- trunk/gui/ui/gtk/about.c Sun Jun 19 14:51:36 2011 (r33657)
+++ trunk/gui/ui/gtk/about.c Sun Jun 19 15:01:20 2011 (r33658)
@@ -20,7 +20,7 @@
#include "gui/app.h"
#include "help_mp.h"
-#include "gui/ui/pixmaps/about.xpm"
+#include "gui/ui/pixmaps/emblem.xpm"
#include "gui/ui/widgets.h"
#include "about.h"
#include "gtk_common.h"
@@ -73,7 +73,7 @@ GtkWidget * create_About( void )
vbox=AddVBox( AddDialogFrame( About ),0 );
pixmapstyle=gtk_widget_get_style( About );
- pixmapwid=gdk_pixmap_colormap_create_from_xpm_d( About->window,gdk_colormap_get_system(),&mask,&pixmapstyle->bg[GTK_STATE_NORMAL],(gchar **) about_xpm );
+ pixmapwid=gdk_pixmap_colormap_create_from_xpm_d( About->window,gdk_colormap_get_system(),&mask,&pixmapstyle->bg[GTK_STATE_NORMAL],(gchar **) emblem_xpm );
pixmap1=gtk_pixmap_new( pixmapwid,mask );
gtk_widget_set_name( pixmap1,"pixmap1" );
Modified: trunk/gui/ui/gtk/gtk_menu.c
==============================================================================
--- trunk/gui/ui/gtk/gtk_menu.c Sun Jun 19 14:51:36 2011 (r33657)
+++ trunk/gui/ui/gtk/gtk_menu.c Sun Jun 19 15:01:20 2011 (r33658)
@@ -36,32 +36,32 @@
#include "libmpdemux/stheader.h"
#include "libavutil/avstring.h"
-#include "gui/ui/pixmaps/ab.xpm"
+#include "gui/ui/pixmaps/about.xpm"
#include "gui/ui/pixmaps/half.xpm"
#include "gui/ui/pixmaps/normal.xpm"
#include "gui/ui/pixmaps/double.xpm"
-#include "gui/ui/pixmaps/fs.xpm"
+#include "gui/ui/pixmaps/full.xpm"
#include "gui/ui/pixmaps/exit.xpm"
#include "gui/ui/pixmaps/prefs.xpm"
-#include "gui/ui/pixmaps/eq.xpm"
-#include "gui/ui/pixmaps/pl.xpm"
+#include "gui/ui/pixmaps/equalizer.xpm"
+#include "gui/ui/pixmaps/playlist.xpm"
#include "gui/ui/pixmaps/skin.xpm"
#include "gui/ui/pixmaps/sound.xpm"
#include "gui/ui/pixmaps/open.xpm"
#include "gui/ui/pixmaps/play.xpm"
-#include "gui/ui/pixmaps/stop2.xpm"
+#include "gui/ui/pixmaps/stop.xpm"
#include "gui/ui/pixmaps/pause.xpm"
#include "gui/ui/pixmaps/prev.xpm"
#include "gui/ui/pixmaps/next.xpm"
#include "gui/ui/pixmaps/aspect.xpm"
-#include "gui/ui/pixmaps/a11.xpm"
-#include "gui/ui/pixmaps/a169.xpm"
-#include "gui/ui/pixmaps/a235.xpm"
-#include "gui/ui/pixmaps/a43.xpm"
+#include "gui/ui/pixmaps/aspect11.xpm"
+#include "gui/ui/pixmaps/aspect169.xpm"
+#include "gui/ui/pixmaps/aspect235.xpm"
+#include "gui/ui/pixmaps/aspect43.xpm"
#include "gui/ui/pixmaps/file2.xpm"
#include "gui/ui/pixmaps/url.xpm"
#include "gui/ui/pixmaps/sub.xpm"
-#include "gui/ui/pixmaps/delsub.xpm"
+#include "gui/ui/pixmaps/nosub.xpm"
#include "gui/ui/pixmaps/empty.xpm"
#include "gui/ui/pixmaps/loadeaf.xpm"
#include "gui/ui/pixmaps/title.xpm"
@@ -70,8 +70,8 @@
#include "gui/ui/pixmaps/playdvd.xpm"
#include "gui/ui/pixmaps/chapter.xpm"
#include "gui/ui/pixmaps/dolby.xpm"
-#include "gui/ui/pixmaps/tongue.xpm"
-#include "gui/ui/pixmaps/tonguebla.xpm"
+#include "gui/ui/pixmaps/audiolang.xpm"
+#include "gui/ui/pixmaps/sublang.xpm"
#include "gui/ui/pixmaps/empty1px.xpm"
#endif
#ifdef CONFIG_VCD
@@ -419,7 +419,7 @@ GtkWidget * create_PopUpMenu( void )
window1 = gtk_widget_get_toplevel(Menu);
- AddMenuItem( window1, (const char*)ab_xpm, Menu,MSGTR_MENU_AboutMPlayer" ", evAbout );
+ AddMenuItem( window1, (const char*)about_xpm, Menu,MSGTR_MENU_AboutMPlayer" ", evAbout );
AddSeparator( Menu );
SubMenu=AddSubMenu( window1, (const char*)open_xpm, Menu,MSGTR_MENU_Open );
AddMenuItem( window1, (const char*)file2_xpm, SubMenu,MSGTR_MENU_PlayFile" ", evLoadPlay );
@@ -431,12 +431,12 @@ GtkWidget * create_PopUpMenu( void )
#endif
AddMenuItem( window1, (const char*)url_xpm, SubMenu,MSGTR_MENU_PlayURL, evSetURL );
AddMenuItem( window1, (const char*)sub_xpm, SubMenu,MSGTR_MENU_LoadSubtitle" ", evLoadSubtitle );
- AddMenuItem( window1, (const char*)delsub_xpm, SubMenu,MSGTR_MENU_DropSubtitle,evDropSubtitle );
+ AddMenuItem( window1, (const char*)nosub_xpm, SubMenu,MSGTR_MENU_DropSubtitle,evDropSubtitle );
AddMenuItem( window1, (const char*)loadeaf_xpm, SubMenu,MSGTR_MENU_LoadExternAudioFile, evLoadAudioFile );
SubMenu=AddSubMenu(window1, (const char*)play_xpm, Menu,MSGTR_MENU_Playing );
AddMenuItem( window1, (const char*)play_xpm, SubMenu,MSGTR_MENU_Play" ", evPlay );
AddMenuItem( window1, (const char*)pause_xpm, SubMenu,MSGTR_MENU_Pause, evPause );
- AddMenuItem( window1, (const char*)stop2_xpm, SubMenu,MSGTR_MENU_Stop, evStop );
+ AddMenuItem( window1, (const char*)stop_xpm, SubMenu,MSGTR_MENU_Stop, evStop );
AddMenuItem( window1, (const char*)next_xpm, SubMenu,MSGTR_MENU_NextStream, evNext );
AddMenuItem( window1, (const char*)prev_xpm, SubMenu,MSGTR_MENU_PrevStream, evPrev );
// AddSeparator( SubMenu );
@@ -507,7 +507,7 @@ GtkWidget * create_PopUpMenu( void )
MenuItem=AddMenuItem( window1, (const char*)empty_xpm, DVDChapterMenu,MSGTR_MENU_None,evNone );
gtk_widget_set_sensitive( MenuItem,FALSE );
}
- DVDAudioLanguageMenu=AddSubMenu( window1, (const char*)tongue_xpm, DVDSubMenu,MSGTR_MENU_AudioLanguages );
+ DVDAudioLanguageMenu=AddSubMenu( window1, (const char*)audiolang_xpm, DVDSubMenu,MSGTR_MENU_AudioLanguages );
if ( guiInfo.DVD.nr_of_audio_channels )
{
char tmp[64]; int i, id = guiInfo.demuxer ? ((demuxer_t *)guiInfo.demuxer)->audio->id : audio_id;
@@ -527,7 +527,7 @@ GtkWidget * create_PopUpMenu( void )
MenuItem=AddMenuItem( window1, (const char*)empty_xpm, DVDAudioLanguageMenu,MSGTR_MENU_None,evNone );
gtk_widget_set_sensitive( MenuItem,FALSE );
}
- DVDSubtitleLanguageMenu=AddSubMenu( window1, (const char*)tonguebla_xpm, DVDSubMenu,MSGTR_MENU_SubtitleLanguages );
+ DVDSubtitleLanguageMenu=AddSubMenu( window1, (const char*)sublang_xpm, DVDSubMenu,MSGTR_MENU_SubtitleLanguages );
if ( guiInfo.DVD.nr_of_subtitles )
{
char tmp[64]; int i;
@@ -550,10 +550,10 @@ GtkWidget * create_PopUpMenu( void )
// if ( guiInfo.Playing )
{
AspectMenu=AddSubMenu( window1, (const char*)aspect_xpm, Menu,MSGTR_MENU_AspectRatio );
- AddMenuItem( window1, (const char*)a11_xpm, AspectMenu,MSGTR_MENU_Original,( 1 << 16 ) + evSetAspect );
- AddMenuItem( window1, (const char*)a169_xpm, AspectMenu,"16:9",( 2 << 16 ) + evSetAspect );
- AddMenuItem( window1, (const char*)a43_xpm, AspectMenu,"4:3",( 3 << 16 ) + evSetAspect );
- AddMenuItem( window1, (const char*)a235_xpm, AspectMenu,"2.35",( 4 << 16 ) + evSetAspect );
+ AddMenuItem( window1, (const char*)aspect11_xpm, AspectMenu,MSGTR_MENU_Original,( 1 << 16 ) + evSetAspect );
+ AddMenuItem( window1, (const char*)aspect169_xpm, AspectMenu,"16:9",( 2 << 16 ) + evSetAspect );
+ AddMenuItem( window1, (const char*)aspect43_xpm, AspectMenu,"4:3",( 3 << 16 ) + evSetAspect );
+ AddMenuItem( window1, (const char*)aspect235_xpm, AspectMenu,"2.35",( 4 << 16 ) + evSetAspect );
}
if ( guiInfo.Playing && guiInfo.demuxer && guiInfo.StreamType != STREAMTYPE_DVD )
@@ -610,10 +610,10 @@ GtkWidget * create_PopUpMenu( void )
AddSeparator( Menu );
MenuItem=AddMenuCheckItem( window1, (const char*)sound_xpm, Menu,MSGTR_MENU_Mute,mixer->muted,evMute );
if ( !guiInfo.AudioType ) gtk_widget_set_sensitive( MenuItem,FALSE );
- AddMenuItem( window1, (const char*)pl_xpm, Menu,MSGTR_MENU_PlayList, evPlayList );
+ AddMenuItem( window1, (const char*)playlist_xpm, Menu,MSGTR_MENU_PlayList, evPlayList );
AddMenuItem( window1, (const char*)skin_xpm, Menu,MSGTR_MENU_SkinBrowser, evSkinBrowser );
AddMenuItem( window1, (const char*)prefs_xpm, Menu,MSGTR_MENU_Preferences, evPreferences );
- AddMenuItem( window1, (const char*)eq_xpm, Menu,MSGTR_Equalizer, evEqualizer );
+ AddMenuItem( window1, (const char*)equalizer_xpm, Menu,MSGTR_Equalizer, evEqualizer );
if ( guiInfo.NoWindow == False )
{
@@ -630,7 +630,7 @@ GtkWidget * create_PopUpMenu( void )
H=AddMenuCheckItem( window1, (const char*)half_xpm, Menu,MSGTR_MENU_HalfSize,b_half,evHalfSize );
N=AddMenuCheckItem( window1, (const char*)normal_xpm, Menu,MSGTR_MENU_NormalSize" ",b1,evNormalSize );
D=AddMenuCheckItem( window1, (const char*)double_xpm, Menu,MSGTR_MENU_DoubleSize,b2,evDoubleSize );
- F=AddMenuCheckItem( window1, (const char*)fs_xpm, Menu,MSGTR_MENU_FullScreen,guiApp.subWindow.isFullScreen,evFullScreen );
+ F=AddMenuCheckItem( window1, (const char*)full_xpm, Menu,MSGTR_MENU_FullScreen,guiApp.subWindow.isFullScreen,evFullScreen );
if ( !gtkShowVideoWindow && !guiInfo.Playing )
{
gtk_widget_set_sensitive( H,FALSE );
Copied and modified: trunk/gui/ui/pixmaps/about.xpm (from r33651, trunk/gui/ui/pixmaps/ab.xpm)
==============================================================================
--- trunk/gui/ui/pixmaps/ab.xpm Sun Jun 19 13:42:24 2011 (r33651, copy source)
+++ trunk/gui/ui/pixmaps/about.xpm Sun Jun 19 15:01:20 2011 (r33658)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const ab_xpm[] = {
+static const char * const about_xpm[] = {
"16 16 15 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/ui/pixmaps/aspect11.xpm (from r33651, trunk/gui/ui/pixmaps/a11.xpm)
==============================================================================
--- trunk/gui/ui/pixmaps/a11.xpm Sun Jun 19 13:42:24 2011 (r33651, copy source)
+++ trunk/gui/ui/pixmaps/aspect11.xpm Sun Jun 19 15:01:20 2011 (r33658)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const a11_xpm[] = {
+static const char * const aspect11_xpm[] = {
"18 16 3 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/ui/pixmaps/aspect169.xpm (from r33651, trunk/gui/ui/pixmaps/a169.xpm)
==============================================================================
--- trunk/gui/ui/pixmaps/a169.xpm Sun Jun 19 13:42:24 2011 (r33651, copy source)
+++ trunk/gui/ui/pixmaps/aspect169.xpm Sun Jun 19 15:01:20 2011 (r33658)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const a169_xpm[] = {
+static const char * const aspect169_xpm[] = {
"18 16 3 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/ui/pixmaps/aspect235.xpm (from r33651, trunk/gui/ui/pixmaps/a235.xpm)
==============================================================================
--- trunk/gui/ui/pixmaps/a235.xpm Sun Jun 19 13:42:24 2011 (r33651, copy source)
+++ trunk/gui/ui/pixmaps/aspect235.xpm Sun Jun 19 15:01:20 2011 (r33658)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const a235_xpm[] = {
+static const char * const aspect235_xpm[] = {
"18 16 3 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/ui/pixmaps/aspect43.xpm (from r33651, trunk/gui/ui/pixmaps/a43.xpm)
==============================================================================
--- trunk/gui/ui/pixmaps/a43.xpm Sun Jun 19 13:42:24 2011 (r33651, copy source)
+++ trunk/gui/ui/pixmaps/aspect43.xpm Sun Jun 19 15:01:20 2011 (r33658)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const a43_xpm[] = {
+static const char * const aspect43_xpm[] = {
"18 16 3 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/ui/pixmaps/audiolang.xpm (from r33651, trunk/gui/ui/pixmaps/tongue.xpm)
==============================================================================
--- trunk/gui/ui/pixmaps/tongue.xpm Sun Jun 19 13:42:24 2011 (r33651, copy source)
+++ trunk/gui/ui/pixmaps/audiolang.xpm Sun Jun 19 15:01:20 2011 (r33658)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const tongue_xpm[] = {
+static const char * const audiolang_xpm[] = {
"16 16 150 2",
" c None",
". c #FC151B",
Copied and modified: trunk/gui/ui/pixmaps/emblem.xpm (from r33651, trunk/gui/ui/pixmaps/about.xpm)
==============================================================================
--- trunk/gui/ui/pixmaps/about.xpm Sun Jun 19 13:42:24 2011 (r33651, copy source)
+++ trunk/gui/ui/pixmaps/emblem.xpm Sun Jun 19 15:01:20 2011 (r33658)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const about_xpm[] = {
+static const char * const emblem_xpm[] = {
"320 170 254 2",
" c None",
". c #070707",
Copied and modified: trunk/gui/ui/pixmaps/equalizer.xpm (from r33651, trunk/gui/ui/pixmaps/eq.xpm)
==============================================================================
--- trunk/gui/ui/pixmaps/eq.xpm Sun Jun 19 13:42:24 2011 (r33651, copy source)
+++ trunk/gui/ui/pixmaps/equalizer.xpm Sun Jun 19 15:01:20 2011 (r33658)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const eq_xpm[] = {
+static const char * const equalizer_xpm[] = {
"16 16 16 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/ui/pixmaps/full.xpm (from r33651, trunk/gui/ui/pixmaps/fs.xpm)
==============================================================================
--- trunk/gui/ui/pixmaps/fs.xpm Sun Jun 19 13:42:24 2011 (r33651, copy source)
+++ trunk/gui/ui/pixmaps/full.xpm Sun Jun 19 15:01:20 2011 (r33658)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const fs_xpm[] = {
+static const char * const full_xpm[] = {
"16 16 90 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/ui/pixmaps/nosub.xpm (from r33651, trunk/gui/ui/pixmaps/delsub.xpm)
==============================================================================
--- trunk/gui/ui/pixmaps/delsub.xpm Sun Jun 19 13:42:24 2011 (r33651, copy source)
+++ trunk/gui/ui/pixmaps/nosub.xpm Sun Jun 19 15:01:20 2011 (r33658)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const delsub_xpm[] = {
+static const char * const nosub_xpm[] = {
"16 16 3 1",
" c None",
". c #CD0909",
Copied and modified: trunk/gui/ui/pixmaps/playlist.xpm (from r33651, trunk/gui/ui/pixmaps/pl.xpm)
==============================================================================
--- trunk/gui/ui/pixmaps/pl.xpm Sun Jun 19 13:42:24 2011 (r33651, copy source)
+++ trunk/gui/ui/pixmaps/playlist.xpm Sun Jun 19 15:01:20 2011 (r33658)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const pl_xpm[] = {
+static const char * const playlist_xpm[] = {
"16 16 7 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/ui/pixmaps/stop.xpm (from r33651, trunk/gui/ui/pixmaps/stop2.xpm)
==============================================================================
--- trunk/gui/ui/pixmaps/stop2.xpm Sun Jun 19 13:42:24 2011 (r33651, copy source)
+++ trunk/gui/ui/pixmaps/stop.xpm Sun Jun 19 15:01:20 2011 (r33658)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const stop2_xpm[] = {
+static const char * const stop_xpm[] = {
"16 16 29 1",
" c None",
". c #000000",
Copied and modified: trunk/gui/ui/pixmaps/sublang.xpm (from r33651, trunk/gui/ui/pixmaps/tonguebla.xpm)
==============================================================================
--- trunk/gui/ui/pixmaps/tonguebla.xpm Sun Jun 19 13:42:24 2011 (r33651, copy source)
+++ trunk/gui/ui/pixmaps/sublang.xpm Sun Jun 19 15:01:20 2011 (r33658)
@@ -1,5 +1,5 @@
/* XPM */
-static const char * const tonguebla_xpm[] = {
+static const char * const sublang_xpm[] = {
"16 16 137 2",
" c None",
". c #FC151B",
More information about the MPlayer-cvslog
mailing list