diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-05-14 02:13:34 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-05-14 02:13:34 +0000 |
| commit | f878665ef5fa1193157d436ce153c0a43c9ace94 (patch) | |
| tree | 1e2686b51d09acdbc236fc4279b217d6f0d915bf /src | |
| parent | Inkview: Finally implement the -t or --timer option after we dragged it aroun... (diff) | |
| download | inkscape-f878665ef5fa1193157d436ce153c0a43c9ace94.tar.gz inkscape-f878665ef5fa1193157d436ce153c0a43c9ace94.zip | |
Inkview: minor refactoring
(bzr r15690.1.11)
Diffstat (limited to 'src')
| -rw-r--r-- | src/svg-view-slideshow.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/svg-view-slideshow.cpp b/src/svg-view-slideshow.cpp index 00552130d..a025eed9e 100644 --- a/src/svg-view-slideshow.cpp +++ b/src/svg-view-slideshow.cpp @@ -55,25 +55,22 @@ SPSlideShow::SPSlideShow(std::vector<Glib::ustring> const &slides, int timer) , _ctrlwin(NULL) , is_fullscreen(false) { - update_title(); - + // setup initial document auto default_screen = Gdk::Screen::get_default(); - set_default_size(MIN ((int)_doc->getWidth().value("px"), default_screen->get_width() - 64), - MIN ((int)_doc->getHeight().value("px"), default_screen->get_height() - 64)); + MIN ((int)_doc->getHeight().value("px"), default_screen->get_height() - 64)); - this->signal_key_press_event().connect(sigc::mem_fun(*this, &SPSlideShow::key_press), false); - this->signal_delete_event().connect(sigc::mem_fun(*this, &SPSlideShow::main_delete), false); - - _doc->ensureUpToDate(); - _view = sp_svg_view_widget_new (_doc); - _doc->doUnref (); + _view = sp_svg_view_widget_new(_doc); SP_SVG_VIEW_WIDGET(_view)->setResize( false, _doc->getWidth().value("px"), _doc->getHeight().value("px") ); gtk_widget_show (_view); add(*Glib::wrap(_view)); - + + update_title(); show(); + // connect signals + this->signal_key_press_event().connect(sigc::mem_fun(*this, &SPSlideShow::key_press), false); + this->signal_delete_event().connect(sigc::mem_fun(*this, &SPSlideShow::main_delete), false); if(_timer) { Glib::signal_timeout().connect_seconds(sigc::mem_fun(*this, &timer_callback), _timer); } @@ -248,7 +245,7 @@ void SPSlideShow::goto_last() bool SPSlideShow::timer_callback() { show_next(); - + // stop the timer if the last slide is reached if (_current == _slides.size()-1) { return false; |