January 2014 - MPlayer-cvslog - lists.mplayerhq.hu

r35961 - in trunk: Changelog input/input.c libvo/x11_common.c osdep/getch2.c osdep/keycodes.h
by reimar 13 Feb '14

13 Feb '14

Author: reimar Date: Thu Mar 14 20:59:35 2013 New Revision: 35961 Log: Add support for binding any key in UTF-8 range. X11 part is a bit hackish since we need to use setlocale to get desired behaviour for XLookupString. Modified: trunk/Changelog trunk/input/input.c trunk/libvo/x11_common.c trunk/osdep/getch2.c trunk/osdep/keycodes.h Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/Changelog Thu Mar 14 20:59:35 2013 (r35961) @@ -13,6 +13,7 @@ MPlayer better than -vo gl (it is in many ways worse). * Fixes for DVB, teletext and closed-caption based subtitles. * Support teletext and CC subtitles in WTV. + * Support binding keys corresponding to non-ASCII characters. 1.1: "We gave up on 1.0" Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/input/input.c Thu Mar 14 20:59:35 2013 (r35961) @@ -38,6 +38,7 @@ #include "osdep/getch2.h" #include "osdep/keycodes.h" #include "osdep/timer.h" +#include "libavutil/common.h" #include "libavutil/avstring.h" #include "mp_msg.h" #include "help_mp.h" @@ -1474,6 +1475,7 @@ mp_input_get_key_name(int key) { int mp_input_get_key_from_name(const char *name) { + uint32_t utf8 = 0; int i,ret = 0,len = strlen(name); if(len == 1) { // Direct key code ret = (unsigned char)name[0]; @@ -1486,6 +1488,10 @@ mp_input_get_key_from_name(const char *n return key_names[i].key; } + GET_UTF8(utf8, (uint8_t)*name++, return -1;) + if (*name == 0 && utf8 < KEY_BASE) + return utf8; + return -1; } Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/libvo/x11_common.c Thu Mar 14 20:59:35 2013 (r35961) @@ -21,6 +21,7 @@ #include <math.h> #include <inttypes.h> #include <limits.h> +#include <locale.h> #include "config.h" #include "mp_msg.h" @@ -427,6 +428,9 @@ int vo_init(void) return 1; // already called } + // Required so that XLookupString returns UTF-8 + if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8")) + mp_msg(MSGT_VO, MSGL_WARN, "Could not find a UTF-8 locale, some keys will no be handled.\n"); XSetErrorHandler(x11_errorhandler); dispName = XDisplayName(mDisplayName); @@ -810,11 +814,22 @@ static int check_resize(void) return rc; } +static int to_utf8(const uint8_t *in) +{ + uint32_t v = 0; + GET_UTF8(v, *in++, goto err;) + if (*in || v >= KEY_BASE) + goto err; + return v; +err: + return 0; +} + int vo_x11_check_events(Display * mydisplay) { int ret = 0; XEvent Event; - char buf[100]; + uint8_t buf[16] = {0}; KeySym keySym; static XComposeStatus stat; static int ctrl_state; @@ -852,7 +867,7 @@ int vo_x11_check_events(Display * mydisp case KeyPress: case KeyRelease: { - int key; + int key, utf8; #ifdef CONFIG_GUI if ( use_gui ) { break; } @@ -863,6 +878,8 @@ int vo_x11_check_events(Display * mydisp key = ((keySym & 0xff00) != 0 ? ((keySym & 0x00ff) + 256) : (keySym)); + utf8 = to_utf8(buf); + if (utf8) key = 0; if (key == wsLeftCtrl || key == wsRightCtrl) { ctrl_state = Event.type == KeyPress; mplayer_put_key(KEY_CTRL | @@ -880,7 +897,8 @@ int vo_x11_check_events(Display * mydisp (ctrl_state ? MP_KEY_DOWN : 0)); } if (!vo_x11_putkey_ext(keySym)) { - vo_x11_putkey(key); + if (utf8) mplayer_put_key(utf8); + else vo_x11_putkey(key); } ret |= VO_EVENT_KEYPRESS; } Modified: trunk/osdep/getch2.c ============================================================================== --- trunk/osdep/getch2.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/osdep/getch2.c Thu Mar 14 20:59:35 2013 (r35961) @@ -60,6 +60,7 @@ #include "mp_fifo.h" #include "keycodes.h" #include "getch2.h" +#include "libavutil/common.h" #ifdef HAVE_TERMIOS static struct termios tio_orig; @@ -201,6 +202,14 @@ void getch2(void) len = 2; } code = KEY_ENTER; + } else if (code >= 0xc0) { + uint32_t utf8 = 0; + i = 0; + GET_UTF8(utf8, (i < getch2_len ? getch2_buf[i++] : 0), goto not_utf8;) + if (utf8 < KEY_BASE) { + code = utf8; + len = i; + } } } else if (getch2_len > 1) { @@ -262,6 +271,7 @@ void getch2(void) } } } + not_utf8: found: getch2_len -= len; for (i = 0; i < getch2_len; i++) Modified: trunk/osdep/keycodes.h ============================================================================== --- trunk/osdep/keycodes.h Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/osdep/keycodes.h Thu Mar 14 20:59:35 2013 (r35961) @@ -23,7 +23,7 @@ #ifndef MPLAYER_KEYCODES_H #define MPLAYER_KEYCODES_H -#define KEY_BASE 0x100 +#define KEY_BASE 0x1000000 enum { KEY_TAB = 9, @@ -76,7 +76,7 @@ enum { KEY_VOLUME_DOWN, KEY_MUTE, /* Special internal/virtual keys */ - KEY_CLOSE_WIN = 0x1000, + KEY_CLOSE_WIN = KEY_BASE + 0x1000, }; /* Control keys short name */

3 10

r36769 - in trunk: gui/dialog/skinbrowser.c help/help_mp-de.h help/help_mp-en.h
by ib 31 Jan '14

31 Jan '14

Author: ib Date: Fri Jan 31 18:08:39 2014 New Revision: 36769 Log: Prettify the skin browser. Use the same design as with the other similar lists (available audio and video drivers, playlist). Modified: trunk/gui/dialog/skinbrowser.c Changes in other areas also in this revision: Modified: trunk/help/help_mp-de.h trunk/help/help_mp-en.h Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Fri Jan 31 17:37:52 2014 (r36768) +++ trunk/gui/dialog/skinbrowser.c Fri Jan 31 18:08:39 2014 (r36769) @@ -111,8 +111,6 @@ static GtkWidget * CreateSkinBrowser( vo gtkAddIcon( SkinBrowser ); vbox5=gtkAddVBox( gtkAddDialogFrame( SkinBrowser ),0 ); - gtkAddLabel( MSGTR_SKIN_LABEL":",vbox5 ); - gtkAddHSeparator( vbox5 ); scrolledwindow1=gtk_scrolled_window_new( NULL,NULL ); gtk_widget_ref( scrolledwindow1 ); @@ -129,8 +127,9 @@ static GtkWidget * CreateSkinBrowser( vo gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),SkinList ); gtk_clist_set_column_width( GTK_CLIST( SkinList ),0,80 ); gtk_clist_set_selection_mode( GTK_CLIST( SkinList ),GTK_SELECTION_SINGLE ); - gtk_clist_column_titles_hide( GTK_CLIST( SkinList ) ); + gtk_clist_column_titles_show( GTK_CLIST( SkinList ) ); gtk_clist_set_shadow_type( GTK_CLIST( SkinList ),GTK_SHADOW_ETCHED_OUT ); + gtk_clist_set_column_widget( GTK_CLIST( SkinList ),0, gtkAddLabel( MSGTR_SKIN_LABEL,NULL ) ); gtkAddHSeparator( vbox5 );

1 0

r36768 - in trunk: gui/dialog/about.c gui/dialog/equalizer.c gui/dialog/menu.c gui/dialog/preferences.c gui/dialog/skinbrowser.c gui/win32/dialogs.c gui/win32/gui.c gui/win32/preferences.c help/hel...
by ib 31 Jan '14

31 Jan '14

