comparison gui/interface.c @ 36694:eed2fb870f43

Rename symbolic constants of GUI help message texts. Create a kind of GUI namespace and don't add place or kind of usage to the name unless it's advantageous. This reduces the amount of definitions as well. Arrange them alphabetically.
author ib
date Wed, 05 Feb 2014 16:39:38 +0000
parents f8d0a552f7a5
children e788bcd9d49b
comparison
equal deleted inserted replaced
36693:44334c832149 36694:eed2fb870f43
137 skinName = strdup("default"); 137 skinName = strdup("default");
138 138
139 ret = skinRead(skinName); 139 ret = skinRead(skinName);
140 140
141 if (ret == -1 && strcmp(skinName, "default") != 0) { 141 if (ret == -1 && strcmp(skinName, "default") != 0) {
142 mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_SKIN_SKINCFG_SelectedSkinNotFound, skinName); 142 mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_SkinCfgSelectedNotFound, skinName);
143 143
144 skinName = strdup("default"); 144 skinName = strdup("default");
145 ret = skinRead(skinName); 145 ret = skinRead(skinName);
146 } 146 }
147 147
148 switch (ret) { 148 switch (ret) {
149 case -1: 149 case -1:
150 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinNotFound, skinName); 150 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_SkinCfgNotFound, skinName);
151 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); 151 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
152 152
153 case -2: 153 case -2:
154 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinCfgError, skinName); 154 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_SkinCfgError, skinName);
155 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); 155 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
156 } 156 }
157 157
158 /* initialize windows */ 158 /* initialize windows */
159 159
298 vf_settings[0].name = strdup(str); 298 vf_settings[0].name = strdup(str);
299 vf_settings[0].attribs = NULL; 299 vf_settings[0].attribs = NULL;
300 vf_settings[1].name = NULL; 300 vf_settings[1].name = NULL;
301 } 301 }
302 302
303 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_AddingVideoFilter, str); 303 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_AddingVideoFilter, str);
304 } 304 }
305 305
306 /** 306 /**
307 * @brief Issue a command to the GUI. 307 * @brief Issue a command to the GUI.
308 * 308 *
472 } 472 }
473 } 473 }
474 } 474 }
475 475
476 if (!video_driver_list && !video_driver_list[0]) { 476 if (!video_driver_list && !video_driver_list[0]) {
477 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_IDFGCVD); 477 gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_VideoOutError);
478 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); 478 mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
479 } 479 }
480 480
481 { 481 {
482 int i = 0; 482 int i = 0;
684 btnSet(evForward10min, state); 684 btnSet(evForward10min, state);
685 btnSet(evBackward10min, state); 685 btnSet(evBackward10min, state);
686 btnSet(evSetMoviePosition, state); 686 btnSet(evSetMoviePosition, state);
687 687
688 if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3") && (((demuxer_t *)mpctx_get_demuxer(guiInfo.mpcontext))->file_format != DEMUXER_TYPE_MPEG_PS) && !gtkVfLAVC) { 688 if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3") && (((demuxer_t *)mpctx_get_demuxer(guiInfo.mpcontext))->file_format != DEMUXER_TYPE_MPEG_PS) && !gtkVfLAVC) {
689 gtkMessageBox(MSGBOX_FATAL, MSGTR_NEEDLAVC); 689 gtkMessageBox(MSGBOX_FATAL, MSGTR_GUI_MSG_DXR3NeedsLavc);
690 return False; 690 return False;
691 } 691 }
692 692
693 break; 693 break;
694 694
1112 { 1112 {
1113 if (guiInfo.Playing == GUI_STOP) 1113 if (guiInfo.Playing == GUI_STOP)
1114 return; 1114 return;
1115 1115
1116 if (subdata) { 1116 if (subdata) {
1117 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_DeletingSubtitles); 1117 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_RemovingSubtitle);
1118 1118
1119 sub_free(subdata); 1119 sub_free(subdata);
1120 subdata = NULL; 1120 subdata = NULL;
1121 vo_sub = NULL; 1121 vo_sub = NULL;
1122 1122
1140 } 1140 }
1141 } 1141 }
1142 } 1142 }
1143 1143
1144 if (name) { 1144 if (name) {
1145 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_LoadingSubtitles, name); 1145 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_LoadingSubtitle, name);
1146 1146
1147 subdata = sub_read_file(name, (guiInfo.sh_video ? guiInfo.sh_video->fps : 0)); 1147 subdata = sub_read_file(name, (guiInfo.sh_video ? guiInfo.sh_video->fps : 0));
1148 1148
1149 if (!subdata) 1149 if (!subdata)
1150 gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub, name); 1150 gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub, name);