diff --git a/synfig-studio/src/gui/canvasview.cpp b/synfig-studio/src/gui/canvasview.cpp index 3cfb59b..b5c7a78 100644 --- a/synfig-studio/src/gui/canvasview.cpp +++ b/synfig-studio/src/gui/canvasview.cpp @@ -194,7 +194,8 @@ public: CanvasViewUIInterface(CanvasView *view): view(view) - { view->statusbar->push(_("Idle")); } + { view->statusbar->push(_("Idle")); + view->progressbar->hide();} ~CanvasViewUIInterface() { } virtual Response confirmation( @@ -298,6 +299,17 @@ public: virtual bool amount_complete(int current, int total) { + float cur_progress=(float)current/(float)total; + if(cur_progress>0.0 && cur_progress<100) + { + view->statusbar->hide(); + view->progressbar->show(); + view->progressbar->set_fraction((float)current/(float)total); + return true; + } + view->statusbar->show(); + view->progressbar->hide(); + if(!view->is_playing()) { if(!view->working_depth) @@ -528,6 +540,7 @@ CanvasView::CanvasView(etl::loose_handle instance,etl::handle #include #include +#include #include #include #include diff --git a/synfig-studio/src/gui/dialogs/vectorizersettings.cpp b/synfig-studio/src/gui/dialogs/vectorizersettings.cpp index 9429d1c..c017642 100644 --- a/synfig-studio/src/gui/dialogs/vectorizersettings.cpp +++ b/synfig-studio/src/gui/dialogs/vectorizersettings.cpp @@ -264,8 +264,8 @@ void VectorizerSettings::set_progress(float value) { float r = value/100.0; - ProgressBar.set_text( strprintf( "%.1f%%", value )); - ProgressBar.set_fraction(r); + // ProgressBar.set_text( strprintf( "%.1f%%", value )); + // ProgressBar.set_fraction(r); } void diff --git a/synfig-studio/src/synfigapp/actions/vectorization.cpp b/synfig-studio/src/synfigapp/actions/vectorization.cpp index 04f0a39..fd0a4c4 100644 --- a/synfig-studio/src/synfigapp/actions/vectorization.cpp +++ b/synfig-studio/src/synfigapp/actions/vectorization.cpp @@ -245,7 +245,6 @@ Action::Vectorization::perform() synfig::Canvas::Handle child_canvas; child_canvas=synfig::Canvas::create_inline(layer->get_canvas()); - new_layer->set_description("Vectorized "+layer->get_description()); new_layer->set_param("canvas",child_canvas); int move_depth = 0;