Author: ib Date: Fri Jan 31 17:37:52 2014 New Revision: 36768 Log: Revise GUI help message texts. Remove colons, ellipses and newlines from the end of the texts. This reduces the amount of texts to be translated, enhances reusability and harmonizes the visual appearance of the different GUI localizations. Additionally, make the necessary code changes. Modified: trunk/gui/dialog/about.c trunk/gui/dialog/equalizer.c trunk/gui/dialog/menu.c trunk/gui/dialog/preferences.c trunk/gui/dialog/skinbrowser.c trunk/gui/win32/dialogs.c trunk/gui/win32/gui.c trunk/gui/win32/preferences.c Changes in other areas also in this revision: Modified: trunk/help/help_mp-bg.h trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-dk.h trunk/help/help_mp-el.h trunk/help/help_mp-en.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-ja.h trunk/help/help_mp-ko.h trunk/help/help_mp-mk.h trunk/help/help_mp-nb.h trunk/help/help_mp-nl.h trunk/help/help_mp-pl.h trunk/help/help_mp-pt_BR.h trunk/help/help_mp-ro.h trunk/help/help_mp-ru.h trunk/help/help_mp-sk.h trunk/help/help_mp-sv.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Modified: trunk/gui/dialog/about.c ============================================================================== --- trunk/gui/dialog/about.c Fri Jan 31 15:06:25 2014 (r36767) +++ trunk/gui/dialog/about.c Fri Jan 31 17:37:52 2014 (r36768) @@ -108,10 +108,10 @@ static GtkWidget * CreateAbout( void ) gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL, #endif "\n" - MSGTR_ABOUT_UHU + MSGTR_ABOUT_UHU":\n" " http://www.uhulinux.hu/\n" "\n" - MSGTR_ABOUT_Contributors + MSGTR_ABOUT_Contributors":\n" "\n" " * Andreas Ackermann\n" " * adland\n" @@ -269,7 +269,7 @@ static GtkWidget * CreateAbout( void ) " * Matan Ziv-Av\n" " * Márk Vicián Zoltán\n" "\n" - MSGTR_ABOUT_Codecs_libs_contributions + MSGTR_ABOUT_Codecs_libs_contributions":\n" "\n" " * Fabrice Bellard\n" " * Vivien Chappelier\n" @@ -282,7 +282,7 @@ static GtkWidget * CreateAbout( void ) " * Mark Podlipec\n" " * Damien Vincent\n" "\n" - MSGTR_ABOUT_Translations + MSGTR_ABOUT_Translations":\n" "\n" " * Marcin Biernat\n" " * Marc Fargas\n" @@ -299,7 +299,7 @@ static GtkWidget * CreateAbout( void ) " * Wacław Schiller\n" " * Andoni Zubimendi\n" "\n" - MSGTR_ABOUT_Skins + MSGTR_ABOUT_Skins":\n" "\n" " * Azrael\n" " * Viktor Bekesi\n" Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Fri Jan 31 15:06:25 2014 (r36767) +++ trunk/gui/dialog/equalizer.c Fri Jan 31 17:37:52 2014 (r36768) @@ -383,19 +383,19 @@ static GtkWidget * CreateEqualizer( void gtk_container_add( GTK_CONTAINER( Notebook ),table1 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( MSGTR_EQU_Contrast,NULL ), + gtkAddLabel( MSGTR_EQU_Contrast":",NULL ), 0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( MSGTR_EQU_Brightness,NULL ), + gtkAddLabel( MSGTR_EQU_Brightness":",NULL ), 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( MSGTR_EQU_Hue,NULL ), + gtkAddLabel( MSGTR_EQU_Hue":",NULL ), 0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( MSGTR_EQU_Saturation,NULL ), + gtkAddLabel( MSGTR_EQU_Saturation":",NULL ), 0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); VContrastadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) ); @@ -607,27 +607,27 @@ GtkWidget * CreateEquConfig( void ) gtk_table_set_col_spacings( GTK_TABLE( table1 ),4 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( MSGTR_EQU_Channel1,NULL ), + gtkAddLabel( MSGTR_EQU_Channel1":",NULL ), 0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( MSGTR_EQU_Channel2,NULL ), + gtkAddLabel( MSGTR_EQU_Channel2":",NULL ), 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( MSGTR_EQU_Channel3,NULL ), + gtkAddLabel( MSGTR_EQU_Channel3":",NULL ), 0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( MSGTR_EQU_Channel4,NULL ), + gtkAddLabel( MSGTR_EQU_Channel4":",NULL ), 0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( MSGTR_EQU_Channel5,NULL ), + gtkAddLabel( MSGTR_EQU_Channel5":",NULL ), 0,1,4,5,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( MSGTR_EQU_Channel6,NULL ), + gtkAddLabel( MSGTR_EQU_Channel6":",NULL ), 0,1,5,6,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); CBChannel1=gtkAddCombo( NULL ); Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Fri Jan 31 15:06:25 2014 (r36767) +++ trunk/gui/dialog/menu.c Fri Jan 31 17:37:52 2014 (r36768) @@ -440,7 +440,7 @@ GtkWidget * CreatePopUpMenu( void ) 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 ); + AddMenuItem( window1, (const char*)file2_xpm, SubMenu,MSGTR_MENU_PlayFile"... ", evLoadPlay ); #ifdef CONFIG_CDDA AddMenuItem( window1, (const char*)playcd_xpm, SubMenu,MSGTR_MENU_PlayCD, evPlayCD ); CDSubMenu=AddSubMenu( window1, (const char*)cd_xpm, Menu,MSGTR_MENU_CD ); @@ -563,13 +563,13 @@ GtkWidget * CreatePopUpMenu( void ) gtk_widget_set_sensitive( MenuItem,FALSE ); } #endif - AddMenuItem( window1, (const char*)url_xpm, SubMenu,MSGTR_MENU_PlayURL, evLoadURL ); + AddMenuItem( window1, (const char*)url_xpm, SubMenu,MSGTR_MENU_PlayURL"...", evLoadURL ); #ifdef CONFIG_TV AddMenuItem( window1, (const char*)tv_xpm, SubMenu,MSGTR_MENU_PlayTV, evPlayTV ); #endif AddSeparator( SubMenu ); - AddMenuItem( window1, (const char*)loadeaf_xpm, SubMenu,MSGTR_MENU_LoadExternAudioFile, evLoadAudioFile ); - AddMenuItem( window1, (const char*)sub_xpm, SubMenu,MSGTR_MENU_LoadSubtitle" ", evLoadSubtitle ); + AddMenuItem( window1, (const char*)loadeaf_xpm, SubMenu,MSGTR_MENU_LoadExternAudioFile"...", evLoadAudioFile ); + AddMenuItem( window1, (const char*)sub_xpm, SubMenu,MSGTR_MENU_LoadSubtitle"... ", evLoadSubtitle ); AddMenuItem( window1, (const char*)nosub_xpm, SubMenu,MSGTR_MENU_DropSubtitle,evDropSubtitle ); SubMenu=AddSubMenu(window1, (const char*)play_xpm, Menu,MSGTR_MENU_Playing ); AddMenuItem( window1, (const char*)play_xpm, SubMenu,MSGTR_MENU_Play" ", evPlay ); Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Fri Jan 31 15:06:25 2014 (r36767) +++ trunk/gui/dialog/preferences.c Fri Jan 31 17:37:52 2014 (r36768) @@ -665,14 +665,14 @@ static GtkWidget * CreatePreferences( vo gtkAddHSeparator( vbox3 ); CBExtraStereo=gtkAddCheckButton( MSGTR_PREFERENCES_ExtraStereo,vbox3 ); hbox8=gtkAddHBox( vbox3,1 ); - /*label=*/gtkAddLabel( MSGTR_PREFERENCES_Coefficient,hbox8 ); + /*label=*/gtkAddLabel( MSGTR_PREFERENCES_Coefficient":",hbox8 ); // gtk_misc_set_padding( GTK_MISC( label ),20,0 ); HSExtraStereoMuladj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-10,10,0.1,0,0 ) ); HSExtraStereoMul=gtkAddHScale( HSExtraStereoMuladj,hbox8,1 ); gtkAddHSeparator( vbox3 ); hbox8=gtkAddHBox( vbox3,1 ); - gtkAddLabel( MSGTR_PREFERENCES_AudioDelay,hbox8 ); + gtkAddLabel( MSGTR_PREFERENCES_AudioDelay":",hbox8 ); HSAudioDelayadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-10,10,0.01,0,0 ) ); HSAudioDelay=gtkAddHScale( HSAudioDelayadj,hbox8,2 ); @@ -721,10 +721,10 @@ static GtkWidget * CreatePreferences( vo gtk_widget_show( table1 ); gtk_box_pack_start( GTK_BOX( vbox5 ),table1,FALSE,FALSE,0 ); - label=gtkAddLabel( MSGTR_PREFERENCES_Panscan,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_Panscan":",NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=gtkAddLabel( MSGTR_PREFERENCES_FPS,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FPS":",NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); HSPanscanadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,1,0.001,0,0 ) ); @@ -760,7 +760,7 @@ static GtkWidget * CreatePreferences( vo #if 0 hbox4=gtkAddHBox( vbox7,1 ); - gtkAddLabel( MSGTR_PREFERENCES_Subtitle,hbox4 ); + gtkAddLabel( MSGTR_PREFERENCES_Subtitle":",hbox4 ); ESubtitleName=gtk_entry_new(); gtk_widget_show( ESubtitleName ); @@ -777,16 +777,16 @@ static GtkWidget * CreatePreferences( vo gtk_widget_show( table1 ); gtk_box_pack_start( GTK_BOX( vbox8 ),table1,FALSE,FALSE,0 ); - label=gtkAddLabel( MSGTR_PREFERENCES_SUB_Delay,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_SUB_Delay":",NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=gtkAddLabel( MSGTR_PREFERENCES_SUB_POS,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_SUB_POS":",NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=gtkAddLabel( MSGTR_PREFERENCES_SUB_FPS,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_SUB_FPS":",NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=gtkAddLabel( MSGTR_PREFERENCES_FontEncoding,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FontEncoding":",NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_FILL ),0,0 ); HSSubDelayadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-10.0,10,0.01,0,0 ) ); @@ -860,13 +860,13 @@ static GtkWidget * CreatePreferences( vo hbox91=gtk_hbox_new( FALSE,0 ); gtk_box_pack_start( GTK_BOX( hbox9 ),hbox91,TRUE,FALSE,0 ); gtk_widget_show( hbox91 ); - SBASSTopMargin=gtkAddSpinButton( MSGTR_PREFERENCES_SUB_ASS_TOP_MARGIN, + SBASSTopMargin=gtkAddSpinButton( MSGTR_PREFERENCES_SUB_ASS_TOP_MARGIN":", (GtkAdjustment *)gtk_adjustment_new(0,0,512,1,8,0),hbox91 ); hbox92=gtk_hbox_new( FALSE,0 ); gtk_box_pack_start( GTK_BOX( hbox9 ),hbox92,TRUE,FALSE,0 ); gtk_widget_show( hbox92 ); - SBASSBottomMargin=gtkAddSpinButton( MSGTR_PREFERENCES_SUB_ASS_BOTTOM_MARGIN, + SBASSBottomMargin=gtkAddSpinButton( MSGTR_PREFERENCES_SUB_ASS_BOTTOM_MARGIN":", (GtkAdjustment *)gtk_adjustment_new(0,0,512,1,8,0),hbox92 ); label=gtkAddLabel( MSGTR_PREFERENCES_SubtitleOSD,NULL ); @@ -880,7 +880,7 @@ static GtkWidget * CreatePreferences( vo gtkAddFrame( NULL,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 ); hbox6=gtkAddHBox( vbox603,1 ); - gtkAddLabel( MSGTR_PREFERENCES_Font,hbox6 ); + gtkAddLabel( MSGTR_PREFERENCES_Font":",hbox6 ); prEFontName=gtk_entry_new(); gtk_widget_show( prEFontName ); gtk_box_pack_start( GTK_BOX( hbox6 ),prEFontName,TRUE,TRUE,0 ); @@ -893,7 +893,7 @@ static GtkWidget * CreatePreferences( vo gtk_widget_show( table1 ); gtk_box_pack_start( GTK_BOX( vbox603 ),table1,FALSE,FALSE,0 ); - label=gtkAddLabel( MSGTR_PREFERENCES_FontAutoScaleMode,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FontAutoScaleMode":",NULL ); gtk_misc_set_alignment( GTK_MISC( label ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_FILL ),0,0 ); @@ -905,7 +905,7 @@ static GtkWidget * CreatePreferences( vo RBFontAutoScaleWidth=gtkAddRadioButton( MSGTR_PREFERENCES_FontPropWidth,&Font_group,vbox11 ); RBFontAutoScaleDiagonal=gtkAddRadioButton( MSGTR_PREFERENCES_FontPropDiagonal,&Font_group,vbox11 ); - label=gtkAddLabel( MSGTR_PREFERENCES_FontEncoding,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FontEncoding":",NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); CBFontEncoding=gtk_combo_new(); @@ -942,28 +942,28 @@ static GtkWidget * CreatePreferences( vo gtk_entry_set_editable( GTK_ENTRY( EFontEncoding ),FALSE ); gtk_widget_show( EFontEncoding ); - label=gtkAddLabel( MSGTR_PREFERENCES_FontBlur,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FontBlur":",NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); HSFontBluradj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0.1,0,0 ) ); HSFontBlur=gtkAddHScale( HSFontBluradj,NULL,2 ); gtk_table_attach( GTK_TABLE( table1 ),HSFontBlur,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=gtkAddLabel( MSGTR_PREFERENCES_FontOutLine,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FontOutLine":",NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); HSFontOutLineadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0.1,0,0 ) ); HSFontOutLine=gtkAddHScale( HSFontOutLineadj,NULL,2 ); gtk_table_attach( GTK_TABLE( table1 ),HSFontOutLine,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=gtkAddLabel( MSGTR_PREFERENCES_FontTextScale,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FontTextScale":",NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,4,5,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); HSFontTextScaleadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0.1,0,0 ) ); HSFontTextScale=gtkAddHScale( HSFontTextScaleadj,NULL,2 ); gtk_table_attach( GTK_TABLE( table1 ),HSFontTextScale,1,2,4,5,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=gtkAddLabel( MSGTR_PREFERENCES_FontOSDScale,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FontOSDScale":",NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,5,6,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); HSFontOSDScaleadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0.1,0,0 ) ); @@ -971,7 +971,7 @@ static GtkWidget * CreatePreferences( vo gtk_table_attach( GTK_TABLE( table1 ),HSFontOSDScale,1,2,5,6,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); #else hbox7=gtkAddHBox( vbox603,1 ); - gtkAddLabel( MSGTR_PREFERENCES_FontOutLine,hbox7 ); + gtkAddLabel( MSGTR_PREFERENCES_FontOutLine":",hbox7 ); HSFontFactoradj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,10,0.05,0,0 ) ); HSFontFactor=gtkAddHScale( HSFontFactoradj,hbox7,2 ); #endif @@ -996,7 +996,7 @@ static GtkWidget * CreatePreferences( vo hbox5=gtkAddHBox( vbox604,1 ); - gtkAddLabel( MSGTR_PREFERENCES_VideoCodecFamily,hbox5 ); + gtkAddLabel( MSGTR_PREFERENCES_VideoCodecFamily":",hbox5 ); CBVFM=gtk_combo_new(); gtk_widget_show( CBVFM ); @@ -1008,7 +1008,7 @@ static GtkWidget * CreatePreferences( vo hbox5=gtkAddHBox( vbox604,1 ); - gtkAddLabel( MSGTR_PREFERENCES_AudioCodecFamily,hbox5 ); + gtkAddLabel( MSGTR_PREFERENCES_AudioCodecFamily":",hbox5 ); CBAFM=gtk_combo_new(); gtk_widget_show( CBAFM ); @@ -1033,7 +1033,7 @@ static GtkWidget * CreatePreferences( vo hbox5=gtkAddHBox( vbox602,1 ); - gtkAddLabel( MSGTR_PREFERENCES_AutoQuality,hbox5 ); + gtkAddLabel( MSGTR_PREFERENCES_AutoQuality":",hbox5 ); if ( guiInfo.sh_video && guiInfo.Playing ) HSPPQualityadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,get_video_quality_max( guiInfo.sh_video ),0,0,0 ) ); else HSPPQualityadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0,0,0 ) ); @@ -1047,7 +1047,7 @@ static GtkWidget * CreatePreferences( vo hbox5=gtkAddHBox( vbox602,1 ); - gtkAddLabel( MSGTR_PREFERENCES_CacheSize,hbox5 ); + gtkAddLabel( MSGTR_PREFERENCES_CacheSize":",hbox5 ); SBCacheadj=GTK_ADJUSTMENT( gtk_adjustment_new( gtkCacheSize,32,0x7fffffff,1,32,0 ) ); SBCache=gtk_spin_button_new( GTK_ADJUSTMENT( SBCacheadj ),1,0 ); @@ -1070,7 +1070,7 @@ static GtkWidget * CreatePreferences( vo CBAutoSync=gtkAddCheckButton( MSGTR_PREFERENCES_AutoSync,vbox602 ); hbox5=gtkAddHBox( vbox602,1 ); - gtkAddLabel( MSGTR_PREFERENCES_AutoSyncValue,hbox5 ); + gtkAddLabel( MSGTR_PREFERENCES_AutoSyncValue":",hbox5 ); SBAutoSyncadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,10000,1,10,10 ) ); SBAutoSync=gtk_spin_button_new( GTK_ADJUSTMENT( SBAutoSyncadj ),1,0 ); gtk_widget_show( SBAutoSync ); @@ -1082,13 +1082,13 @@ static GtkWidget * CreatePreferences( vo gtk_widget_show( table1 ); gtk_box_pack_start( GTK_BOX( vbox602 ),table1,FALSE,FALSE,0 ); - label=gtkAddLabel( MSGTR_PREFERENCES_DVDDevice,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_DVDDevice":",NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); prEDVDDevice=gtk_entry_new(); gtk_widget_show( prEDVDDevice ); gtk_table_attach( GTK_TABLE( table1 ),prEDVDDevice,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=gtkAddLabel( MSGTR_PREFERENCES_CDROMDevice,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_CDROMDevice":",NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); prECDRomDevice=gtk_entry_new(); gtk_widget_show( prECDRomDevice ); @@ -1661,7 +1661,7 @@ static GtkWidget *CreateAudioConfig( voi gtk_widget_show(table); gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0); - label = gtkAddLabel(MSGTR_PREFERENCES_Audio_Device, NULL); + label = gtkAddLabel(MSGTR_PREFERENCES_Audio_Device":", NULL); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); CBAudioDevice = gtkAddCombo(NULL); @@ -1690,7 +1690,7 @@ static GtkWidget *CreateAudioConfig( voi CEAudioDevice = GTK_COMBO(CBAudioDevice)->entry; gtk_widget_show(CEAudioDevice); - label = gtkAddLabel(MSGTR_PREFERENCES_Audio_Mixer, NULL); + label = gtkAddLabel(MSGTR_PREFERENCES_Audio_Mixer":", NULL); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); CBAudioMixer = gtkAddCombo(NULL); @@ -1711,7 +1711,7 @@ static GtkWidget *CreateAudioConfig( voi CEAudioMixer = GTK_COMBO(CBAudioMixer)->entry; gtk_widget_show(CEAudioMixer); - label = gtkAddLabel(MSGTR_PREFERENCES_Audio_MixerChannel, NULL); + label = gtkAddLabel(MSGTR_PREFERENCES_Audio_MixerChannel":", NULL); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); CBAudioMixerChannel = gtkAddCombo(NULL); @@ -1851,7 +1851,7 @@ GtkWidget * CreateDXR3Config( void ) vbox1=gtkAddVBox( gtkAddDialogFrame( DXR3Config ),0 ); vbox2=gtkAddVBox( vbox1,0 ); hbox1=gtkAddHBox( vbox2,1 ); - gtkAddLabel( MSGTR_PREFERENCES_Audio_Device,hbox1 ); + gtkAddLabel( MSGTR_PREFERENCES_Audio_Device":",hbox1 ); CBDevice=gtkAddCombo( hbox1 ); @@ -1869,7 +1869,7 @@ GtkWidget * CreateDXR3Config( void ) gtkAddHSeparator( vbox2 ); vbox3=gtkAddVBox( vbox2,0 ); - gtkAddLabel( MSGTR_PREFERENCES_DXR3_VENC,vbox3 ); + gtkAddLabel( MSGTR_PREFERENCES_DXR3_VENC":",vbox3 ); RBVNone=gtkAddRadioButton( MSGTR_PREFERENCES_DXR3_NoEnc,&VEncoder_group,vbox3 ); RBVLavc=gtkAddRadioButton( MSGTR_PREFERENCES_DXR3_LAVC,&VEncoder_group,vbox3 ); Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Fri Jan 31 15:06:25 2014 (r36767) +++ trunk/gui/dialog/skinbrowser.c Fri Jan 31 17:37:52 2014 (r36768) @@ -111,7 +111,7 @@ static GtkWidget * CreateSkinBrowser( vo gtkAddIcon( SkinBrowser ); vbox5=gtkAddVBox( gtkAddDialogFrame( SkinBrowser ),0 ); - gtkAddLabel( MSGTR_SKIN_LABEL,vbox5 ); + gtkAddLabel( MSGTR_SKIN_LABEL":",vbox5 ); gtkAddHSeparator( vbox5 ); scrolledwindow1=gtk_scrolled_window_new( NULL,NULL ); Modified: trunk/gui/win32/dialogs.c ============================================================================== --- trunk/gui/win32/dialogs.c Fri Jan 31 15:06:25 2014 (r36767) +++ trunk/gui/win32/dialogs.c Fri Jan 31 17:37:52 2014 (r36768) @@ -408,8 +408,8 @@ void display_openurlwindow(gui_t *gui, i static void create_playlistmenu(gui_t *gui) { gui->playlistmenu = CreatePopupMenu(); - AppendMenu(gui->playlistmenu, MF_STRING, ID_ADDFILE, acp(MSGTR_PLAYLIST_AddFile)); - AppendMenu(gui->playlistmenu, MF_STRING, ID_ADDURL, acp(MSGTR_PLAYLIST_AddURL)); + AppendMenu(gui->playlistmenu, MF_STRING, ID_ADDFILE, acp(MSGTR_PLAYLIST_AddFile"...")); + AppendMenu(gui->playlistmenu, MF_STRING, ID_ADDURL, acp(MSGTR_PLAYLIST_AddURL"...")); AppendMenu(gui->playlistmenu, MF_SEPARATOR, 0, 0); AppendMenu(gui->playlistmenu, MF_STRING, ID_REMOVE, acp(MSGTR_Remove)); AppendMenu(gui->playlistmenu, MF_STRING, ID_CLEAR, acp(MSGTR_Clear)); @@ -871,7 +871,7 @@ void display_chapterselwindow(gui_t *gui int x, y; if (guiInfo.StreamType != STREAMTYPE_DVD) return; - if (FindWindow(NULL, acp(MSGTR_SelectTitleChapter))) return; + if (FindWindow(NULL, acp(MSGTR_SelectTitleChapter"..."))) return; wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = TitleChapterWndProc; @@ -881,13 +881,13 @@ void display_chapterselwindow(gui_t *gui wc.hCursor = LoadCursor(NULL,IDC_ARROW); wc.hIcon = gui->icon; wc.hbrBackground = SOLID_GREY2; - wc.lpszClassName = acp(MSGTR_SelectTitleChapter); + wc.lpszClassName = acp(MSGTR_SelectTitleChapter"..."); wc.lpszMenuName = NULL; RegisterClass(&wc); x = (GetSystemMetrics(SM_CXSCREEN) / 2) - (180 / 2); y = (GetSystemMetrics(SM_CYSCREEN) / 2) - (100 / 2); - hWnd = CreateWindow(acp(MSGTR_SelectTitleChapter), - acp(MSGTR_SelectTitleChapter), + hWnd = CreateWindow(acp(MSGTR_SelectTitleChapter"..."), + acp(MSGTR_SelectTitleChapter"..."), WS_POPUPWINDOW | WS_CAPTION, x, y, @@ -926,7 +926,7 @@ static LRESULT CALLBACK EqWndProc(HWND h NULL); SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - label = CreateWindow("static", acp(MSGTR_EQU_Brightness), + label = CreateWindow("static", acp(MSGTR_EQU_Brightness":"), WS_CHILD | WS_VISIBLE, 12, 122, 70, 15, hwnd, NULL, @@ -934,7 +934,7 @@ static LRESULT CALLBACK EqWndProc(HWND h NULL); SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - label = CreateWindow("static", acp(MSGTR_EQU_Contrast), + label = CreateWindow("static", acp(MSGTR_EQU_Contrast":"), WS_CHILD | WS_VISIBLE, 99, 122, 70, 15, hwnd, NULL, @@ -942,14 +942,14 @@ static LRESULT CALLBACK EqWndProc(HWND h NULL); SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - label = CreateWindow("static", acp(MSGTR_EQU_Hue), + label = CreateWindow("static", acp(MSGTR_EQU_Hue":"), WS_CHILD | WS_VISIBLE, 191, 122, 70, 15, hwnd, NULL, ((LPCREATESTRUCT) lParam) -> hInstance, NULL); SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - label = CreateWindow("static", acp(MSGTR_EQU_Saturation), + label = CreateWindow("static", acp(MSGTR_EQU_Saturation":"), WS_CHILD | WS_VISIBLE, 260, 122, 70, 15, hwnd, NULL, Modified: trunk/gui/win32/gui.c ============================================================================== --- trunk/gui/win32/gui.c Fri Jan 31 15:06:25 2014 (r36767) +++ trunk/gui/win32/gui.c Fri Jan 31 17:37:52 2014 (r36768) @@ -432,7 +432,7 @@ static LRESULT CALLBACK VideoProc(HWND h BROWSEINFO bi; LPITEMIDLIST pidl; memset(&bi, 0, sizeof(BROWSEINFO)); - bi.lpszTitle = acp(MSGTR_DirectorySelect); + bi.lpszTitle = acp(MSGTR_DirectorySelect":"); pidl = SHBrowseForFolder(&bi); if (SHGetPathFromIDList(pidl, path)) { @@ -986,7 +986,7 @@ static LRESULT CALLBACK EventProc(HWND h BROWSEINFO bi; LPITEMIDLIST pidl; memset(&bi, 0, sizeof(BROWSEINFO)); - bi.lpszTitle = acp(MSGTR_DirectorySelect); + bi.lpszTitle = acp(MSGTR_DirectorySelect":"); pidl = SHBrowseForFolder(&bi); if (SHGetPathFromIDList(pidl, path)) { @@ -1199,13 +1199,13 @@ static void create_menu(gui_t *gui) gui->menu=CreatePopupMenu(); gui->trayplaymenu = CreatePopupMenu(); AppendMenu(gui->menu, MF_STRING | MF_POPUP, (UINT_PTR) gui->trayplaymenu, acp(MSGTR_MENU_Open)); - AppendMenu(gui->trayplaymenu, MF_STRING, IDFILE_OPEN, acp(MSGTR_MENU_PlayFile)); - AppendMenu(gui->trayplaymenu, MF_STRING, IDURL_OPEN, acp(MSGTR_MENU_PlayURL)); - AppendMenu(gui->trayplaymenu, MF_STRING, IDDIR_OPEN, acp(MSGTR_MENU_PlayDirectory)); + AppendMenu(gui->trayplaymenu, MF_STRING, IDFILE_OPEN, acp(MSGTR_MENU_PlayFile"...")); + AppendMenu(gui->trayplaymenu, MF_STRING, IDURL_OPEN, acp(MSGTR_MENU_PlayURL"...")); + AppendMenu(gui->trayplaymenu, MF_STRING, IDDIR_OPEN, acp(MSGTR_MENU_PlayDirectory"...")); AppendMenu(gui->menu, MF_SEPARATOR, 0, 0); AppendMenu(gui->menu, MF_STRING | MF_POPUP, (UINT_PTR) gui->diskmenu, acp(MSGTR_MENU_PlayDisc)); AppendMenu(gui->menu, MF_SEPARATOR, 0, 0); - AppendMenu(gui->menu, MF_STRING, IDSUBTITLE_OPEN, acp(MSGTR_MENU_LoadSubtitle)); + AppendMenu(gui->menu, MF_STRING, IDSUBTITLE_OPEN, acp(MSGTR_MENU_LoadSubtitle"...")); AppendMenu(gui->menu, MF_STRING, ID_SKINBROWSER, acp(MSGTR_MENU_SkinBrowser)); AppendMenu(gui->menu, MF_SEPARATOR, 0, 0); AppendMenu(gui->menu, MF_STRING, ID_PREFS, acp(MSGTR_MENU_Preferences)); @@ -1267,7 +1267,7 @@ static void create_videomenu(gui_t *gui) AppendMenu(gui->videomenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->subtitlemenu, acp(MSGTR_MENU_Subtitles)); #ifdef CONFIG_DVDREAD AppendMenu(gui->videomenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->dvdmenu, acp(MSGTR_MENU_DVD)); - AppendMenu(gui->dvdmenu, MF_STRING | MF_GRAYED, ID_CHAPTERSEL, acp(MSGTR_SelectTitleChapter)); + AppendMenu(gui->dvdmenu, MF_STRING | MF_GRAYED, ID_CHAPTERSEL, acp(MSGTR_SelectTitleChapter"...")); #endif AppendMenu(gui->subtitlemenu, MF_STRING, IDSUB_TOGGLE, acp(MSGTR_MENU_SubtitlesOnOff)); AppendMenu(gui->subtitlemenu, MF_STRING, IDSUB_CYCLE, acp(MSGTR_MENU_SubtitleLanguages)); Modified: trunk/gui/win32/preferences.c ============================================================================== --- trunk/gui/win32/preferences.c Fri Jan 31 15:06:25 2014 (r36767) +++ trunk/gui/win32/preferences.c Fri Jan 31 17:37:52 2014 (r36768) @@ -88,14 +88,14 @@ static LRESULT CALLBACK PrefsWndProc(HWN NULL); SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - label = CreateWindow("static", acp(MSGTR_PREFERENCES_Coefficient), + label = CreateWindow("static", acp(MSGTR_PREFERENCES_Coefficient":"), WS_CHILD | WS_VISIBLE | SS_RIGHT, 10, 148, 140, 15, hwnd, NULL, ((LPCREATESTRUCT) lParam) -> hInstance, NULL); SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - label = CreateWindow("static", acp(MSGTR_PREFERENCES_AudioDelay), + label = CreateWindow("static", acp(MSGTR_PREFERENCES_AudioDelay":"), WS_CHILD | WS_VISIBLE | SS_RIGHT, 10, 187, 140, 15, hwnd, NULL, ((LPCREATESTRUCT) lParam) -> hInstance,

1 0

r36765 - trunk/help/help_check.sh
by ib 31 Jan '14

31 Jan '14

Author: ib Date: Thu Jan 30 13:05:35 2014 New Revision: 36765 Log: Improve testing of the help message text headers. It will detect now #define statements without replacement text. Modified: trunk/help/help_check.sh Modified: trunk/help/help_check.sh ============================================================================== --- trunk/help/help_check.sh Mon Jan 27 15:22:30 2014 (r36764) +++ trunk/help/help_check.sh Thu Jan 30 13:05:35 2014 (r36765) @@ -16,7 +16,7 @@ for h in "$@"; do #include "$h" void $CHECK () { EOF - sed -n "s:^[ \t]*#define[ \t]\+$[0-9A-Za-z_]\+$[ \t].*:strdup(\1);:p" "$h" >> ${CHECK}.c + sed -n "s:^[ \t]*#define[ \t]\+$[0-9A-Za-z_]\+$$.*$:strdup(\1);:p" "$h" >> ${CHECK}.c echo "}" >> ${CHECK}.c $CC -Werror -c -o ${CHECK}.o ${CHECK}.c || exit done

3 2

r36767 - trunk/help/help_check.sh
by ib 31 Jan '14

31 Jan '14

Author: ib Date: Fri Jan 31 15:06:25 2014 New Revision: 36767 Log: Remove pointless pair of parentheses. It will detect #define statements having no replacement text without the second pair of parentheses just as well. Thanks to al for spotting it. Modified: trunk/help/help_check.sh Modified: trunk/help/help_check.sh ============================================================================== --- trunk/help/help_check.sh Thu Jan 30 14:26:45 2014 (r36766) +++ trunk/help/help_check.sh Fri Jan 31 15:06:25 2014 (r36767) @@ -16,7 +16,7 @@ for h in "$@"; do #include "$h" void $CHECK () { EOF - sed -n "s:^[ \t]*#define[ \t]\+$[0-9A-Za-z_]\+$$.*$:strdup(\1);:p" "$h" >> ${CHECK}.c + sed -n "s:^[ \t]*#define[ \t]\+$[0-9A-Za-z_]\+$.*:strdup(\1);:p" "$h" >> ${CHECK}.c echo "}" >> ${CHECK}.c $CC -Werror -c -o ${CHECK}.o ${CHECK}.c || exit done

1 0

r36766 - in trunk: gui/dialog/about.c gui/dialog/equalizer.c gui/dialog/preferences.c gui/ui/main.c gui/ui/menu.c gui/ui/playbar.c gui/win32/gui.c gui/win32/preferences.c help/help_mp-bg.h help/hel...
by ib 30 Jan '14

30 Jan '14

Author: ib Date: Thu Jan 30 14:26:45 2014 New Revision: 36766 Log: Revise GUI help message texts. In particular, revise the English and German translations, but remove some unused definitions from all language files as well, and don't define a symbolic constant by an other one. Additionally, make some necessary code changes. Modified: trunk/gui/dialog/about.c trunk/gui/dialog/equalizer.c trunk/gui/dialog/preferences.c trunk/gui/ui/main.c trunk/gui/ui/menu.c trunk/gui/ui/playbar.c trunk/gui/win32/gui.c trunk/gui/win32/preferences.c Changes in other areas also in this revision: Modified: trunk/help/help_mp-bg.h trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-dk.h trunk/help/help_mp-el.h trunk/help/help_mp-en.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-ja.h trunk/help/help_mp-ko.h trunk/help/help_mp-mk.h trunk/help/help_mp-nb.h trunk/help/help_mp-nl.h trunk/help/help_mp-pl.h trunk/help/help_mp-pt_BR.h trunk/help/help_mp-ro.h trunk/help/help_mp-ru.h trunk/help/help_mp-sk.h trunk/help/help_mp-sv.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Modified: trunk/gui/dialog/about.c ============================================================================== --- trunk/gui/dialog/about.c Thu Jan 30 13:05:35 2014 (r36765) +++ trunk/gui/dialog/about.c Thu Jan 30 14:26:45 2014 (r36766) @@ -62,7 +62,7 @@ static GtkWidget * CreateAbout( void ) About=gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_widget_set_usize( About,340,415 ); - gtk_window_set_title( GTK_WINDOW( About ),MSGTR_About ); + gtk_window_set_title( GTK_WINDOW( About ),MSGTR_MENU_AboutMPlayer ); gtk_window_set_position( GTK_WINDOW( About ),GTK_WIN_POS_CENTER ); gtk_window_set_policy( GTK_WINDOW( About ),FALSE,FALSE,TRUE ); gtk_window_set_wmclass( GTK_WINDOW( About ),"About",MPlayer ); @@ -109,7 +109,7 @@ static GtkWidget * CreateAbout( void ) #endif "\n" MSGTR_ABOUT_UHU - " (http://www.uhulinux.hu/)\n" + " http://www.uhulinux.hu/\n" "\n" MSGTR_ABOUT_Contributors "\n" Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Thu Jan 30 13:05:35 2014 (r36765) +++ trunk/gui/dialog/equalizer.c Thu Jan 30 14:26:45 2014 (r36766) @@ -336,43 +336,43 @@ static GtkWidget * CreateEqualizer( void gtk_table_attach( GTK_TABLE( table1 ),A16000,9,10,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( "31.25",NULL ), + gtkAddLabel( MSGTR_EQU_Frequency0,NULL ), 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( "62.50",NULL ), + gtkAddLabel( MSGTR_EQU_Frequency1,NULL ), 1,2,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( "125",NULL ), + gtkAddLabel( MSGTR_EQU_Frequency2,NULL ), 2,3,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( "250",NULL ), + gtkAddLabel( MSGTR_EQU_Frequency3,NULL ), 3,4,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( "500",NULL ), + gtkAddLabel( MSGTR_EQU_Frequency4,NULL ), 4,5,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( "1000",NULL ), + gtkAddLabel( MSGTR_EQU_Frequency5,NULL ), 5,6,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( "2000",NULL ), + gtkAddLabel( MSGTR_EQU_Frequency6,NULL ), 6,7,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( "4000",NULL ), + gtkAddLabel( MSGTR_EQU_Frequency7,NULL ), 7,8,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( "8000",NULL ), + gtkAddLabel( MSGTR_EQU_Frequency8,NULL ), 8,9,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - gtkAddLabel( "16000",NULL ), + gtkAddLabel( MSGTR_EQU_Frequency9,NULL ), 9,10,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( Notebook ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( Notebook ),0 ), Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Thu Jan 30 13:05:35 2014 (r36765) +++ trunk/gui/dialog/preferences.c Thu Jan 30 14:26:45 2014 (r36766) @@ -245,7 +245,7 @@ static void prEntry( GtkEditable * edita if ( lEncoding[i].comment ) mplayer( MPLAYER_SET_SUB_ENCODING,0,lEncoding[i].name ); else { - if ( strcmp( comment,MSGTR_PREFERENCES_DefaultEnc ) == 0 ) comment=NULL; + if ( strcmp( comment,MSGTR_PREFERENCES_Default ) == 0 ) comment=NULL; mplayer( MPLAYER_SET_SUB_ENCODING,0,(char *)comment ); } if ( !comment) gtk_widget_set_sensitive( CBSubEncoding,(!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(CBSubUtf8)) && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(CBSubUnicode))) ); @@ -308,7 +308,7 @@ static void prButton( GtkButton * button /* 3rd page */ suboverlap_enabled=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSubOverlap ) ); - sub_auto=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ) ); + sub_auto=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ) ); gtkSubDumpMPSub=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ) ); gtkSubDumpSrt=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpSrt ) ); sub_utf8=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSubUtf8 ) ); @@ -368,7 +368,7 @@ static void prButton( GtkButton * button gtkVfPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) ); gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) ); gui_save_pos=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ) ); - gtkShowVideoWindow=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) ); + gtkShowVideoWindow=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) ); stop_xscreensaver=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ) ); gtkEnablePlayBar=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPlayBar ) ); gui_tv_digital=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBTVDigital ) ); @@ -485,7 +485,7 @@ static void prToggled( GtkToggleButton * // if ( guiInfo.Playing ) gtkMessageBox( MSGBOX_WARNING,"Please remember, this function need restart the playing." ); // break; case 3: - if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) ) ) + if ( !gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) ) ) { window=wsShowWindow; gtkRaise( Preferences ); @@ -812,7 +812,7 @@ static GtkWidget * CreatePreferences( vo CBSubEncoding=gtk_combo_new(); gtk_widget_show( CBSubEncoding ); gtk_box_pack_start( GTK_BOX( vbox10 ),CBSubEncoding,TRUE,FALSE,0 ); - CBSubEncoding_items=g_list_append( CBSubEncoding_items,MSGTR_PREFERENCES_DefaultEnc ); + CBSubEncoding_items=g_list_append( CBSubEncoding_items,MSGTR_PREFERENCES_Default ); { int i, listed=(sub_cp == NULL); @@ -1253,7 +1253,7 @@ void ShowPreferences( void ) /* 3rd page */ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSubOverlap ),suboverlap_enabled ); - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ),!sub_auto ); + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ),sub_auto ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ),gtkSubDumpMPSub ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpSrt ),gtkSubDumpSrt ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSubUtf8 ),sub_utf8 ); @@ -1335,7 +1335,7 @@ void ShowPreferences( void ) GList * Items = NULL; char * name = NULL; - Items=g_list_append( Items,MSGTR_PREFERENCES_None ); + Items=g_list_append( Items,MSGTR_PREFERENCES_Default ); for( i=0;mpcodecs_vd_drivers[i];i++ ) { Items=g_list_append( Items,(char *)mpcodecs_vd_drivers[i]->info->name ); @@ -1351,7 +1351,7 @@ void ShowPreferences( void ) GList * Items = NULL; char * name = NULL; - Items=g_list_append( Items,MSGTR_PREFERENCES_None ); + Items=g_list_append( Items,MSGTR_PREFERENCES_Default ); for( i=0;mpcodecs_ad_drivers[i];i++ ) { Items=g_list_append( Items,(char *)mpcodecs_ad_drivers[i]->info->name ); @@ -1366,7 +1366,7 @@ void ShowPreferences( void ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPostprocess ),gtkVfPP ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ),gtkLoadFullscreen ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ),gui_save_pos ); - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ),gtkShowVideoWindow ); + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ),!gtkShowVideoWindow ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ),stop_xscreensaver ); gtk_adjustment_set_value( HSPPQualityadj,auto_quality ); Modified: trunk/gui/ui/main.c ============================================================================== --- trunk/gui/ui/main.c Thu Jan 30 13:05:35 2014 (r36765) +++ trunk/gui/ui/main.c Thu Jan 30 14:26:45 2014 (r36766) @@ -345,7 +345,7 @@ void uiMainInit (void) if (!mainDrawBuffer) { - gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_NEMDB); + gmp_msg(MSGT_GPLAYER, MSGL_FATAL, "[main] " MSGTR_NEMDB); mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); } Modified: trunk/gui/ui/menu.c ============================================================================== --- trunk/gui/ui/menu.c Thu Jan 30 13:05:35 2014 (r36765) +++ trunk/gui/ui/menu.c Thu Jan 30 14:26:45 2014 (r36766) @@ -107,8 +107,8 @@ void uiMenuInit( void ) if ( ( menuDrawBuffer = calloc( 1,guiApp.menu.Bitmap.ImageSize ) ) == NULL ) { - mp_msg( MSGT_GPLAYER,MSGL_DBG2,MSGTR_NEMFMR ); - gtkMessageBox( MSGBOX_FATAL,MSGTR_NEMFMR ); + mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu] " MSGTR_NEMDB ); + gtkMessageBox( MSGBOX_FATAL,"[menu] " MSGTR_NEMDB ); return; } Modified: trunk/gui/ui/playbar.c ============================================================================== --- trunk/gui/ui/playbar.c Thu Jan 30 13:05:35 2014 (r36765) +++ trunk/gui/ui/playbar.c Thu Jan 30 14:26:45 2014 (r36766) @@ -238,7 +238,7 @@ void uiPlaybarInit( void ) if ( ( playbarDrawBuffer = malloc( guiApp.playbar.Bitmap.ImageSize ) ) == NULL ) { - gmp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_NEMDB ); + gmp_msg( MSGT_GPLAYER,MSGL_FATAL,"[playbar] " MSGTR_NEMDB ); mplayer( MPLAYER_EXIT_GUI, EXIT_ERROR, 0 ); } Modified: trunk/gui/win32/gui.c ============================================================================== --- trunk/gui/win32/gui.c Thu Jan 30 13:05:35 2014 (r36765) +++ trunk/gui/win32/gui.c Thu Jan 30 14:26:45 2014 (r36766) @@ -187,7 +187,7 @@ static void display_about_box(HWND hWnd) { char about_msg[512]; snprintf(about_msg, sizeof(about_msg), MP_TITLE "\n" COPYRIGHT, MPlayer); - MessageBox(hWnd, about_msg, acp(MSGTR_About), MB_OK); + MessageBox(hWnd, about_msg, acp(MSGTR_MENU_AboutMPlayer), MB_OK); } static image *get_drawground(HWND hwnd) Modified: trunk/gui/win32/preferences.c ============================================================================== --- trunk/gui/win32/preferences.c Thu Jan 30 13:05:35 2014 (r36765) +++ trunk/gui/win32/preferences.c Thu Jan 30 14:26:45 2014 (r36766) @@ -149,7 +149,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN /* checkboxes */ btn = CreateWindow("button", acp(MSGTR_PREFERENCES_DoubleBuffer), WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, - 10, 35, 160, 25, + 10, 35, 205, 25, hwnd, (HMENU) ID_DOUBLE, ((LPCREATESTRUCT) lParam) -> hInstance, NULL); @@ -157,7 +157,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN btn = CreateWindow("button", acp(MSGTR_PREFERENCES_DirectRender), WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, - 10, 57, 160, 25, + 10, 57, 205, 25, hwnd, (HMENU) ID_DIRECT, ((LPCREATESTRUCT) lParam) -> hInstance, NULL); @@ -165,7 +165,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN btn = CreateWindow("button", acp(MSGTR_PREFERENCES_FrameDrop), WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, - 10, 79, 160, 25, + 10, 79, 205, 25, hwnd, (HMENU) ID_FRAMEDROP, ((LPCREATESTRUCT) lParam) -> hInstance, NULL); @@ -181,7 +181,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN btn = CreateWindow("button", acp(MSGTR_PREFERENCES_NormalizeSound), WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, - 220, 35, 160, 25, + 220, 35, 190, 25, hwnd, (HMENU) ID_NORMALIZE, ((LPCREATESTRUCT) lParam) -> hInstance, NULL); @@ -189,7 +189,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN btn = CreateWindow("button", acp(MSGTR_PREFERENCES_SoftwareMixer), WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, - 220, 57, 160, 25, + 220, 57, 190, 25, hwnd, (HMENU) ID_SOFTMIX, ((LPCREATESTRUCT) lParam) -> hInstance, NULL); @@ -197,7 +197,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN btn = CreateWindow("button", acp(MSGTR_PREFERENCES_ExtraStereo), WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, - 220, 79, 160, 25, + 220, 79, 190, 25, hwnd, (HMENU) ID_EXTRASTEREO, ((LPCREATESTRUCT) lParam) -> hInstance, NULL); @@ -205,7 +205,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN btn = CreateWindow("button", acp(MSGTR_PREFERENCES_Cache), WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, - 10, 222, 90, 25, + 10, 222, 100, 25, hwnd, (HMENU) ID_CACHE, ((LPCREATESTRUCT) lParam) -> hInstance, NULL); @@ -213,7 +213,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN btn = CreateWindow("button", acp(MSGTR_PREFERENCES_AutoSync), WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, - 240, 222, 110, 25, hwnd, + 225, 222, 185, 25, hwnd, (HMENU) ID_AUTOSYNC, ((LPCREATESTRUCT) lParam) -> hInstance, NULL); @@ -310,7 +310,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN edit1 = CreateWindowEx(WS_EX_CLIENTEDGE, "edit", "cache", WS_CHILD | WS_VISIBLE | WS_DISABLED | ES_LEFT | ES_AUTOHSCROLL, - 105, 225, 60, 20, hwnd, + 115, 225, 60, 20, hwnd, (HMENU) ID_EDIT1, ((LPCREATESTRUCT) lParam) -> hInstance, NULL); @@ -329,7 +329,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN edit2 = CreateWindowEx(WS_EX_CLIENTEDGE, "edit", "autosync", WS_CHILD | WS_VISIBLE | WS_DISABLED | ES_LEFT | ES_AUTOHSCROLL, - 355, 225, 40, 20, hwnd, + 355, 247, 40, 20, hwnd, (HMENU) ID_EDIT2, ((LPCREATESTRUCT) lParam) -> hInstance, NULL); @@ -338,7 +338,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN updown2 = CreateUpDownControl(WS_CHILD | WS_VISIBLE | WS_DISABLED | UDS_SETBUDDYINT | UDS_ARROWKEYS | UDS_NOTHOUSANDS, - 395, 225, 20, 20, hwnd, + 395, 247, 20, 20, hwnd, ID_UPDOWN2, ((LPCREATESTRUCT) lParam) -> hInstance, (HWND)edit2, 0, 0, 0);

