Module: synfig/synfig Branch: zelgadis_master Commit: 8463caf8ebf84825997a120eb137cf1b910c9ac9 URL: http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig/synfig;a=commit;h=8463caf8ebf84825997a120eb137cf1b910c9ac9
Author: Konstantin Dmitriev <[email protected]> Date: Mon Oct 4 13:16:48 2010 +0700 Revert back to single splash screen. Splash screen file is now detected automatically depending on the version number. --- synfig-studio/images/Makefile.am | 9 +++++---- ...ash_screen2.sif => splash_screen-0.62.01-2.sif} | 0 ...plash_screen1.sif => splash_screen-0.62.01.sif} | 0 synfig-studio/src/gui/splash.cpp | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/synfig-studio/images/Makefile.am b/synfig-studio/images/Makefile.am index acf2a79..3c1768d 100644 --- a/synfig-studio/images/Makefile.am +++ b/synfig-studio/images/Makefile.am @@ -6,8 +6,8 @@ EXT = @imageext@ EXTRA_DIST = \ installer_logo.sif \ installer_logo_osx.sif \ - splash_screen1.sif \ - splash_screen2.sif \ + splash_screen-0.62.01.sif \ + splash_screen-0.62.01-2.sif \ splash_screen-0.62.00.sif \ splash_screen-0.61.09.sif \ splash_screen-0.61.08.sif \ @@ -187,8 +187,7 @@ IMAGES = \ string_icon.$(EXT) \ eyedrop_icon.$(EXT) \ about_icon.$(EXT) \ - splash_screen1.$(EXT) \ - splash_screen2.$(EXT) \ + splash_screen.$(EXT) \ canvas_icon.$(EXT) \ vector_icon.$(EXT) \ real_icon.$(EXT) \ @@ -360,6 +359,8 @@ keyframe_lock_none.$(EXT): $(srcdir)/keyframe_lock_icon.sif echo " File \"images...@\"" >>./images.nsh echo " Delete \"\$$instdir\\share\\pixmaps...@\"" >>./unimages.nsh +splash_screen.$(EXT): $(srcdir)/splash_screen-$(PACKAGE_VERSION).sif + $(SYNFIG) -q $< -o $@ --time 0 if !WIN32_PKG if !MACOSX_PKG diff --git a/synfig-studio/images/splash_screen2.sif b/synfig-studio/images/splash_screen-0.62.01-2.sif similarity index 100% rename from synfig-studio/images/splash_screen2.sif rename to synfig-studio/images/splash_screen-0.62.01-2.sif diff --git a/synfig-studio/images/splash_screen1.sif b/synfig-studio/images/splash_screen-0.62.01.sif similarity index 100% rename from synfig-studio/images/splash_screen1.sif rename to synfig-studio/images/splash_screen-0.62.01.sif diff --git a/synfig-studio/src/gui/splash.cpp b/synfig-studio/src/gui/splash.cpp index d952fd1..d02e202 100644 --- a/synfig-studio/src/gui/splash.cpp +++ b/synfig-studio/src/gui/splash.cpp @@ -178,6 +178,7 @@ Splash::Splash(): // Create the splash image Gtk::Image* splash_image = manage(new class Gtk::Image()); + /* Dual-splash code: srand(time(NULL)); const float ran = rand()/float(RAND_MAX); int number = 1; @@ -185,6 +186,8 @@ Splash::Splash(): number = 2; //synfig::info("%s", strprintf("%d",number).c_str()); splash_image->set(imagepath+"splash_screen"+strprintf("%d",number)+"."IMAGE_EXT); + */ + splash_image->set(imagepath+"splash_screen."IMAGE_EXT); splash_image->set_alignment(0.5,0.5); splash_image->set_padding(0,0); ------------------------------------------------------------------------------ Virtualization is moving to the mainstream and overtaking non-virtualized environment for deploying applications. Does it make network security easier or more difficult to achieve? Read this whitepaper to separate the two and get a better understanding. http://p.sf.net/sfu/hp-phase2-d2d _______________________________________________ Synfig-devl mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/synfig-devl
