From 49a7927ecf31ace696e9e5770e8d6543c356db7a Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 28 Jul 2016 19:15:34 +0100 Subject: Finish removing GTK+ 2 fallbacks (bzr r15023.2.8) --- src/inkview.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'src/inkview.cpp') diff --git a/src/inkview.cpp b/src/inkview.cpp index db4b1aeb0..f6dfe34fe 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -346,13 +346,7 @@ static GtkWidget* sp_svgview_control_show(struct SPSlideShow *ss) gtk_window_set_transient_for(GTK_WINDOW(ctrlwin), GTK_WINDOW(ss->window)); g_signal_connect(G_OBJECT (ctrlwin), "key_press_event", (GCallback) sp_svgview_main_key_press, ss); g_signal_connect(G_OBJECT (ctrlwin), "delete_event", (GCallback) sp_svgview_ctrlwin_delete, NULL); - -#if GTK_CHECK_VERSION(3,0,0) - GtkWidget *t = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); -#else - GtkWidget *t = gtk_hbutton_box_new(); -#endif - + auto t = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); gtk_container_add(GTK_CONTAINER(ctrlwin), t); #if GTK_CHECK_VERSION(3,10,0) @@ -431,19 +425,11 @@ static void sp_svgview_waiting_cursor(struct SPSlideShow *ss) GdkDisplay *display = gdk_display_get_default(); GdkCursor *waiting = gdk_cursor_new_for_display(display, GDK_WATCH); gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ss->window)), waiting); -#if GTK_CHECK_VERSION(3,0,0) g_object_unref(waiting); -#else - gdk_cursor_unref(waiting); -#endif if (ctrlwin) { GdkCursor *waiting = gdk_cursor_new_for_display(display, GDK_WATCH); gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), waiting); -#if GTK_CHECK_VERSION(3,0,0) g_object_unref(waiting); -#else - gdk_cursor_unref(waiting); -#endif } while(gtk_events_pending()) { gtk_main_iteration(); -- cgit v1.2.3 From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Wed, 3 Aug 2016 15:29:38 +0200 Subject: Removed unused includes, decreased compilation time. Once again (bzr r15034) --- src/inkview.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/inkview.cpp') diff --git a/src/inkview.cpp b/src/inkview.cpp index db4b1aeb0..b377a3bd0 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -35,7 +35,6 @@ #include #include -#include // #include @@ -58,8 +57,6 @@ #include "inkscape.h" -#include - #ifndef HAVE_BIND_TEXTDOMAIN_CODESET #define bind_textdomain_codeset(p,c) #endif -- cgit v1.2.3 From 79114d4f5ed18fc7bc79fff42bbc02d24042b484 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 13 Aug 2016 16:59:04 +0100 Subject: inkview: C++ify (bzr r15056) --- src/inkview.cpp | 273 ++++++++++++++++++++++++-------------------------------- 1 file changed, 115 insertions(+), 158 deletions(-) (limited to 'src/inkview.cpp') diff --git a/src/inkview.cpp b/src/inkview.cpp index c90d0b85e..fe656ca5b 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -34,6 +34,8 @@ #include #include +#include +#include #include // #include @@ -66,28 +68,38 @@ extern char *optarg; extern int optind, opterr; -struct SPSlideShow { - char **slides; - int size; - int length; +class SPSlideShow { +public: + std::vector slides; int current; SPDocument *doc; GtkWidget *view; GtkWidget *window; bool fullscreen; int timer; -}; -static GtkWidget *sp_svgview_control_show (struct SPSlideShow *ss); -static void sp_svgview_show_next (struct SPSlideShow *ss); -static void sp_svgview_show_prev (struct SPSlideShow *ss); -static void sp_svgview_goto_first (struct SPSlideShow *ss); -static void sp_svgview_goto_last (struct SPSlideShow *ss); + SPSlideShow() + : + slides(), + current(0), + doc(NULL), + view(NULL), + fullscreen(false) + {} + + GtkWidget *control_show(); + void show_next(); + void show_prev(); + void goto_first(); + void goto_last(); + +protected: + void waiting_cursor(); + void normal_cursor(); + void set_document(SPDocument *doc, + int current); +}; -static int sp_svgview_show_next_cb (GtkWidget *widget, void *data); -static int sp_svgview_show_prev_cb (GtkWidget *widget, void *data); -static int sp_svgview_goto_first_cb (GtkWidget *widget, void *data); -static int sp_svgview_goto_last_cb (GtkWidget *widget, void *data); #ifdef WITH_INKJAR static bool is_jar(char const *filename); #endif @@ -114,11 +126,11 @@ static int sp_svgview_main_key_press (GtkWidget */*widget*/, switch (event->keyval) { case GDK_KEY_Up: case GDK_KEY_Home: - sp_svgview_goto_first(ss); + ss->goto_first(); break; case GDK_KEY_Down: case GDK_KEY_End: - sp_svgview_goto_last(ss); + ss->goto_last(); break; case GDK_KEY_F11: if (ss->fullscreen) { @@ -130,19 +142,19 @@ static int sp_svgview_main_key_press (GtkWidget */*widget*/, } break; case GDK_KEY_Return: - sp_svgview_control_show (ss); + ss->control_show(); break; case GDK_KEY_KP_Page_Down: case GDK_KEY_Page_Down: case GDK_KEY_Right: case GDK_KEY_space: - sp_svgview_show_next (ss); + ss->show_next(); break; case GDK_KEY_KP_Page_Up: case GDK_KEY_Page_Up: case GDK_KEY_Left: case GDK_KEY_BackSpace: - sp_svgview_show_prev (ss); + ss->show_prev(); break; case GDK_KEY_Escape: case GDK_KEY_q: @@ -167,9 +179,8 @@ int main (int argc, const char **argv) Gtk::Main main_instance (&argc, const_cast(&argv)); - struct SPSlideShow ss; - int num_parsed_options = 0; + SPSlideShow ss; // the list of arguments is in the net line for (int i = 1; i < argc; i++) { @@ -215,15 +226,6 @@ int main (int argc, const char **argv) setlocale (LC_NUMERIC, "C"); - ss.size = 32; - ss.length = 0; - ss.current = 0; - ss.slides = g_new (char *, ss.size); - ss.current = 0; - ss.doc = NULL; - ss.view = NULL; - ss.fullscreen = false; - Inkscape::Application::create(argv[0], true); //Inkscape::Application &inkscape = Inkscape::Application::instance(); @@ -254,21 +256,13 @@ int main (int argc, const char **argv) } } } else if (gba->len > 0) { - //::write(1, gba->data, gba->len); - /* Append to list */ - if (ss.length >= ss.size) { - /* Expand */ - ss.size <<= 1; - ss.slides = g_renew (char *, ss.slides, ss.size); - } - ss.doc = SPDocument::createNewDocFromMem ((const gchar *)gba->data, gba->len, TRUE); gchar *last_filename = jar_file_reader.get_last_filename(); if (ss.doc) { - ss.slides[ss.length++] = strdup (last_filename); - (ss.doc)->setUri (last_filename); + ss.slides.push_back(strdup(last_filename)); + (ss.doc)->setUri(last_filename); } g_byte_array_free(gba, TRUE); g_free(last_filename); @@ -279,16 +273,10 @@ int main (int argc, const char **argv) } else { #endif /* WITH_INKJAR */ /* Append to list */ - if (ss.length >= ss.size) { - /* Expand */ - ss.size <<= 1; - ss.slides = g_renew (char *, ss.slides, ss.size); - } - - ss.slides[ss.length++] = strdup (argv[i]); + ss.slides.push_back(strdup (argv[i])); if (!ss.doc) { - ss.doc = SPDocument::createNewDoc (ss.slides[ss.current], TRUE, false); + ss.doc = SPDocument::createNewDoc((ss.slides[ss.current]).c_str(), TRUE, false); if (!ss.doc) { ++ss.current; } @@ -335,56 +323,48 @@ static int sp_svgview_ctrlwin_delete (GtkWidget */*widget*/, return FALSE; } -static GtkWidget* sp_svgview_control_show(struct SPSlideShow *ss) +/** + * @brief Show the control buttons (next, previous etc) for the application + */ +GtkWidget* SPSlideShow::control_show() { if (!ctrlwin) { ctrlwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_resizable(GTK_WINDOW(ctrlwin), FALSE); - gtk_window_set_transient_for(GTK_WINDOW(ctrlwin), GTK_WINDOW(ss->window)); - g_signal_connect(G_OBJECT (ctrlwin), "key_press_event", (GCallback) sp_svgview_main_key_press, ss); + gtk_window_set_transient_for(GTK_WINDOW(ctrlwin), GTK_WINDOW(window)); + g_signal_connect(G_OBJECT (ctrlwin), "key_press_event", (GCallback) sp_svgview_main_key_press, this); g_signal_connect(G_OBJECT (ctrlwin), "delete_event", (GCallback) sp_svgview_ctrlwin_delete, NULL); auto t = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); gtk_container_add(GTK_CONTAINER(ctrlwin), t); -#if GTK_CHECK_VERSION(3,10,0) - GtkWidget *b = gtk_button_new_from_icon_name(INKSCAPE_ICON("go-first"), GTK_ICON_SIZE_BUTTON); -#else - GtkWidget *b = gtk_button_new(); - GtkWidget *img = gtk_image_new_from_icon_name(INKSCAPE_ICON("go-first"), GTK_ICON_SIZE_BUTTON); - gtk_button_set_image(GTK_BUTTON(b), img); -#endif - gtk_container_add(GTK_CONTAINER(t), b); - - g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_goto_first_cb, ss); -#if GTK_CHECK_VERSION(3,10,0) - b = gtk_button_new_from_icon_name(INKSCAPE_ICON("go-previous"), GTK_ICON_SIZE_BUTTON); -#else - b = gtk_button_new(); - img = gtk_image_new_from_icon_name(INKSCAPE_ICON("go-previous"), GTK_ICON_SIZE_BUTTON); - gtk_button_set_image(GTK_BUTTON(b), img); -#endif - gtk_container_add(GTK_CONTAINER(t), b); - - g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_show_prev_cb, ss); -#if GTK_CHECK_VERSION(3,10,0) - b = gtk_button_new_from_icon_name(INKSCAPE_ICON("go-next"), GTK_ICON_SIZE_BUTTON); -#else - b = gtk_button_new(); - img = gtk_image_new_from_icon_name(INKSCAPE_ICON("go-next"), GTK_ICON_SIZE_BUTTON); - gtk_button_set_image(GTK_BUTTON(b), img); -#endif - gtk_container_add(GTK_CONTAINER(t), b); - - g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_show_next_cb, ss); -#if GTK_CHECK_VERSION(3,10,0) - b = gtk_button_new_from_icon_name(INKSCAPE_ICON("go-last"), GTK_ICON_SIZE_BUTTON); -#else - b = gtk_button_new(); - img = gtk_image_new_from_icon_name(INKSCAPE_ICON("go-last"), GTK_ICON_SIZE_BUTTON); - gtk_button_set_image(GTK_BUTTON(b), img); -#endif - gtk_container_add(GTK_CONTAINER(t), b); - g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_goto_last_cb, ss); + auto btn_go_first = Gtk::manage(new Gtk::Button()); + auto img_go_first = Gtk::manage(new Gtk::Image()); + img_go_first->set_from_icon_name(INKSCAPE_ICON("go-first"), Gtk::ICON_SIZE_BUTTON); + btn_go_first->set_image(*img_go_first); + gtk_container_add(GTK_CONTAINER(t), GTK_WIDGET(btn_go_first->gobj())); + btn_go_first->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::goto_first)); + + auto btn_go_prev = Gtk::manage(new Gtk::Button()); + auto img_go_prev = Gtk::manage(new Gtk::Image()); + img_go_prev->set_from_icon_name(INKSCAPE_ICON("go-previous"), Gtk::ICON_SIZE_BUTTON); + btn_go_prev->set_image(*img_go_prev); + gtk_container_add(GTK_CONTAINER(t), GTK_WIDGET(btn_go_prev->gobj())); + btn_go_prev->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::show_prev)); + + auto btn_go_next = Gtk::manage(new Gtk::Button()); + auto img_go_next = Gtk::manage(new Gtk::Image()); + img_go_next->set_from_icon_name(INKSCAPE_ICON("go-next"), Gtk::ICON_SIZE_BUTTON); + btn_go_next->set_image(*img_go_next); + gtk_container_add(GTK_CONTAINER(t), GTK_WIDGET(btn_go_next->gobj())); + btn_go_next->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::show_next)); + + auto btn_go_last = Gtk::manage(new Gtk::Button()); + auto img_go_last = Gtk::manage(new Gtk::Image()); + img_go_last->set_from_icon_name(INKSCAPE_ICON("go-last"), Gtk::ICON_SIZE_BUTTON); + btn_go_last->set_image(*img_go_last); + gtk_container_add(GTK_CONTAINER(t), GTK_WIDGET(btn_go_last->gobj())); + btn_go_last->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::goto_last)); + gtk_widget_show_all(ctrlwin); } else { gtk_window_present(GTK_WINDOW(ctrlwin)); @@ -393,35 +373,11 @@ static GtkWidget* sp_svgview_control_show(struct SPSlideShow *ss) return NULL; } -static int sp_svgview_show_next_cb (GtkWidget */*widget*/, void *data) -{ - sp_svgview_show_next(static_cast(data)); - return FALSE; -} - -static int sp_svgview_show_prev_cb (GtkWidget */*widget*/, void *data) -{ - sp_svgview_show_prev(static_cast(data)); - return FALSE; -} - -static int sp_svgview_goto_first_cb (GtkWidget */*widget*/, void *data) -{ - sp_svgview_goto_first(static_cast(data)); - return FALSE; -} - -static int sp_svgview_goto_last_cb (GtkWidget */*widget*/, void *data) -{ - sp_svgview_goto_last(static_cast(data)); - return FALSE; -} - -static void sp_svgview_waiting_cursor(struct SPSlideShow *ss) +void SPSlideShow::waiting_cursor() { GdkDisplay *display = gdk_display_get_default(); GdkCursor *waiting = gdk_cursor_new_for_display(display, GDK_WATCH); - gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ss->window)), waiting); + gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(window)), waiting); g_object_unref(waiting); if (ctrlwin) { GdkCursor *waiting = gdk_cursor_new_for_display(display, GDK_WATCH); @@ -433,90 +389,91 @@ static void sp_svgview_waiting_cursor(struct SPSlideShow *ss) } } -static void sp_svgview_normal_cursor(struct SPSlideShow *ss) +void SPSlideShow::normal_cursor() { - gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ss->window)), NULL); + gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(window)), NULL); if (ctrlwin) { gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), NULL); } } -static void sp_svgview_set_document(struct SPSlideShow *ss, - SPDocument *doc, - int current) +void SPSlideShow::set_document(SPDocument *doc, + int current) { - if (doc && doc != ss->doc) { + if (doc && doc != this->doc) { doc->ensureUpToDate(); - reinterpret_cast(SP_VIEW_WIDGET_VIEW (ss->view))->setDocument (doc); - ss->doc = doc; - ss->current = current; + reinterpret_cast(SP_VIEW_WIDGET_VIEW (view))->setDocument (doc); + this->doc = doc; + this->current = current; } } -static void sp_svgview_show_next (struct SPSlideShow *ss) +/** + * @brief Show the next file in the slideshow + */ +void SPSlideShow::show_next() { - sp_svgview_waiting_cursor(ss); + waiting_cursor(); SPDocument *doc = NULL; - int current = ss->current; - while (!doc && (current < ss->length - 1)) { - doc = SPDocument::createNewDoc (ss->slides[++current], TRUE, false); + while (!doc && (current < slides.size() - 1)) { + doc = SPDocument::createNewDoc ((slides[++current]).c_str(), TRUE, false); } - sp_svgview_set_document(ss, doc, current); - - sp_svgview_normal_cursor(ss); + set_document(doc, current); + normal_cursor(); } -static void sp_svgview_show_prev (struct SPSlideShow *ss) +/** + * @brief Show the previous file in the slideshow + */ +void SPSlideShow::show_prev() { - sp_svgview_waiting_cursor(ss); + waiting_cursor(); SPDocument *doc = NULL; - int current = ss->current; while (!doc && (current > 0)) { - doc = SPDocument::createNewDoc (ss->slides[--current], TRUE, false); + doc = SPDocument::createNewDoc ((slides[--current]).c_str(), TRUE, false); } - sp_svgview_set_document(ss, doc, current); - - sp_svgview_normal_cursor(ss); + set_document(doc, current); + normal_cursor(); } -static void sp_svgview_goto_first (struct SPSlideShow *ss) +/** + * @brief Switch to first slide in slideshow + */ +void SPSlideShow::goto_first() { - sp_svgview_waiting_cursor(ss); + waiting_cursor(); SPDocument *doc = NULL; int current = 0; - while ( !doc && (current < ss->length - 1)) { - if (current == ss->current) { - break; - } - doc = SPDocument::createNewDoc (ss->slides[current++], TRUE, false); + while ( !doc && (current < slides.size() - 1)) { + doc = SPDocument::createNewDoc((slides[current++]).c_str(), TRUE, false); } - sp_svgview_set_document(ss, doc, current - 1); + set_document(doc, current - 1); - sp_svgview_normal_cursor(ss); + normal_cursor(); } -static void sp_svgview_goto_last (struct SPSlideShow *ss) +/** + * @brief Switch to last slide in slideshow + */ +void SPSlideShow::goto_last() { - sp_svgview_waiting_cursor(ss); + waiting_cursor(); SPDocument *doc = NULL; - int current = ss->length - 1; + int current = slides.size() - 1; while (!doc && (current >= 0)) { - if (current == ss->current) { - break; - } - doc = SPDocument::createNewDoc (ss->slides[current--], TRUE, false); + doc = SPDocument::createNewDoc((slides[current--]).c_str(), TRUE, false); } - sp_svgview_set_document(ss, doc, current + 1); + set_document(doc, current + 1); - sp_svgview_normal_cursor(ss); + normal_cursor(); } #ifdef WITH_INKJAR -- cgit v1.2.3 From 75c4b2b43058668f2c94b27db858763d0b1f308c Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 14 Aug 2016 13:16:27 +0100 Subject: inkview: Convert to ApplicationWindow (bzr r15057) --- src/inkview.cpp | 94 +++++++++++++++++++++++++++------------------------------ 1 file changed, 45 insertions(+), 49 deletions(-) (limited to 'src/inkview.cpp') diff --git a/src/inkview.cpp b/src/inkview.cpp index fe656ca5b..b9447a94f 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -68,15 +69,19 @@ extern char *optarg; extern int optind, opterr; -class SPSlideShow { +/** + * The main application window for the slideshow + */ +class SPSlideShow : public Gtk::ApplicationWindow { public: - std::vector slides; - int current; - SPDocument *doc; - GtkWidget *view; - GtkWidget *window; - bool fullscreen; - int timer; + std::vector slides; ///< List of filenames for each slide + int current; ///< Index of the currently displayed slide + SPDocument *doc; ///< The currently displayed slide + GtkWidget *view; + int timer; + + /// Current state of application (full-screen or windowed) + bool is_fullscreen; SPSlideShow() : @@ -84,20 +89,20 @@ public: current(0), doc(NULL), view(NULL), - fullscreen(false) + is_fullscreen(false) {} - GtkWidget *control_show(); - void show_next(); - void show_prev(); - void goto_first(); - void goto_last(); + void control_show(); + void show_next(); + void show_prev(); + void goto_first(); + void goto_last(); protected: - void waiting_cursor(); - void normal_cursor(); - void set_document(SPDocument *doc, - int current); + void waiting_cursor(); + void normal_cursor(); + void set_document(SPDocument *doc, + int current); }; #ifdef WITH_INKJAR @@ -133,12 +138,12 @@ static int sp_svgview_main_key_press (GtkWidget */*widget*/, ss->goto_last(); break; case GDK_KEY_F11: - if (ss->fullscreen) { - gtk_window_unfullscreen (GTK_WINDOW(ss->window)); - ss->fullscreen = false; + if (ss->is_fullscreen) { + ss->unfullscreen(); + ss->is_fullscreen = false; } else { - gtk_window_fullscreen (GTK_WINDOW(ss->window)); - ss->fullscreen = true; + ss->fullscreen(); + ss->is_fullscreen = true; } break; case GDK_KEY_Return: @@ -164,7 +169,8 @@ static int sp_svgview_main_key_press (GtkWidget */*widget*/, default: break; } - gtk_window_set_title(GTK_WINDOW(ss->window), ss->doc->getName()); + + ss->set_title(ss->doc->getName()); return TRUE; } @@ -202,7 +208,6 @@ int main (int argc, const char **argv) } } - GtkWidget *w; int i; bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); @@ -214,8 +219,6 @@ int main (int argc, const char **argv) Inkscape::GC::init(); Inkscape::Preferences::get(); // ensure preferences are initialized - gtk_init (&argc, (char ***) &argv); - #ifdef lalaWITH_MODULES g_warning ("Have to autoinit modules (lauris)"); sp_modulesys_init(); @@ -291,24 +294,21 @@ int main (int argc, const char **argv) return 1; /* none of the slides loadable */ } - w = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title( GTK_WINDOW(w), ss.doc->getName() ); - gtk_window_set_default_size (GTK_WINDOW (w), - MIN ((int)(ss.doc)->getWidth().value("px"), (int)gdk_screen_width() - 64), - MIN ((int)(ss.doc)->getHeight().value("px"), (int)gdk_screen_height() - 64)); - ss.window = w; + ss.set_title(ss.doc->getName() ); + ss.set_default_size(MIN ((int)(ss.doc)->getWidth().value("px"), (int)gdk_screen_width() - 64), + MIN ((int)(ss.doc)->getHeight().value("px"), (int)gdk_screen_height() - 64)); - g_signal_connect (G_OBJECT (w), "delete_event", (GCallback) sp_svgview_main_delete, &ss); - g_signal_connect (G_OBJECT (w), "key_press_event", (GCallback) sp_svgview_main_key_press, &ss); + g_signal_connect (G_OBJECT (ss.gobj()), "delete_event", (GCallback) sp_svgview_main_delete, &ss); + g_signal_connect (G_OBJECT (ss.gobj()), "key_press_event", (GCallback) sp_svgview_main_key_press, &ss); (ss.doc)->ensureUpToDate(); ss.view = sp_svg_view_widget_new (ss.doc); (ss.doc)->doUnref (); SP_SVG_VIEW_WIDGET(ss.view)->setResize( false, ss.doc->getWidth().value("px"), ss.doc->getHeight().value("px") ); gtk_widget_show (ss.view); - gtk_container_add (GTK_CONTAINER (w), ss.view); + ss.add(*Glib::wrap(ss.view)); - gtk_widget_show (w); + ss.show(); gtk_main (); @@ -326,12 +326,12 @@ static int sp_svgview_ctrlwin_delete (GtkWidget */*widget*/, /** * @brief Show the control buttons (next, previous etc) for the application */ -GtkWidget* SPSlideShow::control_show() +void SPSlideShow::control_show() { if (!ctrlwin) { ctrlwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_resizable(GTK_WINDOW(ctrlwin), FALSE); - gtk_window_set_transient_for(GTK_WINDOW(ctrlwin), GTK_WINDOW(window)); + gtk_window_set_transient_for(GTK_WINDOW(ctrlwin), GTK_WINDOW(this->gobj())); g_signal_connect(G_OBJECT (ctrlwin), "key_press_event", (GCallback) sp_svgview_main_key_press, this); g_signal_connect(G_OBJECT (ctrlwin), "delete_event", (GCallback) sp_svgview_ctrlwin_delete, NULL); auto t = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); @@ -369,20 +369,16 @@ GtkWidget* SPSlideShow::control_show() } else { gtk_window_present(GTK_WINDOW(ctrlwin)); } - - return NULL; } void SPSlideShow::waiting_cursor() { - GdkDisplay *display = gdk_display_get_default(); - GdkCursor *waiting = gdk_cursor_new_for_display(display, GDK_WATCH); - gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(window)), waiting); - g_object_unref(waiting); + auto display = Gdk::Display::get_default(); + auto waiting = Gdk::Cursor::create(display, Gdk::WATCH); + get_window()->set_cursor(waiting); + if (ctrlwin) { - GdkCursor *waiting = gdk_cursor_new_for_display(display, GDK_WATCH); - gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), waiting); - g_object_unref(waiting); + gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), waiting->gobj()); } while(gtk_events_pending()) { gtk_main_iteration(); @@ -391,7 +387,7 @@ void SPSlideShow::waiting_cursor() void SPSlideShow::normal_cursor() { - gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(window)), NULL); + get_window()->set_cursor(); if (ctrlwin) { gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), NULL); } -- cgit v1.2.3 From 230c3e966f370c563e2ede394d336cb0b760d4f6 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 23 Aug 2016 22:49:43 +0100 Subject: Inkview: Use GOptionContext (bzr r15072) --- src/inkview.cpp | 114 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 54 deletions(-) (limited to 'src/inkview.cpp') diff --git a/src/inkview.cpp b/src/inkview.cpp index b9447a94f..4dcaa247d 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -34,6 +34,8 @@ #include #include +#include + #include #include #include @@ -43,7 +45,6 @@ #include #include -#include #include "inkgc/gc-core.h" #include "preferences.h" @@ -66,9 +67,6 @@ #include "ui/icon-names.h" -extern char *optarg; -extern int optind, opterr; - /** * The main application window for the slideshow */ @@ -174,41 +172,56 @@ static int sp_svgview_main_key_press (GtkWidget */*widget*/, return TRUE; } -int main (int argc, const char **argv) +/// List of all input filenames +static Glib::OptionGroup::vecustrings filenames; + +/// Input timer option +static int timer = 0; + +/** + * \brief Set of command-line options for Inkview + */ +class InkviewOptionsGroup : public Glib::OptionGroup { - if (argc == 1) { - usage(); +public: + InkviewOptionsGroup() + : + Glib::OptionGroup(_("Inkscape Options"), + _("Default program options")), + _entry_timer(), + _entry_args() + { + // Entry for the "timer" option + _entry_timer.set_short_name('t'); + _entry_timer.set_long_name("timer"); + _entry_timer.set_arg_description(_("NUM")); + add_entry(_entry_timer, timer); + + // Entry for the remaining non-option arguments + _entry_args.set_short_name('\0'); + _entry_args.set_long_name(G_OPTION_REMAINING); + _entry_args.set_arg_description(_("FILES...")); + + add_entry(_entry_args, filenames); } +private: + Glib::OptionEntry _entry_timer; + Glib::OptionEntry _entry_args; +}; + +int main (int argc, char **argv) +{ + Glib::OptionContext opt(_("Open SVG files")); + InkviewOptionsGroup grp; + opt.set_main_group(grp); + // Prevents errors like "Unable to wrap GdkPixbuf..." (in nr-filter-image.cpp for example) Gtk::Main::init_gtkmm_internals(); + Gtk::Main main_instance (argc, argv, opt); - Gtk::Main main_instance (&argc, const_cast(&argv)); - - int num_parsed_options = 0; SPSlideShow ss; - - // the list of arguments is in the net line - for (int i = 1; i < argc; i++) { - if ((argv[i][0] == '-')) { - if (!strcmp(argv[i], "--")) { - break; - } - else if ((!strcmp(argv[i], "-t"))) { - if (i + 1 >= argc) { - usage(); - } - ss.timer = atoi(argv[i+1]); - num_parsed_options = i+1; - i++; - } - else { - usage(); - } - } - } - - int i; + ss.timer=timer; bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -232,19 +245,24 @@ int main (int argc, const char **argv) Inkscape::Application::create(argv[0], true); //Inkscape::Application &inkscape = Inkscape::Application::instance(); - // starting at where the commandline options stopped parsing because - // we want all the files to be in the list - for (i = num_parsed_options + 1 ; i < argc; i++) { + if(filenames.empty()) + { + std::cout << opt.get_help(); + exit(EXIT_FAILURE); + } + + for(auto file : filenames) + { struct stat st; - if (stat (argv[i], &st) - || !S_ISREG (st.st_mode) - || (st.st_size < 64)) { - fprintf(stderr, "could not open file %s\n", argv[i]); + if (stat(file.c_str(), &st) + || !S_ISREG (st.st_mode) + || (st.st_size < 64)) { + fprintf(stderr, "could not open file %s\n", file.c_str()); } else { #ifdef WITH_INKJAR - if (is_jar(argv[i])) { - Inkjar::JarFileReader jar_file_reader(argv[i]); + if (is_jar(file.c_str())) { + Inkjar::JarFileReader jar_file_reader(file.c_str()); for (;;) { GByteArray *gba = jar_file_reader.get_next_file(); if (gba == NULL) { @@ -276,7 +294,7 @@ int main (int argc, const char **argv) } else { #endif /* WITH_INKJAR */ /* Append to list */ - ss.slides.push_back(strdup (argv[i])); + ss.slides.push_back(file); if (!ss.doc) { ss.doc = SPDocument::createNewDoc((ss.slides[ss.current]).c_str(), TRUE, false); @@ -487,18 +505,6 @@ static bool is_jar(char const *filename) } #endif /* WITH_INKJAR */ -static void usage() -{ - fprintf(stderr, - "Usage: inkview [OPTIONS...] [FILES ...]\n" - "\twhere FILES are SVG (.svg or .svgz)" -#ifdef WITH_INKJAR - " or archives of SVGs (.sxw, .jar)" -#endif - "\n"); - exit(1); -} - /* Local Variables: mode:c++ -- cgit v1.2.3 From cb2670616b3cfb41ee235f6505ddc9105604d74c Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 23 Aug 2016 23:55:16 +0100 Subject: Inkview: C++ify (bzr r15073) --- src/inkview.cpp | 145 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 81 insertions(+), 64 deletions(-) (limited to 'src/inkview.cpp') diff --git a/src/inkview.cpp b/src/inkview.cpp index 4dcaa247d..61017fc71 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -67,29 +67,64 @@ #include "ui/icon-names.h" +class SPSlideShow; + +static int sp_svgview_main_delete (GtkWidget *widget, + GdkEvent *event, + struct SPSlideShow *ss); + +static int sp_svgview_main_key_press (GtkWidget *widget, + GdkEventKey *event, + struct SPSlideShow *ss); + /** * The main application window for the slideshow */ class SPSlideShow : public Gtk::ApplicationWindow { + std::vector _slides; ///< List of filenames for each slide + int _current; ///< Index of the currently displayed slide + SPDocument *_doc; ///< The currently displayed slide + int _timer; + GtkWidget *_view; + public: - std::vector slides; ///< List of filenames for each slide - int current; ///< Index of the currently displayed slide - SPDocument *doc; ///< The currently displayed slide - GtkWidget *view; - int timer; - /// Current state of application (full-screen or windowed) bool is_fullscreen; - SPSlideShow() + /// Update the window title with current document name + void update_title() + { + set_title(_doc->getName()); + } + + SPSlideShow(std::vector &slides) : - slides(), - current(0), - doc(NULL), - view(NULL), - is_fullscreen(false) - {} + _slides(slides), + _current(0), + _doc(SPDocument::createNewDoc(_slides[0].c_str(), true, false)), + _view(NULL), + is_fullscreen(false), + _timer(0) + { + update_title(); + + set_default_size(MIN ((int)_doc->getWidth().value("px"), (int)gdk_screen_width() - 64), + MIN ((int)_doc->getHeight().value("px"), (int)gdk_screen_height() - 64)); + + g_signal_connect (G_OBJECT (gobj()), "delete_event", (GCallback) sp_svgview_main_delete, this); + g_signal_connect (G_OBJECT (gobj()), "key_press_event", (GCallback) sp_svgview_main_key_press, this); + + _doc->ensureUpToDate(); + _view = sp_svg_view_widget_new (_doc); + _doc->doUnref (); + SP_SVG_VIEW_WIDGET(_view)->setResize( false, _doc->getWidth().value("px"), _doc->getHeight().value("px") ); + gtk_widget_show (_view); + add(*Glib::wrap(_view)); + + show(); + } + void set_timer(int timer) {_timer = timer;} void control_show(); void show_next(); void show_prev(); @@ -118,7 +153,7 @@ static int sp_svgview_main_delete (GtkWidget */*widget*/, GdkEvent */*event*/, struct SPSlideShow */*ss*/) { - gtk_main_quit (); + Gtk::Main::quit(); return FALSE; } @@ -168,7 +203,7 @@ static int sp_svgview_main_key_press (GtkWidget */*widget*/, break; } - ss->set_title(ss->doc->getName()); + ss->update_title(); return TRUE; } @@ -220,9 +255,6 @@ int main (int argc, char **argv) Gtk::Main::init_gtkmm_internals(); Gtk::Main main_instance (argc, argv, opt); - SPSlideShow ss; - ss.timer=timer; - bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); @@ -243,7 +275,6 @@ int main (int argc, char **argv) setlocale (LC_NUMERIC, "C"); Inkscape::Application::create(argv[0], true); - //Inkscape::Application &inkscape = Inkscape::Application::instance(); if(filenames.empty()) { @@ -251,6 +282,8 @@ int main (int argc, char **argv) exit(EXIT_FAILURE); } + std::vector valid_files; + for(auto file : filenames) { struct stat st; @@ -277,13 +310,13 @@ int main (int argc, char **argv) } } } else if (gba->len > 0) { - ss.doc = SPDocument::createNewDocFromMem ((const gchar *)gba->data, - gba->len, - TRUE); + // Try opening the document + auto doc = SPDocument::createNewDocFromMem ((const gchar *)gba->data, + gba->len, + TRUE); gchar *last_filename = jar_file_reader.get_last_filename(); - if (ss.doc) { - ss.slides.push_back(strdup(last_filename)); - (ss.doc)->setUri(last_filename); + if (doc) { + valid_files.push_back(strdup(last_filename)); } g_byte_array_free(gba, TRUE); g_free(last_filename); @@ -293,14 +326,12 @@ int main (int argc, char **argv) } } else { #endif /* WITH_INKJAR */ - /* Append to list */ - ss.slides.push_back(file); + auto doc = SPDocument::createNewDoc(file.c_str(), TRUE, false); - if (!ss.doc) { - ss.doc = SPDocument::createNewDoc((ss.slides[ss.current]).c_str(), TRUE, false); - if (!ss.doc) { - ++ss.current; - } + if(doc) + { + /* Append to list */ + valid_files.push_back(file); } #ifdef WITH_INKJAR } @@ -308,27 +339,13 @@ int main (int argc, char **argv) } } - if(!ss.doc) { + if(valid_files.empty()) { return 1; /* none of the slides loadable */ } - ss.set_title(ss.doc->getName() ); - ss.set_default_size(MIN ((int)(ss.doc)->getWidth().value("px"), (int)gdk_screen_width() - 64), - MIN ((int)(ss.doc)->getHeight().value("px"), (int)gdk_screen_height() - 64)); - - g_signal_connect (G_OBJECT (ss.gobj()), "delete_event", (GCallback) sp_svgview_main_delete, &ss); - g_signal_connect (G_OBJECT (ss.gobj()), "key_press_event", (GCallback) sp_svgview_main_key_press, &ss); - - (ss.doc)->ensureUpToDate(); - ss.view = sp_svg_view_widget_new (ss.doc); - (ss.doc)->doUnref (); - SP_SVG_VIEW_WIDGET(ss.view)->setResize( false, ss.doc->getWidth().value("px"), ss.doc->getHeight().value("px") ); - gtk_widget_show (ss.view); - ss.add(*Glib::wrap(ss.view)); - - ss.show(); - - gtk_main (); + SPSlideShow ss(valid_files); + ss.set_timer(timer); + main_instance.run(); return 0; } @@ -414,11 +431,11 @@ void SPSlideShow::normal_cursor() void SPSlideShow::set_document(SPDocument *doc, int current) { - if (doc && doc != this->doc) { + if (doc && doc != _doc) { doc->ensureUpToDate(); - reinterpret_cast(SP_VIEW_WIDGET_VIEW (view))->setDocument (doc); - this->doc = doc; - this->current = current; + reinterpret_cast(SP_VIEW_WIDGET_VIEW (_view))->setDocument (doc); + _doc = doc; + _current = current; } } @@ -430,11 +447,11 @@ void SPSlideShow::show_next() waiting_cursor(); SPDocument *doc = NULL; - while (!doc && (current < slides.size() - 1)) { - doc = SPDocument::createNewDoc ((slides[++current]).c_str(), TRUE, false); + while (!doc && (_current < _slides.size() - 1)) { + doc = SPDocument::createNewDoc ((_slides[++_current]).c_str(), TRUE, false); } - set_document(doc, current); + set_document(doc, _current); normal_cursor(); } @@ -446,11 +463,11 @@ void SPSlideShow::show_prev() waiting_cursor(); SPDocument *doc = NULL; - while (!doc && (current > 0)) { - doc = SPDocument::createNewDoc ((slides[--current]).c_str(), TRUE, false); + while (!doc && (_current > 0)) { + doc = SPDocument::createNewDoc ((_slides[--_current]).c_str(), TRUE, false); } - set_document(doc, current); + set_document(doc, _current); normal_cursor(); } @@ -463,8 +480,8 @@ void SPSlideShow::goto_first() SPDocument *doc = NULL; int current = 0; - while ( !doc && (current < slides.size() - 1)) { - doc = SPDocument::createNewDoc((slides[current++]).c_str(), TRUE, false); + while ( !doc && (current < _slides.size() - 1)) { + doc = SPDocument::createNewDoc((_slides[current++]).c_str(), TRUE, false); } set_document(doc, current - 1); @@ -480,9 +497,9 @@ void SPSlideShow::goto_last() waiting_cursor(); SPDocument *doc = NULL; - int current = slides.size() - 1; + int current = _slides.size() - 1; while (!doc && (current >= 0)) { - doc = SPDocument::createNewDoc((slides[current--]).c_str(), TRUE, false); + doc = SPDocument::createNewDoc((_slides[current--]).c_str(), TRUE, false); } set_document(doc, current + 1); -- cgit v1.2.3 From caadc219ec9987f65d94a1e8f8198c9ab3c08bf5 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 25 Aug 2016 22:40:33 +0100 Subject: Inkview: Remove support for obsolete SVG JAR archives (bzr r15075) --- src/inkview.cpp | 59 --------------------------------------------------------- 1 file changed, 59 deletions(-) (limited to 'src/inkview.cpp') diff --git a/src/inkview.cpp b/src/inkview.cpp index 61017fc71..694869bf8 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -55,10 +55,6 @@ #include "svg-view-widget.h" #include "util/units.h" -#ifdef WITH_INKJAR -#include "io/inkjar.h" -#endif - #include "inkscape.h" #ifndef HAVE_BIND_TEXTDOMAIN_CODESET @@ -138,9 +134,6 @@ protected: int current); }; -#ifdef WITH_INKJAR -static bool is_jar(char const *filename); -#endif static void usage(); static GtkWidget *ctrlwin = NULL; @@ -292,40 +285,6 @@ int main (int argc, char **argv) || (st.st_size < 64)) { fprintf(stderr, "could not open file %s\n", file.c_str()); } else { - - #ifdef WITH_INKJAR - if (is_jar(file.c_str())) { - Inkjar::JarFileReader jar_file_reader(file.c_str()); - for (;;) { - GByteArray *gba = jar_file_reader.get_next_file(); - if (gba == NULL) { - char *c_ptr; - gchar *last_filename = jar_file_reader.get_last_filename(); - if (last_filename == NULL) - break; - if ((c_ptr = std::strrchr(last_filename, '/')) != NULL) { - if (*(++c_ptr) == '\0') { - g_free(last_filename); - continue; - } - } - } else if (gba->len > 0) { - // Try opening the document - auto doc = SPDocument::createNewDocFromMem ((const gchar *)gba->data, - gba->len, - TRUE); - gchar *last_filename = jar_file_reader.get_last_filename(); - if (doc) { - valid_files.push_back(strdup(last_filename)); - } - g_byte_array_free(gba, TRUE); - g_free(last_filename); - } else { - break; - } - } - } else { - #endif /* WITH_INKJAR */ auto doc = SPDocument::createNewDoc(file.c_str(), TRUE, false); if(doc) @@ -333,9 +292,6 @@ int main (int argc, char **argv) /* Append to list */ valid_files.push_back(file); } - #ifdef WITH_INKJAR - } - #endif } } @@ -507,21 +463,6 @@ void SPSlideShow::goto_last() normal_cursor(); } -#ifdef WITH_INKJAR -static bool is_jar(char const *filename) -{ - /* fixme: Check MIME type or something. /usr/share/misc/file/magic suggests that checking for - initial string "PK\003\004" in content should suffice. */ - size_t const filename_len = strlen(filename); - if (filename_len < 5) { - return false; - } - char const *extension = filename + filename_len - 4; - return ((memcmp(extension, ".jar", 4) == 0) || - (memcmp(extension, ".sxw", 4) == 0) ); -} -#endif /* WITH_INKJAR */ - /* Local Variables: mode:c++ -- cgit v1.2.3 From 2e0b7a4f08c74d8bd326616b5d48b0d1c8614672 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 25 Aug 2016 23:24:46 +0100 Subject: Inkview: C++ify (bzr r15076) --- src/inkview.cpp | 103 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 49 deletions(-) (limited to 'src/inkview.cpp') diff --git a/src/inkview.cpp b/src/inkview.cpp index 694869bf8..434680884 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -38,11 +38,10 @@ #include #include +#include #include #include -// #include - #include #include @@ -93,33 +92,8 @@ public: set_title(_doc->getName()); } - SPSlideShow(std::vector &slides) - : - _slides(slides), - _current(0), - _doc(SPDocument::createNewDoc(_slides[0].c_str(), true, false)), - _view(NULL), - is_fullscreen(false), - _timer(0) - { - update_title(); - - set_default_size(MIN ((int)_doc->getWidth().value("px"), (int)gdk_screen_width() - 64), - MIN ((int)_doc->getHeight().value("px"), (int)gdk_screen_height() - 64)); - - g_signal_connect (G_OBJECT (gobj()), "delete_event", (GCallback) sp_svgview_main_delete, this); - g_signal_connect (G_OBJECT (gobj()), "key_press_event", (GCallback) sp_svgview_main_key_press, this); - - _doc->ensureUpToDate(); - _view = sp_svg_view_widget_new (_doc); - _doc->doUnref (); - SP_SVG_VIEW_WIDGET(_view)->setResize( false, _doc->getWidth().value("px"), _doc->getHeight().value("px") ); - gtk_widget_show (_view); - add(*Glib::wrap(_view)); - - show(); - } - + SPSlideShow(std::vector const &slides); + void set_timer(int timer) {_timer = timer;} void control_show(); void show_next(); @@ -134,9 +108,38 @@ protected: int current); }; +SPSlideShow::SPSlideShow(std::vector const &slides) + : + _slides(slides), + _current(0), + _doc(SPDocument::createNewDoc(_slides[0].c_str(), true, false)), + _view(NULL), + is_fullscreen(false), + _timer(0) +{ + update_title(); + + 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)); + + g_signal_connect (G_OBJECT (gobj()), "delete_event", (GCallback) sp_svgview_main_delete, this); + g_signal_connect (G_OBJECT (gobj()), "key_press_event", (GCallback) sp_svgview_main_key_press, this); + + _doc->ensureUpToDate(); + _view = sp_svg_view_widget_new (_doc); + _doc->doUnref (); + SP_SVG_VIEW_WIDGET(_view)->setResize( false, _doc->getWidth().value("px"), _doc->getHeight().value("px") ); + gtk_widget_show (_view); + add(*Glib::wrap(_view)); + + show(); +} + static void usage(); -static GtkWidget *ctrlwin = NULL; +static Gtk::Window *ctrlwin = NULL; // Dummy functions to keep linker happy int sp_main_gui (int, char const**) { return 0; } @@ -190,7 +193,7 @@ static int sp_svgview_main_key_press (GtkWidget */*widget*/, case GDK_KEY_Escape: case GDK_KEY_q: case GDK_KEY_Q: - gtk_main_quit(); + Gtk::Main::quit(); break; default: break; @@ -283,7 +286,7 @@ int main (int argc, char **argv) if (stat(file.c_str(), &st) || !S_ISREG (st.st_mode) || (st.st_size < 64)) { - fprintf(stderr, "could not open file %s\n", file.c_str()); + std::cerr << "could not open file " << file << std::endl; } else { auto doc = SPDocument::createNewDoc(file.c_str(), TRUE, false); @@ -310,6 +313,8 @@ static int sp_svgview_ctrlwin_delete (GtkWidget */*widget*/, GdkEvent */*event*/, void */*data*/) { + if(ctrlwin) delete ctrlwin; + ctrlwin = NULL; return FALSE; } @@ -320,45 +325,45 @@ static int sp_svgview_ctrlwin_delete (GtkWidget */*widget*/, void SPSlideShow::control_show() { if (!ctrlwin) { - ctrlwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_resizable(GTK_WINDOW(ctrlwin), FALSE); - gtk_window_set_transient_for(GTK_WINDOW(ctrlwin), GTK_WINDOW(this->gobj())); - g_signal_connect(G_OBJECT (ctrlwin), "key_press_event", (GCallback) sp_svgview_main_key_press, this); - g_signal_connect(G_OBJECT (ctrlwin), "delete_event", (GCallback) sp_svgview_ctrlwin_delete, NULL); - auto t = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); - gtk_container_add(GTK_CONTAINER(ctrlwin), t); + ctrlwin = new Gtk::Window(); + ctrlwin->set_resizable(false); + ctrlwin->set_transient_for(*this); + g_signal_connect(G_OBJECT (ctrlwin->gobj()), "key_press_event", (GCallback) sp_svgview_main_key_press, this); + g_signal_connect(G_OBJECT (ctrlwin->gobj()), "delete_event", (GCallback) sp_svgview_ctrlwin_delete, NULL); + auto t = Gtk::manage(new Gtk::ButtonBox()); + ctrlwin->add(*t); auto btn_go_first = Gtk::manage(new Gtk::Button()); auto img_go_first = Gtk::manage(new Gtk::Image()); img_go_first->set_from_icon_name(INKSCAPE_ICON("go-first"), Gtk::ICON_SIZE_BUTTON); btn_go_first->set_image(*img_go_first); - gtk_container_add(GTK_CONTAINER(t), GTK_WIDGET(btn_go_first->gobj())); + t->add(*btn_go_first); btn_go_first->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::goto_first)); auto btn_go_prev = Gtk::manage(new Gtk::Button()); auto img_go_prev = Gtk::manage(new Gtk::Image()); img_go_prev->set_from_icon_name(INKSCAPE_ICON("go-previous"), Gtk::ICON_SIZE_BUTTON); btn_go_prev->set_image(*img_go_prev); - gtk_container_add(GTK_CONTAINER(t), GTK_WIDGET(btn_go_prev->gobj())); + t->add(*btn_go_prev); btn_go_prev->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::show_prev)); auto btn_go_next = Gtk::manage(new Gtk::Button()); auto img_go_next = Gtk::manage(new Gtk::Image()); img_go_next->set_from_icon_name(INKSCAPE_ICON("go-next"), Gtk::ICON_SIZE_BUTTON); btn_go_next->set_image(*img_go_next); - gtk_container_add(GTK_CONTAINER(t), GTK_WIDGET(btn_go_next->gobj())); + t->add(*btn_go_next); btn_go_next->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::show_next)); auto btn_go_last = Gtk::manage(new Gtk::Button()); auto img_go_last = Gtk::manage(new Gtk::Image()); img_go_last->set_from_icon_name(INKSCAPE_ICON("go-last"), Gtk::ICON_SIZE_BUTTON); btn_go_last->set_image(*img_go_last); - gtk_container_add(GTK_CONTAINER(t), GTK_WIDGET(btn_go_last->gobj())); + t->add(*btn_go_last); btn_go_last->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::goto_last)); - gtk_widget_show_all(ctrlwin); + ctrlwin->show_all(); } else { - gtk_window_present(GTK_WINDOW(ctrlwin)); + ctrlwin->present(); } } @@ -369,10 +374,10 @@ void SPSlideShow::waiting_cursor() get_window()->set_cursor(waiting); if (ctrlwin) { - gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), waiting->gobj()); + ctrlwin->get_window()->set_cursor(waiting); } - while(gtk_events_pending()) { - gtk_main_iteration(); + while(Gtk::Main::events_pending()) { + Gtk::Main::iteration(); } } @@ -380,7 +385,7 @@ void SPSlideShow::normal_cursor() { get_window()->set_cursor(); if (ctrlwin) { - gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), NULL); + ctrlwin->get_window()->set_cursor(); } } -- cgit v1.2.3 From 89375d1e62cb033ec870e9b8e7837437b71737e3 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 25 Aug 2016 23:58:15 +0100 Subject: Inkview: Make ctrlwin private (bzr r15077) --- src/inkview.cpp | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) (limited to 'src/inkview.cpp') diff --git a/src/inkview.cpp b/src/inkview.cpp index 434680884..7acaa83dd 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -76,11 +76,13 @@ static int sp_svgview_main_key_press (GtkWidget *widget, * The main application window for the slideshow */ class SPSlideShow : public Gtk::ApplicationWindow { +private: std::vector _slides; ///< List of filenames for each slide int _current; ///< Index of the currently displayed slide SPDocument *_doc; ///< The currently displayed slide int _timer; GtkWidget *_view; + Gtk::Window *_ctrlwin; ///< Window containing slideshow control buttons public: /// Current state of application (full-screen or windowed) @@ -101,6 +103,9 @@ public: void goto_first(); void goto_last(); + static int ctrlwin_delete (GtkWidget *widget, + GdkEvent *event, + void *data); protected: void waiting_cursor(); void normal_cursor(); @@ -115,7 +120,8 @@ SPSlideShow::SPSlideShow(std::vector const &slides) _doc(SPDocument::createNewDoc(_slides[0].c_str(), true, false)), _view(NULL), is_fullscreen(false), - _timer(0) + _timer(0), + _ctrlwin(NULL) { update_title(); @@ -139,7 +145,6 @@ SPSlideShow::SPSlideShow(std::vector const &slides) static void usage(); -static Gtk::Window *ctrlwin = NULL; // Dummy functions to keep linker happy int sp_main_gui (int, char const**) { return 0; } @@ -309,13 +314,14 @@ int main (int argc, char **argv) return 0; } -static int sp_svgview_ctrlwin_delete (GtkWidget */*widget*/, - GdkEvent */*event*/, - void */*data*/) +int SPSlideShow::ctrlwin_delete (GtkWidget */*widget*/, + GdkEvent */*event*/, + void *data) { - if(ctrlwin) delete ctrlwin; + auto ss = reinterpret_cast(data); + if(ss->_ctrlwin) delete ss->_ctrlwin; - ctrlwin = NULL; + ss->_ctrlwin = NULL; return FALSE; } @@ -324,14 +330,14 @@ static int sp_svgview_ctrlwin_delete (GtkWidget */*widget*/, */ void SPSlideShow::control_show() { - if (!ctrlwin) { - ctrlwin = new Gtk::Window(); - ctrlwin->set_resizable(false); - ctrlwin->set_transient_for(*this); - g_signal_connect(G_OBJECT (ctrlwin->gobj()), "key_press_event", (GCallback) sp_svgview_main_key_press, this); - g_signal_connect(G_OBJECT (ctrlwin->gobj()), "delete_event", (GCallback) sp_svgview_ctrlwin_delete, NULL); + if (!_ctrlwin) { + _ctrlwin = new Gtk::Window(); + _ctrlwin->set_resizable(false); + _ctrlwin->set_transient_for(*this); + g_signal_connect(G_OBJECT (_ctrlwin->gobj()), "key_press_event", (GCallback) sp_svgview_main_key_press, this); + g_signal_connect(G_OBJECT (_ctrlwin->gobj()), "delete_event", (GCallback) SPSlideShow::ctrlwin_delete, this); auto t = Gtk::manage(new Gtk::ButtonBox()); - ctrlwin->add(*t); + _ctrlwin->add(*t); auto btn_go_first = Gtk::manage(new Gtk::Button()); auto img_go_first = Gtk::manage(new Gtk::Image()); @@ -361,9 +367,9 @@ void SPSlideShow::control_show() t->add(*btn_go_last); btn_go_last->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::goto_last)); - ctrlwin->show_all(); + _ctrlwin->show_all(); } else { - ctrlwin->present(); + _ctrlwin->present(); } } @@ -373,8 +379,8 @@ void SPSlideShow::waiting_cursor() auto waiting = Gdk::Cursor::create(display, Gdk::WATCH); get_window()->set_cursor(waiting); - if (ctrlwin) { - ctrlwin->get_window()->set_cursor(waiting); + if (_ctrlwin) { + _ctrlwin->get_window()->set_cursor(waiting); } while(Gtk::Main::events_pending()) { Gtk::Main::iteration(); @@ -384,8 +390,8 @@ void SPSlideShow::waiting_cursor() void SPSlideShow::normal_cursor() { get_window()->set_cursor(); - if (ctrlwin) { - ctrlwin->get_window()->set_cursor(); + if (_ctrlwin) { + _ctrlwin->get_window()->set_cursor(); } } -- cgit v1.2.3