1 0

r36764 - trunk/gui/dialog/pixmaps/audio.xpm
by ib 27 Jan '14

27 Jan '14

Author: ib Date: Mon Jan 27 15:22:30 2014 New Revision: 36764 Log: Replace pixmap for audio tracks by a better one. It fits the one for muted audio. Modified: trunk/gui/dialog/pixmaps/audio.xpm Modified: trunk/gui/dialog/pixmaps/audio.xpm ============================================================================== --- trunk/gui/dialog/pixmaps/audio.xpm Mon Jan 27 15:21:26 2014 (r36763) +++ trunk/gui/dialog/pixmaps/audio.xpm Mon Jan 27 15:22:30 2014 (r36764) @@ -1,139 +1,183 @@ /* XPM */ static const char *const audio_xpm[] = { -"16 16 119 2 0 0", -" c #8A8986", -"! c #5F5E5D", -"# c #707070", -"$ c #8D8D8D", -"% c #787877", -"& c #676766", -"' c #7F7E7C", -"( c #585758", -") c #C4C4C3", -"* c #9E9D9B", -"+ c #7A7A79", -", c #6E6E6D", -"- c #686867", -". c #6A6A69", -"/ c #737473", -"0 c #696866", -"1 c #454545", -"2 c #C1C1C0", -"3 c #BBBBBA", -"4 c #70706F", -"5 c #5B5B5B", -"6 c #505050", -"7 c #4B4B4B", -"8 c #4E4E4E", -"9 c #5C5C5C", -": c #838382", -"; c #40403E", -"< c #2E2D2E", -"= c #969595", -"> c #A5A4A2", -"? c #7B7B7B", -"@ c #646464", -"A c #585858", -"B c #4D4D4D", -"C c #535353", -"D c #6B6B6A", -"E c #81817F", -"F c #272626", -"G c #3D3D3D", -"H c #A8A7A5", -"I c #939292", -"J c #777777", -"K c #757575", -"L c #B0B0B0", -"M c #CACACA", -"N c #6A6A6A", -"O c #565656", -"P c #666666", -"Q c #878784", -"R c #1D1D1D", -"S c #535252", -"T c #AFADAA", -"U c #9D9D9D", -"V c #8E8E8E", -"W c #C0C0C0", -"X c #CFCFCF", -"Y c #949494", -"Z c #656565", -"[ c #686868", -"] c #747474", -"^ c #A8A8A6", -"_ c #171717", -"` c #696867", -"a c #B1B0AE", -"b c #AAAAAA", -"c c #767676", -"d c #979797", -"e c #989898", -"f c #808080", -"g c #797979", -"h c #D1D1D0", -"i c #777675", -"j c #C5C4C3", -"k c #BCBCBC", -"l c #595959", -"m c #5A5A5A", -"n c #6F6F6F", -"o c #7F7F7F", -"p c #828382", -"q c #909090", -"r c #8F8F8F", -"s c #A4A4A4", -"t c #CBCAC8", -"u c #727170", -"v c #D3D2D1", -"w c #9F9F9F", -"x c #787878", -"y c #A1A1A1", -"z c #A8A8A8", -"{ c #B7B7B5", -"| c #4B4B4A", -"} c #D3D2CF", -"~ c #D5D5D5", -" ! c #D1D1D1", -"!! c #BABABA", -"#! c #B5B5B5", -"$! c #BDBDBD", -"%! c #B8B8B8", -"&! c #B7B6B6", -"'! c #BAB9B6", -"(! c #CDCDCB", -")! c #DEDEDE", -"*! c #DCDCDC", -"+! c #E8E8E8", -",! c #E1E1E1", -"-! c #CCCCCC", -".! c #C7C7C6", -"/! c #C1BFBC", -"0! c #9D9B99", -"1! c #CFCDCB", -"2! c #DCDCDB", -"3! c #EFEFEE", -"4! c #E8E8E7", -"5! c #D2D1CF", -"6! c #AAA8A5", -"7! c #4B4B49", -"8! c #82827F", -"9! c #979694", -":! c None", -":!:!:!:!:!:!:!:!:!:!:!:!:!:!:!:!", -":!:!:!:!:!:!:!:!:!:!:!:!:!:!:!:!", -":!:!:!:!:! ! # $ % & :!:!:!:!:!", -":!:!:!:!' ( ) * + , - . / :!:!:!", -":!:!:!0 1 2 3 4 5 6 7 8 9 : :!:!", -":!:!; < = > ? @ A B 7 B C D E :!", -":!:!F G H I J K L M N O A P Q :!", -":!:!R S T U P V W X Y Z [ ] ^ :!", -":!:!_ ` a b C c d e f ? g $ h :!", -":!:!:!i j k l m n o p q r s t :!", -":!:!:!u v M w 6 C x y z b { :!:!", -":!:!:!| } ~ !!!L #!$!%!&!'!:!:!", -":!:!:!:!^ (!)!*!+!,!-!.!/!:!:!:!", -":!:!:!:!:!0!1!2!3!4!5!6!:!:!:!:!", -":!:!:!:!:!:!7!8!9!E :!:!:!:!:!:!", -":!:!:!:!:!:!:!:!:!:!:!:!:!:!:!:!" +"16 16 163 2 0 0", +" c #5C5958", +"! c #72706F", +"# c #7F7D7D", +"$ c #888787", +"% c #8C8B8B", +"& c #676563", +"' c #817F7F", +"( c #817F7E", +") c #9D9B9A", +"* c #A4A2A1", +"+ c #999796", +", c #8A8887", +"- c #7C7A79", +". c #737170", +"/ c #6F6D6C", +"0 c #676564", +"1 c #7A7978", +"2 c #A5A4A3", +"3 c #DBDADA", +"4 c #B9B8B8", +"5 c #ADACAC", +"6 c #BDBCBB", +"7 c #CDCCCC", +"8 c #929190", +"9 c #858382", +": c #81807F", +"; c #959493", +"< c #5B5857", +"= c #777675", +"> c #B0AEAD", +"? c #CECDCC", +"@ c #9D9C9B", +"A c #9F9E9D", +"B c #969595", +"C c #8F8D8C", +"D c #939190", +"E c #716F6E", +"F c #A09F9E", +"G c #888786", +"H c #777573", +"I c #706E6D", +"J c #D5D5D4", +"K c #A7A6A5", +"L c #B3B2B1", +"M c #AFAEAD", +"N c #A8A7A7", +"O c #9C9B9B", +"P c #8A8989", +"Q c #B4B2B1", +"R c #807E7D", +"S c #8A8988", +"T c #ABAAA9", +"U c #615E5C", +"V c #C8C7C7", +"W c #959392", +"X c #898887", +"Y c #B5B4B4", +"Z c #BDBDBC", +"[ c #B4B3B2", +"] c #A9A8A7", +"^ c #999897", +"_ c #828080", +"` c #C4C3C2", +"a c #8B8988", +"b c #696765", +"c c #524F4E", +"d c #787674", +"e c #DAD9D9", +"f c #8C8A89", +"g c #9B9A99", +"h c #BEBEBD", +"i c #B0AFAE", +"j c #A1A1A0", +"k c #8B8A8A", +"l c #9A9897", +"m c #595655", +"n c #696766", +"o c #545150", +"p c #8B8A88", +"q c #BAB8B8", +"r c #5F5C5B", +"s c #878584", +"t c #C8C8C8", +"u c #B0B0B1", +"v c #A2A3A3", +"w c #98999A", +"x c #8A8B8C", +"y c #9E9D9D", +"z c #A09E9D", +"{ c #464240", +"| c #4E4B49", +"} c #575453", +"~ c #545250", +" ! c #918F8E", +"!! c #A8A6A5", +"#! c #403B39", +"$! c #433F3D", +"%! c #848180", +"&! c #D1D0D1", +"'! c #C1C1C1", +"(! c #A6A7A7", +")! c #909293", +"*! c #838688", +"+! c #A1A1A1", +",! c #3A3634", +"-! c #494544", +".! c #4D4A48", +"/! c #666361", +"0! c #858281", +"1! c #D7D6D6", +"2! c #CAC9CA", +"3! c #ACADAE", +"4! c #ACACAC", +"5! c #A4A3A2", +"6! c #8D8C8C", +"7! c #B0B0AF", +"8! c #302B29", +"9! c #686564", +":! c #CFCECD", +";! c #BAB9B9", +"<! c #CAC9C9", +"=! c #C3C3C2", +">! c #A9A9A9", +"?! c #939596", +"@! c #939495", +"A! c #838282", +"B! c #7F7E7D", +"C! c #2F2A28", +"D! c #B9B7B7", +"E! c #B8B8B7", +"F! c #B9B8B7", +"G! c #B4B4B3", +"H! c #ADACAB", +"I! c #8F9192", +"J! c #848688", +"K! c #4A4745", +"L! c #6D6B69", +"M! c #CCCBCB", +"N! c #A1A09F", +"O! c #A9A9A8", +"P! c #A6A5A5", +"Q! c #908F8F", +"R! c #8B8B8C", +"S! c #A7A5A5", +"T! c #747271", +"U! c #312D2A", +"V! c #53504F", +"W! c #C7C7C6", +"X! c #91908F", +"Y! c #8F8E8D", +"Z! c #6B6968", +"[! c #34302E", +"]! c #4F4C4B", +"^! c #5C5857", +"_! c #9F9D9C", +"`! c #969493", +"a! c #6F6C6B", +"b! c #636160", +"c! c #423F3D", +"d! c #4C4947", +"e! c #54514F", +"f! c #585554", +"g! c None", +"g!g!g!g!g!g!g! ! # $ % g!g!g!g!", +"g!g!g!g!g!g!& ' ( ) * + , g!g!g!", +"g!g!- . / 0 1 2 3 4 5 6 7 8 g!g!", +"g!9 : ; < = > ? @ A B $ C ? D g!", +"E F G H I C J K L M N O P D Q g!", +"R S T U I V W X Y Z [ ] ^ _ ` a ", +"b ! F c d e f [ g 7 h i j k ] l ", +"m n o p q r s b t u v w x y z ", +"{ | } ~ !!!#!$!%!&!'!(!)!*!+!+ ", +"g!,!-!.!9 [ /!0!1!2!3!4!5!6!7!9 ", +"g!g!8!$!9!:!;!<!<!=!>!?!@!A!L B!", +"g!g!g!C! D!T E!F!G!H!I!J!O C g!", +"g!g!g!g!K!L!M!N!O!P!y Q!R!S!T!g!", +"g!g!g!g!U!V!d W!2 X!Y!K A Z!g!g!", +"g!g!g!g!g![!]!^!a _!`!a!b!g!g!g!", +"g!g!g!g!g!g!g!c!d!e!f!g!g!g!g!g!" };

1 0

r36763 - trunk/gui/dialog/pixmaps/sound.xpm
by ib 27 Jan '14

27 Jan '14

Author: ib Date: Mon Jan 27 15:21:26 2014 New Revision: 36763 Log: Replace pixmap for muted audio by a better one. Modified: trunk/gui/dialog/pixmaps/sound.xpm Modified: trunk/gui/dialog/pixmaps/sound.xpm ============================================================================== --- trunk/gui/dialog/pixmaps/sound.xpm Mon Jan 27 15:10:05 2014 (r36762) +++ trunk/gui/dialog/pixmaps/sound.xpm Mon Jan 27 15:21:26 2014 (r36763) @@ -1,140 +1,208 @@ /* XPM */ -static const char * const sound_xpm[] = { -"16 16 121 2", -" c None", -". c #939CA9", -"+ c #89919F", -"@ c #A6AEBA", -"# c #99A0AC", -"$ c #5B6576", -"% c #1A202C", -"& c #1E283A", -"* c #141F32", -"= c #9CA3AF", -"- c #626C7C", -"; c #505866", -"> c #1A2029", -", c #1D232B", -"' c #1F2838", -") c #263248", -"! c #182233", -"~ c #B9BFC8", -"{ c #6D7585", -"] c #181E26", -"^ c #1D222B", -"/ c #1D232C", -"( c #26334B", -"_ c #253149", -": c #A0AAB8", -"< c #888F9B", -"[ c #131823", -"} c #1C212A", -"| c #1F242B", -"1 c #1F242A", -"2 c #233047", -"3 c #293854", -"4 c #4F5E77", -"5 c #525C6A", -"6 c #282F3B", -"7 c #1A212A", -"8 c #1E232B", -"9 c #1F232A", -"0 c #273040", -"a c #4A5B77", -"b c #293650", -"c c #2F3F5E", -"d c #53637E", -"e c #151C28", -"f c #1C2129", -"g c #20242C", -"h c #232830", -"i c #7485A0", -"j c #697C9B", -"k c #43536E", -"l c #314260", -"m c #6F84A1", -"n c #676E79", -"o c #222B3B", -"p c #222935", -"q c #20252D", -"r c #4B5B74", -"s c #879AB3", -"t c #596E92", -"u c #354259", -"v c #394A69", -"w c #687EA2", -"x c #4A5872", -"y c #364153", -"z c #303B51", -"A c #344054", -"B c #7F8DA4", -"C c #5C7296", -"D c #3E506F", -"E c #4D5A6E", -"F c #63799A", -"G c #323A46", -"H c #445573", -"I c #36445C", -"J c #36445B", -"K c #37455D", -"L c #425169", -"M c #45526A", -"N c #27354D", -"O c #1D2433", -"P c #A6B6CA", -"Q c #5C6F8F", -"R c #242B38", -"S c #323F56", -"T c #3F4F68", -"U c #44536C", -"V c #53617A", -"W c #6C7A92", -"X c #B0BBCC", -"Y c #9EA7B8", -"Z c #C5CDDA", -"` c #6E809B", -" . c #212935", -".. c #151A23", -"+. c #293344", -"@. c #44526A", -"#. c #617087", -"$. c #8C98A9", -"%. c #B0B8C4", -"&. c #C9CED7", -"*. c #C5CCD8", -"=. c #79879E", -"-. c #2B3648", -";. c #121824", -">. c #1F232C", -",. c #626F87", -"'. c #4D5B74", -"). c #C0C6D1", -"!. c #C7CBD0", -"~. c #BAC3D0", -"{. c #8592A6", -"]. c #222830", -"^. c #7B8495", -"/. c #778195", -"(. c #B2B8C2", -"_. c #B3B8BF", -":. c #49535F", -"<. c #1D2229", -"[. c #252B30", -"}. c #1F252C", -"|. c #1A1C20", -" ", -" . + @ # ", -" $ % & * = - ", -" ; > , ' ) ! ~ ", -" { ] ^ , / ( _ : ", -" < [ } | 1 ' 2 3 4 5 ", -" 6 7 8 9 0 a b c d ", -" 6 e f g h i j k l m ", -" n o p q r s t u v w x ", -" y z A A B C D E F G H ", -" I J K L M N O P Q R S ", -" T U V W X Y Z ` ...+. ", -" @.#.$.%.&.*.=.-.;.>. ", -" ,.'.).!.~.{.]. ", -" ^./.(._.:.<. ", -" [.}.|. "}; +static const char *const sound_xpm[] = { +"16 16 188 2 0 0", +" c #8C8B8B", +"! c #888787", +"# c #7F7D7D", +"$ c #72706F", +"% c #5C5958", +"& c #8A8887", +"' c #999796", +"( c #A4A2A1", +") c #9D9B9A", +"* c #817F7E", +"+ c #817F7F", +", c #676563", +"- c #929190", +". c #CDCCCC", +"/ c #BDBCBB", +"0 c #ADACAC", +"1 c #B9B8B8", +"2 c #DBDADA", +"3 c #A5A4A3", +"4 c #7A7978", +"5 c #676564", +"6 c #6F6D6C", +"7 c #737170", +"8 c #7C7A79", +"9 c #939190", +": c #CECDCC", +"; c #8F8D8C", +"< c #969595", +"= c #9F9E9D", +"> c #9D9C9B", +"? c #B0AEAD", +"@ c #777675", +"A c #5B5857", +"B c #959493", +"C c #81807F", +"D c #858382", +"E c #B4B2B1", +"F c #8A8989", +"G c #9C9B9B", +"H c #A8A7A7", +"I c #AFAEAD", +"J c #B3B2B1", +"K c #A7A6A5", +"L c #D5D5D4", +"M c #706E6D", +"N c #777573", +"O c #888786", +"P c #A09F9E", +"Q c #716F6E", +"R c #8B8988", +"S c #C4C3C2", +"T c #828080", +"U c #999897", +"V c #A9A8A7", +"W c #B4B3B2", +"X c #BDBDBC", +"Y c #B5B4B4", +"Z c #898887", +"[ c #959392", +"] c #C8C7C7", +"^ c #615E5C", +"_ c #ABAAA9", +"` c #8A8988", +"a c #807E7D", +"b c #9A9897", +"c c #8B8A8A", +"d c #A1A1A0", +"e c #B0AFAE", +"f c #BEBEBD", +"g c #9B9A99", +"h c #8C8A89", +"i c #DAD9D9", +"j c #787674", +"k c #524F4E", +"l c #696765", +"m c #A09E9D", +"n c #9E9D9D", +"o c #8A8B8C", +"p c #98999A", +"q c #A2A3A3", +"r c #B0B0B1", +"s c #C8C8C8", +"t c #ADA5A4", +"u c #CD9C98", +"v c #CB8A86", +"w c #BC8C88", +"x c #A6A09F", +"y c #5F5C5B", +"z c #595655", +"{ c #A1A1A1", +"| c #838688", +"} c #909293", +"~ c #A6A7A7", +" ! c #C1C1C1", +"!! c #D1D0D1", +"#! c #898786", +"$! c #BE9E9C", +"%! c #C14E48", +"&! c #C34C46", +"'! c #C54F48", +"(! c #C2524C", +")! c #BBA09E", +"*! c #5D5755", +"+! c #B0B0AF", +",! c #8D8C8C", +"-! c #A4A3A2", +".! c #ACACAC", +"/! c #ACADAE", +"0! c #CAC9CA", +"1! c #E4DCDB", +"2! c #C84E48", +"3! c #E19995", +"4! c #E39793", +"5! c #D44F49", +"6! c #E6A09C", +"7! c #DD908C", +"8! c #C9544E", +"9! c #7F7E7D", +":! c #838282", +";! c #939495", +"<! c #939596", +"=! c #A9A9A9", +">! c #C3C3C2", +"?! c #DFA4A0", +"@! c #D64F46", +"A! c #E99894", +"B! c #FEFDFD", +"C! c #F3C7C5", +"D! c #FEFDFC", +"E! c #D98783", +"F! c #DCA29F", +"G! c #848688", +"H! c #8F9192", +"I! c #ADACAB", +"J! c #B4B4B3", +"K! c #E3938D", +"L! c #E25B43", +"M! c #DE3F23", +"N! c #F3C2B8", +"O! c #FFFFFF", +"P! c #E9B5AC", +"Q! c #DD3D23", +"R! c #E25943", +"S! c #DF9792", +"T! c #747271", +"U! c #A7A5A5", +"V! c #8B8B8C", +"W! c #908F8F", +"X! c #A6A5A5", +"Y! c #E0A29E", +"Z! c #DE4226", +"[! c #ED9D82", +"]! c #EABDAB", +"^! c #EA9377", +"_! c #DE3F27", +"`! c #E5A7A4", +"a! c #6B6968", +"b! c #8F8E8D", +"c! c #91908F", +"d! c #CCC4C3", +"e! c #DF4734", +"f! c #E88571", +"g! c #DB856F", +"h! c #DF5015", +"i! c #EA9478", +"j! c #D87668", +"k! c #E04B3B", +"l! c #636160", +"m! c #6F6C6B", +"n! c #969493", +"o! c #9F9D9C", +"p! c #8C8988", +"q! c #CBACA5", +"r! c #E15035", +"s! c #DC3719", +"t! c #DC3A19", +"u! c #DC3619", +"v! c #E1533A", +"w! c #ECC5BE", +"x! c #585554", +"y! c #54514F", +"z! c #4C4947", +"{! c #4F4B49", +"|! c #C9B9B4", +"}! c #EEBAA7", +"~! c #EBA691", +" # c #EEBAA8", +"!# c None", +"!#!#!#!# ! # $ % !#!#!#!#!#!#!#", +"!#!#!#& ' ( ) * + , !#!#!#!#!#!#", +"!#!#- . / 0 1 2 3 4 5 6 7 8 !#!#", +"!#9 : ; ! < = > : ? @ A B C D !#", +"!#E 9 F G H I J K L ; M N O P Q ", +"R S T U V W X Y Z [ ] M ^ _ ` a ", +"b V c d e f . g W h i j k P $ l ", +"m n o p q r s l h t u v w x y z ", +"' { | } ~ !!!#!$!%!&!'!&!(!)!*!", +"D +!,!-!.!/!0!1!2!3!4!5!6!7!8!!#", +"9!J :!;!<!=!>!?!@!A!B!C!D!E!@!F!", +"!#; G G!H!I!J!K!L!M!N!O!P!Q!R!S!", +"!#T!U!V!W!n X!Y!Z![!D!]!B!^!_!`!", +"!#!#a!= K b!c!d!e!f!g!h!i!j!k!!#", +"!#!#!#l!m!n!o!p!q!r!s!t!u!v!w!!#", +"!#!#!#!#!#x!y!z!{!|!}!~! #!#!#!#" +};

