diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-05-14 00:41:40 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-05-14 00:41:40 +0000 |
| commit | 9607306c03378d38b9ba67b7f0120593b7820826 (patch) | |
| tree | c5fe346051655c9bcfa49f1440961afc8743a69d /src | |
| parent | Inkview: Refactoring - move SPSlideShow to separate source file (diff) | |
| download | inkscape-9607306c03378d38b9ba67b7f0120593b7820826.tar.gz inkscape-9607306c03378d38b9ba67b7f0120593b7820826.zip | |
Inkview: Some more refactoring
(bzr r15690.1.9)
Diffstat (limited to 'src')
| -rw-r--r-- | src/inkview.cpp | 1 | ||||
| -rw-r--r-- | src/svg-view-slideshow.cpp | 13 | ||||
| -rw-r--r-- | src/svg-view-slideshow.h | 16 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/inkview.cpp b/src/inkview.cpp index abb690619..04d223091 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -29,7 +29,6 @@ # include "config.h" #endif -#include <gtkmm/applicationwindow.h> #include <gtkmm/main.h> #include <libxml/tree.h> diff --git a/src/svg-view-slideshow.cpp b/src/svg-view-slideshow.cpp index eebcd94df..f9a392d3e 100644 --- a/src/svg-view-slideshow.cpp +++ b/src/svg-view-slideshow.cpp @@ -29,7 +29,6 @@ # include "config.h" #endif -#include <gtkmm/applicationwindow.h> #include <gtkmm/button.h> #include <gtkmm/buttonbox.h> #include <gtkmm/image.h> @@ -149,6 +148,18 @@ void SPSlideShow::normal_cursor() } } + +/// Update the window title with current document name +void SPSlideShow::update_title() +{ + Glib::ustring title(_doc->getName()); + if (_slides.size() > 1) { + title += Glib::ustring::compose(" (%1/%2)", _current+1, _slides.size()); + } + + set_title(title); +} + void SPSlideShow::set_document(SPDocument *doc, int current) { diff --git a/src/svg-view-slideshow.h b/src/svg-view-slideshow.h index 173e97e5b..a44ef5b55 100644 --- a/src/svg-view-slideshow.h +++ b/src/svg-view-slideshow.h @@ -29,6 +29,8 @@ #ifndef SEEN_SP_SVG_SLIDESHOW_H #define SEEN_SP_SVG_SLIDESHOW_H +#include <gtkmm/applicationwindow.h> + /** * The main application window for the slideshow */ @@ -48,18 +50,6 @@ private: /// Current state of application (full-screen or windowed) bool is_fullscreen; - /// Update the window title with current document name - void update_title() - { - Glib::ustring title(_doc->getName()); - if (_slides.size() > 1) { - title += Glib::ustring::compose(" (%1/%2)", _current+1, _slides.size()); - } - - set_title(title); - } - - void control_show(); void show_next(); void show_prev(); @@ -70,7 +60,7 @@ private: bool main_delete (GdkEventAny *event); bool ctrlwin_delete (GdkEventAny *event); -protected: + void update_title(); void waiting_cursor(); void normal_cursor(); void set_document(SPDocument *doc, |