From a7951dd813baed66f982e35c0dcdae292d72bd91 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 17 May 2017 10:47:59 +0200 Subject: [PATCH] [Gtk] Workaround broken gtk_image_set_from_resource --- gtk/src/MainWindow.cc | 7 +++++++ gtk/src/OutputEditorText.cc | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/gtk/src/MainWindow.cc b/gtk/src/MainWindow.cc index d5e892e..f18f25b 100644 --- a/gtk/src/MainWindow.cc +++ b/gtk/src/MainWindow.cc @@ -144,6 +144,13 @@ MainWindow::MainWindow() m_idlegroup.push_back(getWidget("button:main.autolayout")); m_idlegroup.push_back(getWidget("menubutton:main.languages")); + getWidget("image:main.controls").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/controls.png")); + getWidget("image:display.rotate.mode").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_pages.png")); + getWidget("image:display.rotate.all").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_pages.png")); + getWidget("image:display.rotate.current").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_page.png")); + getWidget("image:main.autolayout").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/autolayout.png")); + + CONNECT(m_window, delete_event, [this](GdkEventAny* ev) { return closeEvent(ev); }); diff --git a/gtk/src/OutputEditorText.cc b/gtk/src/OutputEditorText.cc index 77942bc..4fc5326 100644 --- a/gtk/src/OutputEditorText.cc +++ b/gtk/src/OutputEditorText.cc @@ -59,6 +59,12 @@ OutputEditorText::OutputEditorText() m_toggleSearchButton->add_accelerator("clicked", group, GDK_KEY_F, Gdk::CONTROL_MASK, Gtk::AccelFlags(0)); saveButton->add_accelerator("clicked", group, GDK_KEY_S, Gdk::CONTROL_MASK, Gtk::AccelFlags(0)); + m_builder("image:output.insert").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_append.png")); + m_builder("image:output.stripcrlf").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/stripcrlf.png")); + m_builder("image:output.insert.append").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_append.png")); + m_builder("image:output.insert.cursor").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_cursor.png")); + m_builder("image:output.insert.replace").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_replace.png")); + m_substitutionsManager = new SubstitutionsManager(m_builder, m_textBuffer); m_insertMode = InsertMode::Append; -- 2.13.0