hur

git-svn-id: http://svn.voria.com/code@34 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index df200ba..d7011b8 100644 (file)
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -512,6 +512,8 @@ Canvas::surefind_canvas(const String &id)
                //! \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;
                
@@ -523,7 +525,7 @@ Canvas::surefind_canvas(const String &id)
                        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);
@@ -596,6 +598,8 @@ Canvas::find_canvas(const String &id)const
                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.
@@ -606,7 +610,7 @@ Canvas::find_canvas(const String &id)const
                        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);

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp
index 9a02faa..1c87a04 100644 (file)
--- a/synfig-core/trunk/src/synfig/loadcanvas.cpp
+++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp
@@ -2254,11 +2254,14 @@ CanvasParser::parse_from_file(const String &file)
 }
 
 Canvas::Handle
-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
        {
+               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)];
 

diff --git a/synfig-core/trunk/synfig.pc.in b/synfig-core/trunk/synfig.pc.in
index 84aea31..473a488 100644 (file)
--- a/synfig-core/trunk/synfig.pc.in
+++ b/synfig-core/trunk/synfig.pc.in
@@ -6,6 +6,6 @@ includedir=@synfigincludedir@
 Name: synfig
 Description: Synfig Core
 Requires: @CONFIG_DEPS@
-Version: 0.61.00-28
+Version: 0.61.00-29
 Libs: -L${libdir} @CONFIG_LIBS@
 Cflags: @CONFIG_CFLAGS@ -I@synfigincludedir@

diff --git a/synfig-core/trunk/win32inst.nsi.in b/synfig-core/trunk/win32inst.nsi.in
index 7271102..28d3d95 100644 (file)
--- a/synfig-core/trunk/win32inst.nsi.in
+++ b/synfig-core/trunk/win32inst.nsi.in
@@ -106,6 +106,15 @@ SectionEnd
   
 ;SectionEnd
 
+; 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
@@ -126,6 +135,7 @@ Section "Uninstall"
 
   ; Remove shortcuts, if any
 
+  Delete "$SMPROGRAMS\Voria\Uninstall Synfig Core.lnk"
   ; Remove directories used
   ;RMDir "$SMPROGRAMS\Example2"
   RMDir "$INSTDIR"