summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2013-01-27 14:19:11 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2013-01-27 14:19:11 +0000
commit5ebf0c12c2b1be530bf4742236768a55e549494b (patch)
tree8451ca3b858fb63c21ede05a5862426e24cebbd5 /src/ui
parentTranslations. Romanian translation update by Cristian Secară. (diff)
downloadinkscape-5ebf0c12c2b1be530bf4742236768a55e549494b.tar.gz
inkscape-5ebf0c12c2b1be530bf4742236768a55e549494b.zip
Migrate ruler position tracking to new track_widget API
Fixed bugs: - https://launchpad.net/bugs/1105504 (bzr r12067)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/view/edit-widget-interface.h3
-rw-r--r--src/ui/view/view.cpp17
-rw-r--r--src/ui/view/view.h5
3 files changed, 0 insertions, 25 deletions
diff --git a/src/ui/view/edit-widget-interface.h b/src/ui/view/edit-widget-interface.h
index 412c7ff8c..26e47abbb 100644
--- a/src/ui/view/edit-widget-interface.h
+++ b/src/ui/view/edit-widget-interface.h
@@ -101,9 +101,6 @@ struct EditWidgetInterface
/// Update the "inactive desktop" indicator
virtual void deactivateDesktop() = 0;
- /// Set rulers to position
- virtual void viewSetPosition (Geom::Point p) = 0;
-
/// Update rulers from current values
virtual void updateRulers() = 0;
diff --git a/src/ui/view/view.cpp b/src/ui/view/view.cpp
index e13976cc4..72548e213 100644
--- a/src/ui/view/view.cpp
+++ b/src/ui/view/view.cpp
@@ -27,12 +27,6 @@ namespace UI {
namespace View {
static void
-_onPositionSet (double x, double y, View* v)
-{
- v->onPositionSet (x,y);
-}
-
-static void
_onResized (double x, double y, View* v)
{
v->onResized (x,y);
@@ -69,7 +63,6 @@ View::View()
_message_stack = GC::release(new Inkscape::MessageStack());
_tips_message_context = new Inkscape::MessageContext(_message_stack);
- _position_set_connection = _position_set_signal.connect (sigc::bind (sigc::ptr_fun (&_onPositionSet), this));
_resized_connection = _resized_signal.connect (sigc::bind (sigc::ptr_fun (&_onResized), this));
_redraw_requested_connection = _redraw_requested_signal.connect (sigc::bind (sigc::ptr_fun (&_onRedrawRequested), this));
@@ -102,16 +95,6 @@ void View::_close() {
Inkscape::Verb::delete_all_view (this);
}
-void View::setPosition (double x, double y)
-{
- _position_set_signal.emit (x,y);
-}
-
-void View::setPosition(Geom::Point const &p)
-{
- setPosition (double(p[Geom::X]), double(p[Geom::Y]));
-}
-
void View::emitResized (double width, double height)
{
_resized_signal.emit (width, height);
diff --git a/src/ui/view/view.h b/src/ui/view/view.h
index 6ed9f476c..48f4d2549 100644
--- a/src/ui/view/view.h
+++ b/src/ui/view/view.h
@@ -90,8 +90,6 @@ public:
Inkscape::MessageContext *tipsMessageContext() const
{ return _tips_message_context; }
- void setPosition(gdouble x, gdouble y);
- void setPosition(Geom::Point const &p);
void emitResized(gdouble width, gdouble height);
void requestRedraw();
@@ -101,7 +99,6 @@ public:
virtual void mouseover() = 0;
virtual void mouseout() = 0;
- virtual void onPositionSet (double, double) = 0;
virtual void onResized (double, double) = 0;
virtual void onRedrawRequested() = 0;
virtual void onStatusMessage (Inkscape::MessageType type, gchar const *message) = 0;
@@ -126,13 +123,11 @@ protected:
*/
virtual void setDocument(SPDocument *doc);
- sigc::signal<void,double,double> _position_set_signal;
sigc::signal<void,double,double> _resized_signal;
sigc::signal<void,gchar const*> _document_uri_set_signal;
sigc::signal<void> _redraw_requested_signal;
private:
- sigc::connection _position_set_connection;
sigc::connection _resized_connection;
sigc::connection _redraw_requested_connection;
sigc::connection _message_changed_connection; // foreign