Skip to content

V
vlc
Commit ede8b843 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/gui/wince: some more cleanup.

parent 09bb1577
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 291 deletions
modules/gui/wince/interface.cpp
View file @ ede8b843
......@@ -128,14 +128,15 @@ BOOL Interface::InitInstance( HINSTANCE hInstance, intf_thread_t *_p_intf )
wc.lpszClassName = _T("VLC WinCE");
if( !RegisterClass( &wc ) ) return FALSE;
#ifndef WS_OVERLAPPEDWINDOW
# define WS_OVERLAPPEDWINDOW 0xcf0000
int i_style = WS_VISIBLE;
#ifndef UNDER_CE
i_style |= WS_OVERLAPPEDWINDOW | WS_SIZEBOX;
#endif
// Create main window
hwndMain =
CreateWindow( _T("VLC WinCE"), _T("VLC media player"),
WS_OVERLAPPEDWINDOW|WS_SIZEBOX|WS_VISIBLE,
CreateWindow( _T("VLC WinCE"), _T("VLC media player"), i_style,
0, MENU_HEIGHT, CW_USEDEFAULT, CW_USEDEFAULT,
NULL, NULL, hInstance, (void *)this );
......@@ -154,7 +155,7 @@ FUNCTION:
PURPOSE:
Creates a menu bar.
***********************************************************************/
HWND CreateMenuBar( HWND hwnd, HINSTANCE hInst )
static HWND CreateMenuBar( HWND hwnd, HINSTANCE hInst )
{
#ifdef UNDER_CE
SHMENUBARINFO mbi;
......@@ -454,8 +455,8 @@ int CBaseWindow::CreateDialogBox( HWND hwnd, CBaseWindow *p_obj )
memset( p_dlg_template, 0, sizeof(DLGTEMPLATE) + sizeof(WORD) * 4 );
// these values are arbitrary, they won't be used normally anyhow
p_dlg_template->x = 34; p_dlg_template->y = 22;
p_dlg_template->cx = 144; p_dlg_template->cy = 75;
p_dlg_template->x = 0; p_dlg_template->y = 0;
p_dlg_template->cx = 300; p_dlg_template->cy = 300;
p_dlg_template->style =
DS_MODALFRAME|WS_POPUP|WS_CAPTION|WS_SYSMENU|WS_SIZEBOX;
......
modules/gui/wince/iteminfo.cpp
View file @ ede8b843
......@@ -85,10 +85,8 @@ LRESULT ItemInfoDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
memset( &mbi, 0, sizeof (SHMENUBARINFO) );
mbi.cbSize = sizeof (SHMENUBARINFO);
mbi.hwndParent = hwnd;
mbi.nToolBarId = IDR_DUMMYMENU;
mbi.dwFlags = SHCMBF_EMPTYBAR;
mbi.hInstRes = hInst;
mbi.nBmpId = 0;
mbi.cBmpImages = 0;
if( !SHCreateMenuBar(&mbi) )
{
......
modules/gui/wince/open.cpp
View file @ ede8b843
......@@ -114,10 +114,8 @@ LRESULT OpenDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
memset( &mbi, 0, sizeof(SHMENUBARINFO) );
mbi.cbSize = sizeof(SHMENUBARINFO);
mbi.hwndParent = hwnd;
mbi.nToolBarId = IDR_DUMMYMENU;
mbi.dwFlags = SHCMBF_EMPTYBAR;
mbi.hInstRes = hInst;
mbi.nBmpId = 0;
mbi.cBmpImages = 0;
if( !SHCreateMenuBar( &mbi ) )
{
......@@ -599,8 +597,11 @@ void OpenDialog::OnOk()
{
TCHAR psz_text[2048];
GetWindowText( mrl_combo, psz_text, 2048 ); // replace by ComboBox_GetText( mrl_combo, wUnicode, size )
mrl = SeparateEntries( psz_text );
GetWindowText( mrl_combo, psz_text, 2048 );
int i_args;
char **pp_args = vlc_parse_cmdline( _TOMB(psz_text), &i_args );
ComboBox_AddString( mrl_combo, psz_text );
if( ComboBox_GetCount( mrl_combo ) > 10 )
ComboBox_DeleteString( mrl_combo, 0 );
......@@ -612,18 +613,16 @@ void OpenDialog::OnOk()
FIND_ANYWHERE );
if( p_playlist == NULL ) return;
for( int i = 0; i < (int)mrl.size(); i++ )
for( int i = 0; i < i_args; i++ )
{
vlc_bool_t b_start = !i && i_open_arg;
playlist_item_t *p_item =
playlist_ItemNew( p_intf, (const char*)mrl[i].c_str(),
(const char *)mrl[i].c_str() );
playlist_ItemNew( p_intf, pp_args[i], pp_args[i] );
/* Insert options */
while( i + 1 < (int)mrl.size() &&
((const char *)mrl[i + 1].c_str())[0] == ':' )
while( i + 1 < i_args && pp_args[i + 1][0] == ':' )
{
playlist_ItemAddOption( p_item, mrl[i + 1].c_str() );
playlist_ItemAddOption( p_item, pp_args[i + 1] );
i++;
}
......@@ -648,6 +647,11 @@ void OpenDialog::OnOk()
//TogglePlayButton( PLAYING_S );
while( i_args-- )
{
free( pp_args[i_args] );
if( !i_args ) free( pp_args );
}
vlc_object_release( p_playlist );
}
......@@ -812,69 +816,3 @@ void OpenDialog::OnSubsFileSettings( HWND hwnd )
delete subsfile_dialog;
}
/*****************************************************************************
* Utility functions.
*****************************************************************************/
vector<string> SeparateEntries( TCHAR *entries )
{
vlc_bool_t b_quotes_mode = VLC_FALSE;
vector<string> entries_array;
TCHAR *entry = new TCHAR[ _tcslen(entries) + 1 ];
TCHAR *strToken = entries;
int length = _tcscspn( strToken, _T(" \t\r\n\"") );
*entry = 0;
while( strToken - entries < _tcslen(entries) )
{
_tcsncat( entry, strToken, length );
_tcsncat( entry, strToken + length, 1 );
if( !b_quotes_mode && strToken[length] == _T('\"') )
{
/* Enters quotes mode */
entry[ _tcslen(entry) - 1 ] = 0;
b_quotes_mode = VLC_TRUE;
}
else if( b_quotes_mode && strToken[length] == _T('\"') )
{
/* Finished the quotes mode */
entry[ _tcslen(entry) - 1 ] = 0;
if( _tcscmp( entry, _T("") ) != 0 )
{
entries_array.push_back( _TOMB(entry) );
}
*entry = 0;
b_quotes_mode = VLC_FALSE;
}
else if( !b_quotes_mode && strToken[length] != _T('\"') )
{
/* we found a non-quoted standalone string */
if( strToken + length - entries < _tcslen(entries) ||/*token.HasMoreTokens() ||*/ //FIX ME IF YOU CAN
strToken[length] == _T(' ') ||
strToken[length] == _T('\t') ||
strToken[length] == _T('\r') ||
strToken[length] == _T('\n') )
entry[ _tcslen(entry) - 1 ]/*strToken[length]*/ = 0;
if( _tcscmp( entry, _T("") ) != 0 )
{
entries_array.push_back( _TOMB(entry) );
}
*entry = 0;
}
else
{;}
strToken += length + 1;
length = _tcscspn( strToken, _T(" \t\r\n\"") );
}
if( _tcscmp( entry, _T("") ) != 0 )
{
entries_array.push_back( _TOMB(entry) );
}
delete [] entry;
return entries_array;
}
modules/gui/wince/playlist.cpp
View file @ ede8b843
......@@ -52,7 +52,6 @@
#define BUTTONWIDTH 0 // Width of the button images in the toolbar
#define BUTTONHEIGHT 0 // Height of the button images in the toolbar
#define ID_TOOLBAR 2000 // Identifier of the main tool bar
#define dwTBFontStyle TBSTYLE_BUTTON | TBSTYLE_CHECK | TBSTYLE_GROUP // style for toolbar buttons
enum
{
......@@ -71,7 +70,7 @@ enum
// Help strings
#define HELP_OPENPL _T("Open playlist")
#define HELP_SAVEPL _T("Save playlist")
#define HELP_SIMPLEADD _T("Simple Add")
#define HELP_ADDFILE _T("Add File")
#define HELP_ADDMRL _T("Add MRL")
#define HELP_DELETE _T("Delete selection")
#define HELP_INFOS _T("Item info")
......@@ -82,12 +81,12 @@ enum
#define HELP_REPEAT _T("Repeat one")
// The TBBUTTON structure contains information the toolbar buttons.
static TBBUTTON tbButton2[] =
static TBBUTTON tbButton2[] =
{
{0, ID_MANAGE_OPENPL, TBSTATE_ENABLED, TBSTYLE_BUTTON},
{1, ID_MANAGE_SAVEPL, TBSTATE_ENABLED, TBSTYLE_BUTTON},
{0, 0, TBSTATE_ENABLED, TBSTYLE_SEP},
{2, ID_MANAGE_SIMPLEADD, TBSTATE_ENABLED, TBSTYLE_BUTTON},
{2, ID_MANAGE_ADDFILE, TBSTATE_ENABLED, TBSTYLE_BUTTON},
{3, ID_MANAGE_ADDMRL, TBSTATE_ENABLED, TBSTYLE_BUTTON},
{4, ID_SEL_DELETE, TBSTATE_ENABLED, TBSTYLE_BUTTON},
{0, 0, TBSTATE_ENABLED, TBSTYLE_SEP},
......@@ -106,7 +105,7 @@ TCHAR * szToolTips2[] =
{
HELP_OPENPL,
HELP_SAVEPL,
HELP_SIMPLEADD,
HELP_ADDFILE,
HELP_ADDMRL,
HELP_DELETE,
HELP_INFOS,
......@@ -137,6 +136,104 @@ Playlist::Playlist( intf_thread_t *_p_intf, HINSTANCE _hInst )
b_need_update = VLC_TRUE;
}
/***********************************************************************
FUNCTION:
CreateMenuBar
PURPOSE:
Creates a menu bar.
***********************************************************************/
static HWND CreateMenuBar( HWND hwnd, HINSTANCE hInst )
{
#ifdef UNDER_CE
SHMENUBARINFO mbi;
memset( &mbi, 0, sizeof(SHMENUBARINFO) );
mbi.cbSize = sizeof(SHMENUBARINFO);
mbi.hwndParent = hwnd;
mbi.hInstRes = hInst;
mbi.nToolBarId = IDR_MENUBAR2;
if( !SHCreateMenuBar( &mbi ) )
{
MessageBox(hwnd, _T("SHCreateMenuBar Failed"), _T("Error"), MB_OK);
return 0;
}
TBBUTTONINFO tbbi;
tbbi.cbSize = sizeof(tbbi);
tbbi.dwMask = TBIF_LPARAM;
SendMessage( mbi.hwndMB, TB_GETBUTTONINFO, IDM_MANAGE, (LPARAM)&tbbi );
HMENU hmenu_file = (HMENU)tbbi.lParam;
RemoveMenu( hmenu_file, 0, MF_BYPOSITION );
SendMessage( mbi.hwndMB, TB_GETBUTTONINFO, IDM_SORT, (LPARAM)&tbbi );
HMENU hmenu_sort = (HMENU)tbbi.lParam;
RemoveMenu( hmenu_sort, 0, MF_BYPOSITION );
SendMessage( mbi.hwndMB, TB_GETBUTTONINFO, IDM_SEL, (LPARAM)&tbbi );
HMENU hmenu_sel = (HMENU)tbbi.lParam;
RemoveMenu( hmenu_sel, 0, MF_BYPOSITION );
#else
HMENU hmenu_file = CreatePopupMenu();
HMENU hmenu_sort = CreatePopupMenu();
HMENU hmenu_sel = CreatePopupMenu();
#endif
AppendMenu( hmenu_file, MF_STRING, ID_MANAGE_ADDFILE,
_T("&Add File...") );
AppendMenu( hmenu_file, MF_STRING, ID_MANAGE_ADDDIRECTORY,
_T("Add Directory...") );
AppendMenu( hmenu_file, MF_STRING, ID_MANAGE_ADDMRL,
_T("Add MRL...") );
AppendMenu( hmenu_file, MF_SEPARATOR, 0, 0 );
AppendMenu( hmenu_file, MF_STRING, ID_MANAGE_OPENPL,
_T("Open &Playlist") );
AppendMenu( hmenu_file, MF_STRING, ID_MANAGE_SAVEPL,
_T("Save Playlist") );
AppendMenu( hmenu_sort, MF_STRING, ID_SORT_TITLE,
_T("Sort by &title") );
AppendMenu( hmenu_sort, MF_STRING, ID_SORT_RTITLE,
_T("&Reverse sort by title") );
AppendMenu( hmenu_sort, MF_SEPARATOR, 0, 0 );
AppendMenu( hmenu_sort, MF_STRING, ID_SORT_AUTHOR,
_T("Sort by &author") );
AppendMenu( hmenu_sort, MF_STRING, ID_SORT_RAUTHOR,
_T("Reverse sort by &author") );
AppendMenu( hmenu_sort, MF_SEPARATOR, 0, 0 );
AppendMenu( hmenu_sort, MF_STRING, ID_SORT_SHUFFLE,
_T("&Shuffle Playlist") );
AppendMenu( hmenu_sel, MF_STRING, ID_SEL_ENABLE,
_T("&Enable") );
AppendMenu( hmenu_sel, MF_STRING, ID_SEL_DISABLE,
_T("&Disable") );
AppendMenu( hmenu_sel, MF_SEPARATOR, 0, 0 );
AppendMenu( hmenu_sel, MF_STRING, ID_SEL_INVERT,
_T("&Invert") );
AppendMenu( hmenu_sel, MF_STRING, ID_SEL_DELETE,
_T("D&elete") );
AppendMenu( hmenu_sel, MF_SEPARATOR, 0, 0 );
AppendMenu( hmenu_sel, MF_STRING, ID_SEL_SELECTALL,
_T("&Select All") );
#ifdef UNDER_CE
return mbi.hwndMB;
#else
HMENU hmenu = CreateMenu();
AppendMenu( hmenu, MF_POPUP|MF_STRING, (UINT)hmenu_file, _T("Manage") );
AppendMenu( hmenu, MF_POPUP|MF_STRING, (UINT)hmenu_sort, _T("Sort") );
AppendMenu( hmenu, MF_POPUP|MF_STRING, (UINT)hmenu_sel, _T("Selection") );
SetMenu( hwnd, hmenu );
return hwnd;
#endif
}
/***********************************************************************
FUNCTION:
WndProc
......@@ -164,23 +261,7 @@ LRESULT Playlist::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
shidi.hDlg = hwnd;
SHInitDialog( &shidi );
//Create the menubar.
memset( &mbi, 0, sizeof (SHMENUBARINFO) );
mbi.cbSize = sizeof (SHMENUBARINFO);
mbi.hwndParent = hwnd;
mbi.dwFlags = SHCMBF_HMENU;
mbi.nToolBarId = IDR_MENUBAR2;
mbi.hInstRes = hInst;
mbi.nBmpId = 0;
mbi.cBmpImages = 0;
if( !SHCreateMenuBar(&mbi) )
{
MessageBox(hwnd, _T("SHCreateMenuBar Failed"), _T("Error"), MB_OK);
//return -1;
}
hwndCB = mbi.hwndMB;
hwndCB = CreateMenuBar( hwnd, hInst );
iccex.dwSize = sizeof (INITCOMMONCONTROLSEX);
iccex.dwICC = ICC_BAR_CLASSES;
......@@ -285,9 +366,16 @@ LRESULT Playlist::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
SHFullScreen( GetForegroundWindow(), SHFS_HIDESIPBUTTON );
break;
case ID_MANAGE_SIMPLEADD:
case ID_MANAGE_ADDFILE:
SHFullScreen( GetForegroundWindow(), SHFS_SHOWSIPBUTTON );
OnAddFile();
OnAddFile( VLC_FALSE );
SHFullScreen( GetForegroundWindow(), SHFS_HIDESIPBUTTON );
b_need_update = VLC_TRUE;
break;
case ID_MANAGE_ADDDIRECTORY:
SHFullScreen( GetForegroundWindow(), SHFS_SHOWSIPBUTTON );
OnAddFile( VLC_TRUE );
SHFullScreen( GetForegroundWindow(), SHFS_HIDESIPBUTTON );
b_need_update = VLC_TRUE;
break;
......@@ -393,6 +481,7 @@ LRESULT Playlist::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
default:
break;
}
break;
case WM_NOTIFY:
if( ( ((LPNMHDR)lp)->hwndFrom == hListView ) &&
......@@ -708,17 +797,13 @@ void Playlist::OnSave()
}
}
void Playlist::OnAddFile()
void Playlist::OnAddFile( vlc_bool_t b_directory )
{
// Same code as in Interface
OPENFILENAME ofn;
TCHAR DateiName[80+1] = _T("\0");
static TCHAR szFilter[] = _T("All (*.*)\0*.*\0");
playlist_t *p_playlist = (playlist_t *)
vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist == NULL ) return;
memset( &ofn, 0, sizeof(OPENFILENAME) );
ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = NULL;
......@@ -732,7 +817,7 @@ void Playlist::OnAddFile()
ofn.lpstrFileTitle = NULL;
ofn.nMaxFileTitle = 40;
ofn.lpstrInitialDir = NULL;
ofn.lpstrTitle = _T("Quick Open File");
ofn.lpstrTitle = _T("Add File");
ofn.Flags = 0;
ofn.nFileOffset = 0;
ofn.nFileExtension = 0;
......@@ -741,16 +826,23 @@ void Playlist::OnAddFile()
ofn.lpfnHook = NULL;
ofn.lpTemplateName = NULL;
#if 0//def UNDER_CE
if( b_directory ) ofn.Flags |= OFN_PROJECT;
#endif
SHFullScreen( GetForegroundWindow(), SHFS_HIDESIPBUTTON );
if( GetOpenFileName( (LPOPENFILENAME)&ofn ) )
{
playlist_t *p_playlist = (playlist_t *)
vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist == NULL ) return;
char *psz_filename = _TOMB(ofn.lpstrFile);
playlist_Add( p_playlist, psz_filename, psz_filename,
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
vlc_object_release( p_playlist );
}
vlc_object_release( p_playlist );
}
void Playlist::OnAddMRL()
......
modules/gui/wince/preferences.cpp
View file @ ede8b843
......@@ -179,10 +179,8 @@ LRESULT PrefsDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
memset( &mbi, 0, sizeof (SHMENUBARINFO) );
mbi.cbSize = sizeof (SHMENUBARINFO);
mbi.hwndParent = hwnd;
mbi.nToolBarId = IDR_DUMMYMENU;
mbi.dwFlags = SHCMBF_EMPTYBAR;
mbi.hInstRes = hInst;
mbi.nBmpId = 0;
mbi.cBmpImages = 0;
if( !SHCreateMenuBar(&mbi) )
{
......
modules/gui/wince/subtitles.cpp
View file @ ede8b843
......@@ -88,10 +88,8 @@ LRESULT SubsFileDialog::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
memset (&mbi, 0, sizeof (SHMENUBARINFO));
mbi.cbSize = sizeof (SHMENUBARINFO);
mbi.hwndParent = hwnd;
mbi.nToolBarId = IDR_DUMMYMENU;
mbi.dwFlags = SHCMBF_EMPTYBAR;
mbi.hInstRes = hInst;
mbi.nBmpId = 0;
mbi.cBmpImages = 0;
if (!SHCreateMenuBar(&mbi))
{
......
modules/gui/wince/timer.cpp
View file @ ede8b843
......@@ -242,11 +242,7 @@ static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
{
intf_thread_t *p_intf = (intf_thread_t *)param;
if( p_intf->p_sys->pf_show_dialog )
{
p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_POPUPMENU,
new_val.b_bool, 0 );
}
/* Nothing for now */
return VLC_SUCCESS;
}
modules/gui/wince/wince.cpp
View file @ ede8b843
......@@ -51,7 +51,7 @@ static void Run ( intf_thread_t * );
vlc_module_begin();
set_description( (char *) _("WinCE interface module") );
set_capability( "interface", 200 );
set_capability( "interface", 100 );
set_callbacks( Open, Close );
add_shortcut( "wince" );
set_program( "wcevlc" );
......
modules/gui/wince/wince.h
View file @ ede8b843
......@@ -46,8 +46,6 @@
#include <vector>
using namespace std;
vector<string> SeparateEntries( TCHAR *entries );
class MenuItemExt;
class VideoWindow;
......@@ -107,7 +105,7 @@ protected:
HWND hwndCB; // The command bar handle
HINSTANCE GetInstance () const { return hInst; }
virtual LRESULT WndProc( HWND, UINT, WPARAM, LPARAM ) = 0;
virtual LRESULT WndProc( HWND, UINT, WPARAM, LPARAM ) {};
};
class FileInfo;
......@@ -385,7 +383,7 @@ protected:
void OnOpen();
void OnSave();
void OnAddFile();
void OnAddFile( vlc_bool_t );
void OnAddMRL();
void OnDeleteSelection();
......@@ -676,11 +674,12 @@ extern "C" {
#define ID_SEL_DISABLE 40101
#define ID_SORT_TITLE 40102
#define ID_SORT_RTITLE 40103
#define ID_MANAGE_SIMPLEADD 40104
#define ID_MANAGE_OPENPL 40105
#define ID_MANAGE_ADDFILE 40104
#define ID_MANAGE_ADDDIRECTORY 40105
#define ID_MANAGE_ADDMRL 40106
#define ID_MANAGE_SAVEPL 40107
#define ID_MENUITEM40108 40108
#define ID_MANAGE_OPENPL 40107
#define ID_MANAGE_SAVEPL 40108
#define ID_MENUITEM40108 40109
#define IDS_CAP_MENUITEM40109 40110
#define IDS_STOP 57601
#define StopStream_Event 57601
......
modules/gui/wince/wince_rc.rc
View file @ ede8b843
......@@ -23,15 +23,6 @@
#endif
#endif
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#if defined(_WIN32) && !defined(_WIN32_WCE)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Menubar
......@@ -69,31 +60,15 @@ IDR_MENUBAR2 MENU DISCARDABLE
BEGIN
POPUP "Manage"
BEGIN
MENUITEM "&Simple Add...", ID_MANAGE_SIMPLEADD
MENUITEM "&Add MRL...", 40106
MENUITEM SEPARATOR
MENUITEM "&Open Playlist...", ID_MANAGE_OPENPL
MENUITEM "&Save Playlist...", ID_MANAGE_SAVEPL
MENUITEM "Empty", ID_EMPTY, GRAYED
END
POPUP "Sort"
BEGIN
MENUITEM "Sort by &title", ID_SORT_TITLE
MENUITEM "&Reverse sort by title", ID_SORT_RTITLE
MENUITEM SEPARATOR
MENUITEM "Sort by &author", ID_SORT_AUTHOR
MENUITEM "Reverse sort by author", ID_SORT_RAUTHOR
MENUITEM SEPARATOR
MENUITEM "&Shuffle Playlist", ID_SORT_SHUFFLE
MENUITEM "Empty", ID_EMPTY, GRAYED
END
POPUP "Selection"
BEGIN
MENUITEM "&Enable", ID_SEL_ENABLE
MENUITEM "&Disable", ID_SEL_DISABLE
MENUITEM SEPARATOR
MENUITEM "&Invert", ID_SEL_INVERT
MENUITEM "D&elete", ID_SEL_DELETE
MENUITEM SEPARATOR
MENUITEM "&Select All", ID_SEL_SELECTALL
MENUITEM "Empty", ID_EMPTY, GRAYED
END
END
......@@ -122,7 +97,7 @@ END
IDR_MENUBAR2 RCDATA DISCARDABLE
BEGIN
IDR_MENUBAR2, 4,
IDR_MENUBAR2, 3,
I_IMAGENONE, IDM_MANAGE, TBSTATE_ENABLED,
TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDM_MANAGE, IDM_MANAGE, 0,
I_IMAGENONE, IDM_SORT, TBSTATE_ENABLED,
......@@ -136,77 +111,21 @@ END
// String Table
//
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
BEGIN
IDM_FILE "File"
IDM_VIEW "View"
IDM_SETTINGS "Settings"
END
STRINGTABLE DISCARDABLE
BEGIN
IDM_AUDIO "Audio"
IDM_VIDEO "Video"
IDM_NAVIGATION "Navigation"
END
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
BEGIN
IDM_MANAGE "Manage"
IDM_SORT "Sort"
IDM_SEL "Selection"
ID_SORT_AUTHOR "A"
ID_SORT_SHUFFLE "S"
END
STRINGTABLE DISCARDABLE
BEGIN
ID_SEL_INVERT "I"
ID_SEL_DELETE "E"
ID_SEL_SELECTALL "S"
ID_SEL_ENABLE "E"
ID_SEL_DISABLE "D"
ID_SORT_TITLE "T"
ID_SORT_RTITLE "R"
ID_MANAGE_SIMPLEADD "S"
ID_MANAGE_OPENPL "O"
ID_MANAGE_ADDMRL "A"
ID_MANAGE_SAVEPL "S"
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// French (France) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
#if defined(_WIN32) && !defined(_WIN32_WCE)
LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Menubar
//
IDR_DUMMYMENU MENU DISCARDABLE
BEGIN
MENUITEM "", ID_MENUITEM40108
END
/////////////////////////////////////////////////////////////////////////////
//
// Data
//
IDR_DUMMYMENU RCDATA DISCARDABLE
BEGIN
IDR_DUMMYMENU, 1,
I_IMAGENONE, ID_MENUITEM40108, TBSTATE_ENABLED, TBSTYLE_AUTOSIZE,
IDS_CAP_MENUITEM40109, 0, 0
END
/////////////////////////////////////////////////////////////////////////////
......@@ -236,68 +155,3 @@ IDB_BITMAP1 BITMAP DISCARDABLE "bitmaps\\toolbar1.bmp"
IDB_BITMAP2 BITMAP DISCARDABLE "bitmaps\\toolbar2.bmp"
IDB_BITMAP3 BITMAP DISCARDABLE "bitmaps\\toolbar3.bmp"
#endif
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE DISCARDABLE
BEGIN
IDS_TITLE "VLC Media PLayer"
IDS_CLASSNAME "wince"
IDS_CAP_VIEW "View"
IDS_CAP_SETTINGS "Settings"
IDS_CAP_AUDIO "Audio"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_CAP_VIDEO "Video"
IDS_CAP_Navigation "Navigation"
IDS_CAP_FILE "File"
END
STRINGTABLE DISCARDABLE
BEGIN
IDM_AUDIO "Audio"
IDM_VIDEO "Video"
IDM_NAVIGATION "Navigation"
ID_FILE_QUICK_OPEN "O"
ID_FILE_OPENFILE "F"
ID_FILE_QUICKOPEN "O"
ID_FILE_OPENNETWORKSTREAM "N"
ID_FILE_OPENNET "N"
ID_FILE_EXIT "X"
ID_VIEW_PLAYLIST "P"
END
STRINGTABLE DISCARDABLE
BEGIN
StopStream_Event "StopStream_Event"
PlayStream_Event "PlayStream_Event"
PrevStream_Event "SlowStream_Event"
NextStream_Event "NextStream_Event"
SlowStream_Event "SlowStream_Event"
FastStream_Event "FastStream_Event"
END
STRINGTABLE DISCARDABLE
BEGIN
ID_VIEW_MESSAGES "M"
ID_VIEW_MEDIAINFO "S"
ID_VIEW_STREAMINFO "S"
IDS_CAP_NAV "Navigation"
ID_SETTINGS_PREF "P"
ID_SETTINGS_EXTEND "E"
END
STRINGTABLE DISCARDABLE
BEGIN
IDM_FILE "File"
IDM_VIEW "View"
IDM_SETTINGS "Settings"
END
#endif // French (France) resources
/////////////////////////////////////////////////////////////////////////////
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment