//! \todo This needs alot more optimization
String file_name(id,0,id.find_first_of('#'));
String external_id(id,id.find_first_of('#')+1);
//! \todo This needs alot more optimization
String file_name(id,0,id.find_first_of('#'));
String external_id(id,id.find_first_of('#')+1);
+
+ file_name=unix_to_local_path(file_name);
Canvas::Handle external_canvas;
Canvas::Handle external_canvas;
if(is_absolute_path(file_name))
external_canvas=open_canvas(file_name);
else
if(is_absolute_path(file_name))
external_canvas=open_canvas(file_name);
else
- external_canvas=open_canvas(get_file_path()+'/'+file_name);
+ external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPERATOR+file_name);
if(!external_canvas)
throw Exception::FileNotFound(file_name);
if(!external_canvas)
throw Exception::FileNotFound(file_name);
String file_name(id,0,id.find_first_of('#'));
String external_id(id,id.find_first_of('#')+1);
String file_name(id,0,id.find_first_of('#'));
String external_id(id,id.find_first_of('#')+1);
+ file_name=unix_to_local_path(file_name);
+
Canvas::Handle external_canvas;
// If the composition is already open, then use it.
Canvas::Handle external_canvas;
// If the composition is already open, then use it.
if(is_absolute_path(file_name))
external_canvas=open_canvas(file_name);
else
if(is_absolute_path(file_name))
external_canvas=open_canvas(file_name);
else
- external_canvas=open_canvas(get_file_path()+'/'+file_name);
+ external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPERATOR+file_name);
if(!external_canvas)
throw Exception::FileNotFound(file_name);
if(!external_canvas)
throw Exception::FileNotFound(file_name);
-CanvasParser::parse_from_file_as(const String &file,const String &as)
+CanvasParser::parse_from_file_as(const String &file_,const String &as_)
{
CHECK_EXPIRE_TIME();
try
{
{
CHECK_EXPIRE_TIME();
try
{
+ String file(unix_to_local_path(file_));
+ String as(unix_to_local_path(as_));
+
if(get_open_canvas_map().count(etl::absolute_path(as)))
return get_open_canvas_map()[etl::absolute_path(as)];
if(get_open_canvas_map().count(etl::absolute_path(as)))
return get_open_canvas_map()[etl::absolute_path(as)];
Name: synfig
Description: Synfig Core
Requires: @CONFIG_DEPS@
Name: synfig
Description: Synfig Core
Requires: @CONFIG_DEPS@
Libs: -L${libdir} @CONFIG_LIBS@
Cflags: @CONFIG_CFLAGS@ -I@synfigincludedir@
Libs: -L${libdir} @CONFIG_LIBS@
Cflags: @CONFIG_CFLAGS@ -I@synfigincludedir@
+; Optional section (can be disabled by the user)
+Section "Start Menu Shortcuts"
+
+ CreateDirectory "$SMPROGRAMS\Voria"
+ CreateShortCut "$SMPROGRAMS\Voria\Uninstall Synfig Core.lnk" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" "" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" 0
+
+SectionEnd
+
+
;--------------------------------
; Uninstaller
;--------------------------------
; Uninstaller
; Remove shortcuts, if any
; Remove shortcuts, if any
+ Delete "$SMPROGRAMS\Voria\Uninstall Synfig Core.lnk"
; Remove directories used
;RMDir "$SMPROGRAMS\Example2"
RMDir "$INSTDIR"
; Remove directories used
;RMDir "$SMPROGRAMS\Example2"
RMDir "$INSTDIR"