--- gigedit/trunk/src/gigedit/scripteditor.cpp 2016/05/02 16:10:56 2901 +++ gigedit/trunk/src/gigedit/scripteditor.cpp 2020/02/01 19:39:06 3736 @@ -1,5 +1,5 @@ /* - Copyright (c) 2014-2016 Christian Schoenebeck + Copyright (c) 2014-2020 Christian Schoenebeck This file is part of "gigedit" and released under the terms of the GNU General Public License version 2. @@ -7,12 +7,18 @@ #include "scripteditor.h" #include "global.h" +#include "compat.h" +#include // for gtk_widget_modify_*() +#if defined(__APPLE__) +# include "MacHelper.h" +#endif +#include // for log10() #if !USE_LS_SCRIPTVM static const std::string _keywords[] = { "on", "end", "declare", "while", "if", "or", "and", "not", "else", "case", - "select", "to", "const", "polyphonic", "mod" + "select", "to", "const", "polyphonic", "mod", "synchronized" }; static int _keywordsSz = sizeof(_keywords) / sizeof(std::string); @@ -41,6 +47,8 @@ int w = 0; int h = 0; // ignored Gtk::IconSize::lookup(Gtk::ICON_SIZE_SMALL_TOOLBAR, w, h); + if (!theme->has_icon(name)) + return Glib::RefPtr(); Glib::RefPtr pixbuf = theme->load_icon(name, w, Gtk::ICON_LOOKUP_GENERIC_FALLBACK); if (pixbuf->get_height() != targetH) { pixbuf = pixbuf->scale_simple(targetH, targetH, Gdk::INTERP_BILINEAR); @@ -48,19 +56,58 @@ return pixbuf; } +static Glib::RefPtr createIcon(std::vector alternativeNames, const Glib::RefPtr& screen) { + for (int i = 0; i < alternativeNames.size(); ++i) { + Glib::RefPtr buf = createIcon(alternativeNames[i], screen); + if (buf) return buf; + } + return Glib::RefPtr(); +} + ScriptEditor::ScriptEditor() : m_statusLabel("", Gtk::ALIGN_START), +#if HAS_GTKMM_STOCK + m_applyButton(Gtk::Stock::APPLY), + m_cancelButton(Gtk::Stock::CANCEL) +#else m_applyButton(_("_Apply"), true), m_cancelButton(_("_Cancel"), true) +#endif { m_script = NULL; #if USE_LS_SCRIPTVM m_vm = NULL; #endif - m_errorIcon = createIcon("dialog-error", get_screen()); - m_warningIcon = createIcon("dialog-warning-symbolic", get_screen()); - m_successIcon = createIcon("emblem-default", get_screen()); + if (!Settings::singleton()->autoRestoreWindowDimension) { + set_default_size(800, 700); + set_position(Gtk::WIN_POS_MOUSE); + } + + // depending on GTK version and installed themes, there may be different + // icons, and different names for them, so for each type of icon we use, + // we provide a list of possible icon names, the first one found to be + // installed on the local system from the list will be used and loaded for + // the respective purpose (so order matters in those lists) + // + // (see https://developer.gnome.org/gtkmm/stable/namespaceGtk_1_1Stock.html for + // available icon names) + std::vector errorIconNames; + errorIconNames.push_back("dialog-error"); + errorIconNames.push_back("media-record"); + errorIconNames.push_back("process-stop"); + + std::vector warningIconNames; + warningIconNames.push_back("dialog-warning-symbolic"); + warningIconNames.push_back("dialog-warning"); + + std::vector successIconNames; + successIconNames.push_back("emblem-default"); + successIconNames.push_back("tools-check-spelling"); + + m_errorIcon = createIcon(errorIconNames, get_screen()); + m_warningIcon = createIcon(warningIconNames, get_screen()); + m_successIcon = createIcon(successIconNames, get_screen()); add(m_vbox); @@ -92,14 +139,26 @@ m_stringTag->property_foreground() = "#c40c0c"; // red m_tagTable->add(m_stringTag); + m_patchTag = Gtk::TextBuffer::Tag::create(); + m_patchTag->property_foreground() = "#FF4FF3"; // pink + m_patchTag->property_weight() = PANGO_WEIGHT_BOLD; + m_tagTable->add(m_patchTag); + m_commentTag = Gtk::TextBuffer::Tag::create(); m_commentTag->property_foreground() = "#9c9c9c"; // gray m_tagTable->add(m_commentTag); + #define PREPROC_TOKEN_COLOR "#2f8a33" // green + m_preprocTag = Gtk::TextBuffer::Tag::create(); - m_preprocTag->property_foreground() = "#2f8a33"; // green + m_preprocTag->property_foreground() = PREPROC_TOKEN_COLOR; m_tagTable->add(m_preprocTag); + m_preprocCommentTag = Gtk::TextBuffer::Tag::create(); + m_preprocCommentTag->property_strikethrough() = true; + m_preprocCommentTag->property_background() = "#e5e5e5"; + m_tagTable->add(m_preprocCommentTag); + m_errorTag = Gtk::TextBuffer::Tag::create(); m_errorTag->property_background() = "#ff9393"; // red m_tagTable->add(m_errorTag); @@ -108,15 +167,80 @@ m_warningTag->property_background() = "#fffd7c"; // yellow m_tagTable->add(m_warningTag); + m_lineNrTag = Gtk::TextBuffer::Tag::create(); + m_lineNrTag->property_foreground() = "#CCCCCC"; + m_tagTable->add(m_lineNrTag); + + m_metricTag = Gtk::TextBuffer::Tag::create(); + m_metricTag->property_foreground() = "#000000"; // black + m_tagTable->add(m_metricTag); + + m_stdUnitTag = Gtk::TextBuffer::Tag::create(); + m_stdUnitTag->property_foreground() = "#50BC00"; // greenish + m_tagTable->add(m_stdUnitTag); + // create menu +#if USE_GTKMM_BUILDER + m_actionGroup = Gio::SimpleActionGroup::create(); + m_actionGroup->add_action( + "Apply", sigc::mem_fun(*this, &ScriptEditor::onButtonApply) + ); + m_actionGroup->add_action( + "Close", sigc::mem_fun(*this, &ScriptEditor::onButtonCancel) + ); + m_actionGroup->add_action( + "ChangeFont", sigc::mem_fun(*this, &ScriptEditor::onMenuChangeFontSize) + ); + insert_action_group("ScriptEditor", m_actionGroup); + + m_uiManager = Gtk::Builder::create(); + Glib::ustring ui_info = + "" + " " + " " + "
" + " " + " _Apply" + " ScriptEditor.Apply" + " <Primary>s" + " " + "
" + "
" + " " + " _Close" + " ScriptEditor.Close" + " <Primary>q" + " " + "
" + " " + " " + "
" + " " + " _Font Size ..." + " ScriptEditor.ChangeFont" + " " + "
" + " " + " " + ""; + m_uiManager->add_from_string(ui_info); + /*{ + auto object = uiManager->get_object("MenuBar"); + auto gmenu = Glib::RefPtr::cast_dynamic(object); + set_menubar(gmenu); + }*/ +#else m_actionGroup = Gtk::ActionGroup::create(); m_actionGroup->add(Gtk::Action::create("MenuScript", _("_Script"))); m_actionGroup->add(Gtk::Action::create("Apply", _("_Apply")), Gtk::AccelKey("s"), sigc::mem_fun(*this, &ScriptEditor::onButtonApply)); m_actionGroup->add(Gtk::Action::create("Close", _("_Close")), - Gtk::AccelKey("x"), + Gtk::AccelKey("q"), sigc::mem_fun(*this, &ScriptEditor::onButtonCancel)); + m_actionGroup->add(Gtk::Action::create("MenuEditor", _("_Editor"))); + m_actionGroup->add(Gtk::Action::create("ChangeFont", _("_Font Size ...")), + sigc::mem_fun(*this, &ScriptEditor::onMenuChangeFontSize)); m_uiManager = Gtk::UIManager::create(); m_uiManager->insert_action_group(m_actionGroup); add_accel_group(m_uiManager->get_accel_group()); @@ -128,30 +252,70 @@ " " " " " " + " " + " " + " " " " "" ); +#endif - m_textBuffer = Gtk::TextBuffer::create(m_tagTable); - m_textView.set_buffer(m_textBuffer); + m_lineNrBuffer = Gtk::TextBuffer::create(m_tagTable); + m_lineNrView.set_size_request(22,14); + m_lineNrView.set_buffer(m_lineNrBuffer); + m_lineNrView.set_left_margin(3); + m_lineNrView.set_right_margin(3); + m_lineNrView.property_editable() = false; + m_lineNrView.property_sensitive() = false; + m_lineNrTextViewSpacer.set_size_request(5,14); + m_lineNrTextViewSpacer.property_editable() = false; + m_lineNrTextViewSpacer.property_sensitive() = false; { - Pango::FontDescription fdesc; - fdesc.set_family("monospace"); -#if defined(__APPLE__) - fdesc.set_size(12 * PANGO_SCALE); +#if 1 //(GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 + Gdk::Color color; #else - fdesc.set_size(10 * PANGO_SCALE); + Gdk::RGBA color; #endif -#if GTKMM_MAJOR_VERSION < 3 - m_textView.modify_font(fdesc); + color.set("#F5F5F5"); + GtkWidget* widget = (GtkWidget*) m_lineNrView.gobj(); +#if GTK_MAJOR_VERSION < 3 || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION <= 24) + gtk_widget_modify_base(widget, GTK_STATE_NORMAL, color.gobj()); + gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, color.gobj()); +#endif + } + { +#if 1 //(GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2 + Gdk::Color color; #else - m_textView.override_font(fdesc); + Gdk::RGBA color; +#endif + color.set("#EEEEEE"); + GtkWidget* widget = (GtkWidget*) m_lineNrTextViewSpacer.gobj(); +#if GTK_MAJOR_VERSION < 3 || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION <= 24) + gtk_widget_modify_base(widget, GTK_STATE_NORMAL, color.gobj()); + gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, color.gobj()); #endif } - m_scrolledWindow.add(m_textView); + m_textBuffer = Gtk::TextBuffer::create(m_tagTable); + m_textView.set_buffer(m_textBuffer); + m_textView.set_left_margin(5); + setFontSize(currentFontSize(), false); + m_textViewHBox.pack_start(m_lineNrView, Gtk::PACK_SHRINK); + m_textViewHBox.pack_start(m_lineNrTextViewSpacer, Gtk::PACK_SHRINK); + m_textViewHBox.add(m_textView); + m_scrolledWindow.add(m_textViewHBox); m_scrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); +#if USE_GTKMM_BUILDER + Gtk::Widget* menuBar = new Gtk::MenuBar( + Glib::RefPtr::cast_dynamic( + m_uiManager->get_object("MenuBar") + ) + ); +#else Gtk::Widget* menuBar = m_uiManager->get_widget("/MenuBar"); +#endif + m_vbox.pack_start(*menuBar, Gtk::PACK_SHRINK); m_vbox.pack_start(m_scrolledWindow); @@ -162,16 +326,21 @@ m_applyButton.set_sensitive(false); m_applyButton.grab_focus(); -#if GTKMM_MAJOR_VERSION >= 3 +#if GTKMM_MAJOR_VERSION < 3 + m_statusHBox.set_spacing(6); +#elif GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION < 12 m_statusImage.set_margin_left(6); m_statusImage.set_margin_right(6); #else - m_statusHBox.set_spacing(6); + m_statusImage.set_margin_start(6); + m_statusImage.set_margin_end(6); #endif m_statusHBox.pack_start(m_statusImage, Gtk::PACK_SHRINK); m_statusHBox.pack_start(m_statusLabel); +#if HAS_GTKMM_SHOW_ALL_CHILDREN m_statusHBox.show_all_children(); +#endif m_footerHBox.pack_start(m_statusHBox); m_footerHBox.pack_start(m_buttonBox, Gtk::PACK_SHRINK); @@ -203,10 +372,22 @@ ); signal_delete_event().connect( +#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2 sigc::mem_fun(*this, &ScriptEditor::onWindowDelete) +#else + sigc::mem_fun(*this, &ScriptEditor::onWindowDeleteP) +#endif ); +#if HAS_GTKMM_SHOW_ALL_CHILDREN show_all_children(); +#endif + +#if !USE_LS_SCRIPTVM + // make user aware about gigedit had been compiled without liblinuxsampler support + m_statusLabel.set_markup(_("Limited editor features (since Gigedit was compiled without liblinuxsampler support)!")); + m_statusImage.set(m_warningIcon); +#endif } ScriptEditor::~ScriptEditor() { @@ -216,6 +397,63 @@ #endif } +int ScriptEditor::currentFontSize() const { +#if defined(__APPLE__) + const int defaultFontSize = 11; +#else + const int defaultFontSize = 10; +#endif + const int settingFontSize = Settings::singleton()->scriptEditorFontSize; + const int fontSize = (settingFontSize > 0) ? settingFontSize : defaultFontSize; + return fontSize; +} + +void ScriptEditor::setFontSize(int sizePt, bool save) { + //printf("setFontSize(%d,%d)\n", size, save); + + // make sure the real size on the screen for the editor's font is consistent + // on all screens (which otherwise may vary between models and DPI settings) + const double referenceDPI = 96; + double dpi = Gdk::Screen::get_default()->get_resolution(); + double sizePx = sizePt * dpi / referenceDPI; + +#if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION < 20) + Pango::FontDescription fdesc; + fdesc.set_family("monospace"); +# if defined(__APPLE__) + // fixes poor readability of default monospace font on Macs + if (macIsMinMac10_6()) + fdesc.set_family("Menlo"); +# endif + fdesc.set_size(sizePx * PANGO_SCALE); +# if GTKMM_MAJOR_VERSION < 3 + m_lineNrView.modify_font(fdesc); + m_textView.modify_font(fdesc); +# else + m_lineNrView.override_font(fdesc); + m_textView.override_font(fdesc); +# endif +#else + Glib::ustring family = "monospace"; +# if defined(__APPLE__) + // fixes poor readability of default monospace font on Macs + if (macIsMinMac10_6()) + family = "Menlo"; +# endif + if (!m_css) { + m_css = Gtk::CssProvider::create(); + m_lineNrView.get_style_context()->add_provider(m_css, GTK_STYLE_PROVIDER_PRIORITY_FALLBACK); + m_textView.get_style_context()->add_provider(m_css, GTK_STYLE_PROVIDER_PRIORITY_FALLBACK); + } + m_css->load_from_data( + "* {" + " font: " + ToString(sizePt) + "pt " + family + ";" + "}" + ); +#endif + if (save) Settings::singleton()->scriptEditorFontSize = sizePt; +} + void ScriptEditor::setScript(gig::Script* script) { m_script = script; if (!script) { @@ -229,6 +467,31 @@ //printf("text : '%s'\n", txt.c_str()); m_textBuffer->set_text(txt); m_textBuffer->set_modified(false); + + // on Gtk 3 the respective text change callback would not be called, so force this update here + if (txt.empty()) + updateLineNumbers(); +} + +void ScriptEditor::updateLineNumbers() { + int n = m_textBuffer->get_line_count(); + int old = m_lineNrBuffer->get_line_count(); + if (n == old && old > 1) return; + if (n < 1) n = 1; + const int digits = log10(n) + 1; + const int bufSz = digits + 2; + char* buf = new char[bufSz]; + std::string sFmt1 = "%" + ToString(digits) + "d"; + std::string sFmt2 = "\n%" + ToString(digits) + "d"; + Glib::ustring s; + for (int i = 0; i < n; ++i) { + snprintf(buf, bufSz, i ? sFmt2.c_str() : sFmt1.c_str(), i+1); + s += buf; + } + m_lineNrBuffer->remove_all_tags(m_lineNrBuffer->begin(), m_lineNrBuffer->end()); + m_lineNrBuffer->set_text(s); + m_lineNrBuffer->apply_tag(m_lineNrTag, m_lineNrBuffer->begin(), m_lineNrBuffer->end()); + if (buf) delete[] buf; } void ScriptEditor::onTextInserted(const Gtk::TextBuffer::iterator& itEnd, const Glib::ustring& txt, int length) { @@ -281,6 +544,7 @@ ; #endif // USE_LS_SCRIPTVM + updateLineNumbers(); } #if USE_LS_SCRIPTVM @@ -290,8 +554,16 @@ return m_vm; } -static void getIteratorsForIssue(Glib::RefPtr& txtbuf, const LinuxSampler::ParserIssue& issue, Gtk::TextBuffer::iterator& start, Gtk::TextBuffer::iterator& end) { - start = txtbuf->get_iter_at_line_index(issue.firstLine - 1, issue.firstColumn - 1); +template +static void getIteratorsForIssue(Glib::RefPtr& txtbuf, const T& issue, Gtk::TextBuffer::iterator& start, Gtk::TextBuffer::iterator& end) { + Gtk::TextBuffer::iterator itLine = + txtbuf->get_iter_at_line_index(issue.firstLine - 1, 0); + const int charsInLine = itLine.get_bytes_in_line(); + start = txtbuf->get_iter_at_line_index( + issue.firstLine - 1, + // check we are not getting past the end of the line here, otherwise Gtk crashes + issue.firstColumn - 1 < charsInLine ? issue.firstColumn - 1 : charsInLine - 1 + ); end = start; end.forward_lines(issue.lastLine - issue.firstLine); end.forward_chars( @@ -302,8 +574,14 @@ } static void applyCodeTag(Glib::RefPtr& txtbuf, const LinuxSampler::VMSourceToken& token, Glib::RefPtr& tag) { - Gtk::TextBuffer::iterator itStart = - txtbuf->get_iter_at_line_index(token.firstLine(), token.firstColumn()); + Gtk::TextBuffer::iterator itLine = + txtbuf->get_iter_at_line_index(token.firstLine(), 0); + const int charsInLine = itLine.get_bytes_in_line(); + Gtk::TextBuffer::iterator itStart = txtbuf->get_iter_at_line_index( + token.firstLine(), + // check we are not getting past the end of the line here, otherwise Gtk crashes + token.firstColumn() < charsInLine ? token.firstColumn() : charsInLine - 1 + ); Gtk::TextBuffer::iterator itEnd = itStart; const int length = token.text().length(); itEnd.forward_chars(length); @@ -316,16 +594,26 @@ txtbuf->apply_tag(tag, itStart, itEnd); } +static void applyPreprocessorComment(Glib::RefPtr& txtbuf, const LinuxSampler::CodeBlock& block, Glib::RefPtr& tag) { + Gtk::TextBuffer::iterator itStart, itEnd; + getIteratorsForIssue(txtbuf, block, itStart, itEnd); + txtbuf->apply_tag(tag, itStart, itEnd); +} + void ScriptEditor::updateSyntaxHighlightingByVM() { GetScriptVM(); const std::string s = m_textBuffer->get_text(); + if (s.empty()) return; std::vector tokens = m_vm->syntaxHighlighting(s); for (int i = 0; i < tokens.size(); ++i) { const LinuxSampler::VMSourceToken& token = tokens[i]; if (token.isKeyword()) { - applyCodeTag(m_textBuffer, token, m_keywordTag); + if (token.text() == "patch") + applyCodeTag(m_textBuffer, token, m_patchTag); + else + applyCodeTag(m_textBuffer, token, m_keywordTag); } else if (token.isVariableName()) { applyCodeTag(m_textBuffer, token, m_variableTag); } else if (token.isIdentifier()) { @@ -342,6 +630,10 @@ applyCodeTag(m_textBuffer, token, m_commentTag); } else if (token.isPreprocessor()) { applyCodeTag(m_textBuffer, token, m_preprocTag); + } else if (token.isMetricPrefix()) { + applyCodeTag(m_textBuffer, token, m_metricTag); + } else if (token.isStdUnit()) { + applyCodeTag(m_textBuffer, token, m_stdUnitTag); } else if (token.isNewLine()) { } } @@ -354,17 +646,25 @@ m_issues = parserContext->issues(); m_errors = parserContext->errors(); m_warnings = parserContext->warnings(); + m_preprocComments = parserContext->preprocessorComments(); - for (int i = 0; i < m_issues.size(); ++i) { - const LinuxSampler::ParserIssue& issue = m_issues[i]; - - if (issue.isErr()) { - applyCodeTag(m_textBuffer, issue, m_errorTag); - } else if (issue.isWrn()) { - applyCodeTag(m_textBuffer, issue, m_warningTag); + if (!s.empty()) { + for (int i = 0; i < m_issues.size(); ++i) { + const LinuxSampler::ParserIssue& issue = m_issues[i]; + + if (issue.isErr()) { + applyCodeTag(m_textBuffer, issue, m_errorTag); + } else if (issue.isWrn()) { + applyCodeTag(m_textBuffer, issue, m_warningTag); + } } } + for (int i = 0; i < m_preprocComments.size(); ++i) { + applyPreprocessorComment(m_textBuffer, m_preprocComments[i], + m_preprocCommentTag); + } + delete parserContext; } @@ -398,6 +698,23 @@ } } + for (int i = 0; i < m_preprocComments.size(); ++i) { + const LinuxSampler::CodeBlock& block = m_preprocComments[i]; + const int firstLine = block.firstLine - 1; + const int firstColumn = block.firstColumn - 1; + const int lastLine = block.lastLine - 1; + const int lastColumn = block.lastColumn - 1; + if (firstLine <= line && line <= lastLine && + (firstLine != line || firstColumn <= column) && + (lastLine != line || lastColumn >= column)) + { + m_textView.set_tooltip_markup( + "Code block filtered out by preceding preprocessor statement." + ); + return; + } + } + m_textView.set_tooltip_markup(""); } @@ -460,6 +777,7 @@ m_textBuffer->remove_all_tags(itStart2, itEnd2); #endif // USE_LS_SCRIPTVM + updateLineNumbers(); } bool ScriptEditor::on_motion_notify_event(GdkEventMotion* e) { @@ -467,10 +785,55 @@ //TODO: event throttling would be a good idea here updateIssueTooltip(e); #endif +#if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION <= 24) return ManagedWindow::on_motion_notify_event(e); +#else + Gdk::EventMotion em = Glib::wrap(e, true); + return ManagedWindow::on_motion_notify_event(em); +#endif } -bool ScriptEditor::onWindowDelete(GdkEventAny* e) { +void ScriptEditor::onMenuChangeFontSize() { + //TODO: for GTKMM >= 3.2 class Gtk::FontChooser could be used instead + Gtk::Dialog dialog(_("Font Size"), true /*modal*/); + HBox hbox; + hbox.set_spacing(6); + + Gtk::Label label(_("Editor's Font Size:"), Gtk::ALIGN_START); + hbox.pack_start(label, Gtk::PACK_SHRINK); + + Gtk::SpinButton spinButton; + spinButton.set_range(4, 80); + spinButton.set_increments(1, 10); + spinButton.set_value(currentFontSize()); + hbox.pack_start(spinButton); + +#if USE_GTKMM_BOX + dialog.get_content_area()->pack_start(hbox); +#else + dialog.get_vbox()->pack_start(hbox); +#endif + dialog.add_button(_("_OK"), 0); + dialog.add_button(_("_Cancel"), 1); + +#if HAS_GTKMM_SHOW_ALL_CHILDREN + dialog.show_all_children(); +#endif + + if (!dialog.run()) { // OK selected ... + const int newFontSize = spinButton.get_value_as_int(); + if (newFontSize >= 4) + setFontSize(newFontSize, true); + } +} + +#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && (GTKMM_MINOR_VERSION > 91 || (GTKMM_MINOR_VERSION == 91 && GTKMM_MICRO_VERSION >= 2))) // GTKMM >= 3.91.2 +bool ScriptEditor::onWindowDelete(Gdk::Event& e) { + return onWindowDeleteP(NULL); +} +#endif + +bool ScriptEditor::onWindowDeleteP(GdkEventAny* /*e*/) { //printf("onWindowDelete\n"); if (!isModified()) return false; // propagate event further (which will close this window) @@ -519,13 +882,15 @@ } void ScriptEditor::onButtonCancel() { - bool dropEvent = onWindowDelete(NULL); + bool dropEvent = onWindowDeleteP(NULL); if (dropEvent) return; hide(); } void ScriptEditor::onButtonApply() { + signal_script_to_be_changed.emit(m_script); m_script->SetScriptAsText(m_textBuffer->get_text()); + signal_script_changed.emit(m_script); m_textBuffer->set_modified(false); }