[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1286
Date       : Fri Jun  9 13:15:52 BST 2006

Changed paths:
   A /Trunk/XaraLX/bin
   A /Trunk/XaraLX/bin/mplayer
   A /Trunk/XaraLX/video
   A /Trunk/XaraLX/video/Part 1 master inc audio smaller_q35_fr15_hi.ogm
   M /Trunk/XaraLX/wxOil/menucmds.cpp
   M /Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc

Add movie replay resources (warning these are BIG)


Diff:
Index: Trunk/XaraLX/video/Part 1 master inc audio smaller_q35_fr15_hi.ogm
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: Trunk/XaraLX/video/Part 1 master inc audio smaller_q35_fr15_hi.ogm
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: Trunk/XaraLX/bin/mplayer
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: Trunk/XaraLX/bin/mplayer
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Index: Trunk/XaraLX/wxOil/menucmds.cpp
===================================================================
--- Trunk/XaraLX/wxOil/menucmds.cpp	(revision 1285)
+++ Trunk/XaraLX/wxOil/menucmds.cpp	(revision 1286)
@@ -896,8 +896,13 @@
 
 	TRACEUSER( "jlh92", _T("Executing %s
"), PCTSTR(strCommand) );
 
-	wxProcess* pProcess = new wxProcess;
-	wxExecute( strCommand, wxEXEC_SYNC, pProcess );
+	wxProcess*	pProcess = new wxProcess;
+	// NB this should return -1 for failure, but instead is returning 255
+	long /*TYPENOTE: CORRECT*/ lResult = wxExecute( strCommand, wxEXEC_SYNC, pProcess );
+	if( 255 == lResult )
+		InformWarning( _R(IDS_MPLAYER_MISSING), _R(IDS_OK) );
+
+	TRACEUSER( "jlh92", _T("Exec err = %d
"), lResult );
 #else
 	wxWindow*		pWnd	= new wxTopLevelWindow( CCamFrame::GetMainFrame(), wxID_ANY, _T("Demo Video") );
 	wxSizer*		pSizer	= new wxBoxSizer( wxHORIZONTAL );
Index: Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc	(revision 1285)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc	(revision 1286)
@@ -341,6 +341,12 @@
 					<label> (missing)</label>
 				</object>
 			</object>
+			<object class="sizeritem">
+				<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
+				<object class="wxStaticText" name="IDS_MPLAYER_MISSING">
+					<label>The movie replay resources aren't present, please check the install</label>
+				</object>
+			</object>
 		</object>
 	</object>
 </resource>


Xara