1 0

r36762 - in trunk/gui/dialog: menu.c pixmaps/video.xpm
by ib 27 Jan '14

27 Jan '14

Author: ib Date: Mon Jan 27 15:10:05 2014 New Revision: 36762 Log: Add new video pixmap. Add it to menu entry "video track" which hasn't a pixmap so far. Added: trunk/gui/dialog/pixmaps/video.xpm Modified: trunk/gui/dialog/menu.c Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Mon Jan 27 15:04:13 2014 (r36761) +++ trunk/gui/dialog/menu.c Mon Jan 27 15:10:05 2014 (r36762) @@ -84,6 +84,7 @@ #include "pixmaps/chapter.xpm" #include "pixmaps/dolby.xpm" #include "pixmaps/audio.xpm" +#include "pixmaps/video.xpm" #endif #ifdef CONFIG_TV #include "pixmaps/tv.xpm" @@ -668,7 +669,7 @@ GtkWidget * CreatePopUpMenu( void ) if ( c > 1 ) { - SubMenu=AddSubMenu( window1, (const char*)empty_xpm, Menu,MSGTR_MENU_VideoTrack ); + SubMenu=AddSubMenu( window1, (const char*)video_xpm, Menu,MSGTR_MENU_VideoTrack ); for ( i=0;i < MAX_V_STREAMS;i++ ) if ( demuxer->v_streams[i] ) { Added: trunk/gui/dialog/pixmaps/video.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/dialog/pixmaps/video.xpm Mon Jan 27 15:10:05 2014 (r36762) @@ -0,0 +1,121 @@ +/* XPM */ +static const char *const video_xpm[] = { +"16 16 101 2 0 0", +" c #535355", +"! c #6D6D6E", +"# c #929293", +"$ c #49494B", +"% c #6A6A6B", +"& c #818182", +"' c #AAAAAB", +"( c #D3D3D4", +") c #BDBEBF", +"* c #7C7C7E", +"+ c #DADBDC", +", c #69696B", +"- c #666668", +". c #949495", +"/ c #B2B2B3", +"0 c #98999A", +"1 c #B3B3B5", +"2 c #EFF0F1", +"3 c #C0C0C2", +"4 c #5F5F61", +"5 c #A5A6A7", +"6 c #DFE1E2", +"7 c #A4A5A6", +"8 c #5A5B5D", +"9 c #6B6B6D", +": c #E7E7E8", +"; c #A8A8A9", +"< c #707173", +"= c #D6D7D9", +"> c #E1E2E3", +"? c #8A8B8D", +"@ c #727375", +"A c #A8A9AB", +"B c #898B8C", +"C c #48484A", +"D c #2C2C2D", +"E c #B5B5B7", +"F c #CDCED0", +"G c #8E8F91", +"H c #565759", +"I c #626364", +"J c #303031", +"K c #3B3B3D", +"L c #414243", +"M c #252526", +"N c #222223", +"O c #232324", +"P c #616162", +"Q c #212122", +"R c #F7F8F8", +"S c #AEAEAF", +"T c #A3A3A4", +"U c #ECEDED", +"V c #CCCDCE", +"W c #8B8B8D", +"X c #EAEBEC", +"Y c #E2E2E3", +"Z c #838385", +"[ c #EDEEEE", +"] c #8F9091", +"^ c #D1D1D2", +"_ c #202021", +"` c #C4C5C6", +"a c #7D7D7F", +"b c #C6C7C8", +"c c #656667", +"d c #E4E4E5", +"e c #DFE0E1", +"f c #636365", +"g c #CDCECF", +"h c #EDEEEF", +"i c #78787A", +"j c #A9A9AA", +"k c #F8F8F9", +"l c #7D7D7E", +"m c #494A4C", +"n c #464648", +"o c #4B4B4D", +"p c #464749", +"q c #48494B", +"r c #4C4C4E", +"s c #47484A", +"t c #474749", +"u c #79797B", +"v c #222222", +"w c #7F8081", +"x c #595A5C", +"y c #818183", +"z c #636466", +"{ c #1F1F1F", +"| c #828486", +"} c #6D6F71", +"~ c #1E1E1E", +" ! c #868789", +"!! c #78797B", +"#! c #1D1D1D", +"$! c #8D9092", +"%! c #87898B", +"&! c #1C1C1C", +"'! c #1C1B1C", +"(! c None", +"(!(!(!(!(!(!(!(!(!(!(! ! # $ (!", +"(!(!(!(!(!(! % & ' ( ) * + , (!", +"(!(!- . / 0 1 2 3 4 5 6 7 8 9 (!", +"(!: ; < = > ? @ A B C D (!(!(!(!", +"(!E F G H I J (!(!(!(!(!(!(!(!(!", +"(!K L D M N O M P (!(!(!(!(!(!(!", +"(!Q R S T U V W X Y Z + [ ] ^ N ", +"(!_ ` a 2 b c d e f g h i j k _ ", +"(!N l m n m o p q r s t r C u v ", +"(!Q w x x x x x x x x x x x w Q ", +"(!_ y z z z z z z z z z z z y _ ", +"(!{ | } } } } } } } } } } } | { ", +"(!~ !!!!!!!!!!!!!!!!!!!!!!! !~ ", +"(!#!$!%!%!%!%!%!%!%!%!%!%!%!$!#!", +"(!(!&!'!'!'!'!'!'!'!'!'!'!'!&!(!", +"(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!(!" +};

1 0

r36761 - in trunk/gui/dialog: menu.c pixmaps/audio.xpm pixmaps/audiolang.xpm
by ib 27 Jan '14

27 Jan '14

Author: ib Date: Mon Jan 27 15:04:13 2014 New Revision: 36761 Log: Add new audio pixmap. Replace audiolang pixmap by new one. As a result, audiolang.xpm isn't used any longer and can be removed. Added: trunk/gui/dialog/pixmaps/audio.xpm Deleted: trunk/gui/dialog/pixmaps/audiolang.xpm Modified: trunk/gui/dialog/menu.c Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Mon Jan 27 14:41:13 2014 (r36760) +++ trunk/gui/dialog/menu.c Mon Jan 27 15:04:13 2014 (r36761) @@ -83,7 +83,7 @@ #include "pixmaps/playdvd.xpm" #include "pixmaps/chapter.xpm" #include "pixmaps/dolby.xpm" -#include "pixmaps/audiolang.xpm" +#include "pixmaps/audio.xpm" #endif #ifdef CONFIG_TV #include "pixmaps/tv.xpm" @@ -523,7 +523,7 @@ GtkWidget * CreatePopUpMenu( void ) MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, DVDChapterMenu,MSGTR_MENU_None,evNone ); gtk_widget_set_sensitive( MenuItem,FALSE ); } - DVDAudioLanguageMenu=AddSubMenu( window1, (const char*)audiolang_xpm, DVDSubMenu,MSGTR_MENU_AudioLanguages ); + DVDAudioLanguageMenu=AddSubMenu( window1, (const char*)audio_xpm, DVDSubMenu,MSGTR_MENU_AudioLanguages ); if ( guiInfo.AudioStreams && ( guiInfo.StreamType == STREAMTYPE_DVD ) ) { char tmp[64]; int i, id = demuxer ? demuxer->audio->id : audio_id; @@ -651,7 +651,7 @@ GtkWidget * CreatePopUpMenu( void ) if ( c > 1 ) { - SubMenu=AddSubMenu( window1, (const char*)audiolang_xpm, Menu,MSGTR_MENU_AudioTrack ); + SubMenu=AddSubMenu( window1, (const char*)audio_xpm, Menu,MSGTR_MENU_AudioTrack ); for ( i=0;i < MAX_A_STREAMS;i++ ) if ( demuxer->a_streams[i] ) { Added: trunk/gui/dialog/pixmaps/audio.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/dialog/pixmaps/audio.xpm Mon Jan 27 15:04:13 2014 (r36761) @@ -0,0 +1,139 @@ +/* XPM */ +static const char *const audio_xpm[] = { +"16 16 119 2 0 0", +" c #8A8986", +"! c #5F5E5D", +"# c #707070", +"$ c #8D8D8D", +"% c #787877", +"& c #676766", +"' c #7F7E7C", +"( c #585758", +") c #C4C4C3", +"* c #9E9D9B", +"+ c #7A7A79", +", c #6E6E6D", +"- c #686867", +". c #6A6A69", +"/ c #737473", +"0 c #696866", +"1 c #454545", +"2 c #C1C1C0", +"3 c #BBBBBA", +"4 c #70706F", +"5 c #5B5B5B", +"6 c #505050", +"7 c #4B4B4B", +"8 c #4E4E4E", +"9 c #5C5C5C", +": c #838382", +"; c #40403E", +"< c #2E2D2E", +"= c #969595", +"> c #A5A4A2", +"? c #7B7B7B", +"@ c #646464", +"A c #585858", +"B c #4D4D4D", +"C c #535353", +"D c #6B6B6A", +"E c #81817F", +"F c #272626", +"G c #3D3D3D", +"H c #A8A7A5", +"I c #939292", +"J c #777777", +"K c #757575", +"L c #B0B0B0", +"M c #CACACA", +"N c #6A6A6A", +"O c #565656", +"P c #666666", +"Q c #878784", +"R c #1D1D1D", +"S c #535252", +"T c #AFADAA", +"U c #9D9D9D", +"V c #8E8E8E", +"W c #C0C0C0", +"X c #CFCFCF", +"Y c #949494", +"Z c #656565", +"[ c #686868", +"] c #747474", +"^ c #A8A8A6", +"_ c #171717", +"` c #696867", +"a c #B1B0AE", +"b c #AAAAAA", +"c c #767676", +"d c #979797", +"e c #989898", +"f c #808080", +"g c #797979", +"h c #D1D1D0", +"i c #777675", +"j c #C5C4C3", +"k c #BCBCBC", +"l c #595959", +"m c #5A5A5A", +"n c #6F6F6F", +"o c #7F7F7F", +"p c #828382", +"q c #909090", +"r c #8F8F8F", +"s c #A4A4A4", +"t c #CBCAC8", +"u c #727170", +"v c #D3D2D1", +"w c #9F9F9F", +"x c #787878", +"y c #A1A1A1", +"z c #A8A8A8", +"{ c #B7B7B5", +"| c #4B4B4A", +"} c #D3D2CF", +"~ c #D5D5D5", +" ! c #D1D1D1", +"!! c #BABABA", +"#! c #B5B5B5", +"$! c #BDBDBD", +"%! c #B8B8B8", +"&! c #B7B6B6", +"'! c #BAB9B6", +"(! c #CDCDCB", +")! c #DEDEDE", +"*! c #DCDCDC", +"+! c #E8E8E8", +",! c #E1E1E1", +"-! c #CCCCCC", +".! c #C7C7C6", +"/! c #C1BFBC", +"0! c #9D9B99", +"1! c #CFCDCB", +"2! c #DCDCDB", +"3! c #EFEFEE", +"4! c #E8E8E7", +"5! c #D2D1CF", +"6! c #AAA8A5", +"7! c #4B4B49", +"8! c #82827F", +"9! c #979694", +":! c None", +":!:!:!:!:!:!:!:!:!:!:!:!:!:!:!:!", +":!:!:!:!:!:!:!:!:!:!:!:!:!:!:!:!", +":!:!:!:!:! ! # $ % & :!:!:!:!:!", +":!:!:!:!' ( ) * + , - . / :!:!:!", +":!:!:!0 1 2 3 4 5 6 7 8 9 : :!:!", +":!:!; < = > ? @ A B 7 B C D E :!", +":!:!F G H I J K L M N O A P Q :!", +":!:!R S T U P V W X Y Z [ ] ^ :!", +":!:!_ ` a b C c d e f ? g $ h :!", +":!:!:!i j k l m n o p q r s t :!", +":!:!:!u v M w 6 C x y z b { :!:!", +":!:!:!| } ~ !!!L #!$!%!&!'!:!:!", +":!:!:!:!^ (!)!*!+!,!-!.!/!:!:!:!", +":!:!:!:!:!0!1!2!3!4!5!6!:!:!:!:!", +":!:!:!:!:!:!7!8!9!E :!:!:!:!:!:!", +":!:!:!:!:!:!:!:!:!:!:!:!:!:!:!:!" +};

1 0