Use the TILE_SIZE defined in target_tile.h.

[synfig.git] / synfig-studio / trunk / src / gtkmm / workarea.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index d65d3d0..2f00672 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -630,14 +630,14 @@ WorkArea::WorkArea(etl::loose_handle<synfigapp::CanvasInterface> canvas_interfac
        canvas(canvas_interface->get_canvas()),
        scrollx_adjustment(0,-4,4,0.01,0.1),
        scrolly_adjustment(0,-4,4,0.01,0.1),
-       w(128),
-       h(128),
+       w(TILE_SIZE),
+       h(TILE_SIZE),
        last_event_time(0),
        progresscallback(0),
        dragging(DRAG_NONE),
        show_grid(false),
-       tile_w(128),
-       tile_h(128),
+       tile_w(TILE_SIZE),
+       tile_h(TILE_SIZE),
        timecode_width(0),
        timecode_height(0)
 {
@@ -1869,10 +1869,8 @@ WorkArea::on_vruler_event(GdkEvent */*event*/)
        switch(event->type)
     {
        case GDK_BUTTON_PRESS:
-               DEBUGPOINT();
                if(dragging==DRAG_NONE)
                {
-                       DEBUGPOINT();
                        dragging=DRAG_GUIDE;
                        curr_guide=get_guide_list_x().insert(get_guide_list_x().begin());
                        curr_guide_is_x=true;
@@ -1880,10 +1878,8 @@ WorkArea::on_vruler_event(GdkEvent */*event*/)
                return true;
                break;
        case GDK_BUTTON_RELEASE:
-               DEBUGPOINT();
                if(dragging==DRAG_GUIDE && curr_guide_is_x==true)
                {
-                       DEBUGPOINT();
                        dragging=DRAG_NONE;
                        get_guide_list_x().erase(curr_guide);
                }
@@ -2280,7 +2276,7 @@ studio::WorkArea::async_update_preview()
        synfig::ProgressCallback *cb=get_canvas_view()->get_ui_interface().get();
 
        rendering=true;
-       cb->task("Rendering...");
+       cb->task(_("Rendering..."));
        rendering=true;
 
        return true;
@@ -2302,12 +2298,12 @@ studio::WorkArea::async_update_finished()
        {
                dirty=false;
                //queued=false;
-               cb->task("Idle");
+               cb->task(_("Idle"));
        }
        else
        {
                dirty=true;
-               cb->task("Render Failed");
+               cb->task(_("Render Failed"));
        }
        //get_canvas_view()->reset_cancel_status();
        done_rendering();
@@ -2381,7 +2377,7 @@ again:
        target->set_avoid_time_sync(true);
 
        if(cb)
-               cb->task(strprintf("Rendering canvas %s...",get_canvas()->get_name().c_str()));
+               cb->task(strprintf(_("Rendering canvas %s..."),get_canvas()->get_name().c_str()));
 
        bool ret = target->render(cb);
 
@@ -2397,9 +2393,9 @@ again:
        if(cb)
        {
                if(ret)
-                       cb->task("Idle");
+                       cb->task(_("Idle"));
                else
-                       cb->task("Render Failed");
+                       cb->task(_("Render Failed"));
                cb->amount_complete(0,1);
        }