--- gigedit/trunk/src/gigedit/scripteditor.cpp 2016/05/01 14:51:55 2896 +++ gigedit/trunk/src/gigedit/scripteditor.cpp 2016/05/02 16:10:56 2901 @@ -35,7 +35,21 @@ #endif // !USE_LS_SCRIPTVM +static Glib::RefPtr createIcon(std::string name, const Glib::RefPtr& screen) { + const int targetH = 16; + Glib::RefPtr theme = Gtk::IconTheme::get_for_screen(screen); + int w = 0; + int h = 0; // ignored + Gtk::IconSize::lookup(Gtk::ICON_SIZE_SMALL_TOOLBAR, w, h); + 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); + } + return pixbuf; +} + ScriptEditor::ScriptEditor() : + m_statusLabel("", Gtk::ALIGN_START), m_applyButton(_("_Apply"), true), m_cancelButton(_("_Cancel"), true) { @@ -43,7 +57,10 @@ #if USE_LS_SCRIPTVM m_vm = NULL; #endif - m_ignoreEraseEvents = false; + + m_errorIcon = createIcon("dialog-error", get_screen()); + m_warningIcon = createIcon("dialog-warning-symbolic", get_screen()); + m_successIcon = createIcon("emblem-default", get_screen()); add(m_vbox); @@ -91,9 +108,29 @@ m_warningTag->property_background() = "#fffd7c"; // yellow m_tagTable->add(m_warningTag); - m_readOnlyTag = Gtk::TextBuffer::Tag::create(); - m_readOnlyTag->property_editable() = false; - m_tagTable->add(m_readOnlyTag); + // create menu + 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"), + sigc::mem_fun(*this, &ScriptEditor::onButtonCancel)); + m_uiManager = Gtk::UIManager::create(); + m_uiManager->insert_action_group(m_actionGroup); + add_accel_group(m_uiManager->get_accel_group()); + m_uiManager->add_ui_from_string( + "" + " " + " " + " " + " " + " " + " " + " " + "" + ); m_textBuffer = Gtk::TextBuffer::create(m_tagTable); m_textView.set_buffer(m_textBuffer); @@ -113,6 +150,9 @@ } m_scrolledWindow.add(m_textView); m_scrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + + Gtk::Widget* menuBar = m_uiManager->get_widget("/MenuBar"); + m_vbox.pack_start(*menuBar, Gtk::PACK_SHRINK); m_vbox.pack_start(m_scrolledWindow); m_buttonBox.set_layout(Gtk::BUTTONBOX_END); @@ -121,7 +161,22 @@ m_applyButton.set_can_default(); m_applyButton.set_sensitive(false); m_applyButton.grab_focus(); - m_vbox.pack_start(m_buttonBox, Gtk::PACK_SHRINK); + +#if GTKMM_MAJOR_VERSION >= 3 + m_statusImage.set_margin_left(6); + m_statusImage.set_margin_right(6); +#else + m_statusHBox.set_spacing(6); +#endif + + m_statusHBox.pack_start(m_statusImage, Gtk::PACK_SHRINK); + m_statusHBox.pack_start(m_statusLabel); + m_statusHBox.show_all_children(); + + m_footerHBox.pack_start(m_statusHBox); + m_footerHBox.pack_start(m_buttonBox, Gtk::PACK_SHRINK); + + m_vbox.pack_start(m_footerHBox, Gtk::PACK_SHRINK); m_applyButton.signal_clicked().connect( sigc::mem_fun(*this, &ScriptEditor::onButtonApply) @@ -147,9 +202,11 @@ sigc::mem_fun(*this, &ScriptEditor::onWindowHide) ); - show_all_children(); + signal_delete_event().connect( + sigc::mem_fun(*this, &ScriptEditor::onWindowDelete) + ); - resize(460,300); + show_all_children(); } ScriptEditor::~ScriptEditor() { @@ -175,13 +232,12 @@ } void ScriptEditor::onTextInserted(const Gtk::TextBuffer::iterator& itEnd, const Glib::ustring& txt, int length) { - printf("onTextInserted()\n"); - fflush(stdout); + //printf("onTextInserted()\n"); #if USE_LS_SCRIPTVM - removeIssueAnchors(); m_textBuffer->remove_all_tags(m_textBuffer->begin(), m_textBuffer->end()); updateSyntaxHighlightingByVM(); updateParserIssuesByVM(); + updateStatusBar(); #else //printf("inserted %d\n", length); Gtk::TextBuffer::iterator itStart = itEnd; @@ -234,6 +290,17 @@ 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); + end = start; + end.forward_lines(issue.lastLine - issue.firstLine); + end.forward_chars( + (issue.lastLine != issue.firstLine) + ? issue.lastColumn - 1 + : issue.lastColumn - issue.firstColumn + 1 + ); +} + 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()); @@ -244,34 +311,11 @@ } static void applyCodeTag(Glib::RefPtr& txtbuf, const LinuxSampler::ParserIssue& issue, Glib::RefPtr& tag) { - Gtk::TextBuffer::iterator itStart = - txtbuf->get_iter_at_line_index(issue.firstLine - 1, issue.firstColumn - 1); - Gtk::TextBuffer::iterator itEnd = itStart; - itEnd.forward_lines(issue.lastLine - issue.firstLine); - itEnd.forward_chars( - (issue.lastLine != issue.firstLine) - ? issue.lastColumn - 1 - : issue.lastColumn - issue.firstColumn + 1 - ); + Gtk::TextBuffer::iterator itStart, itEnd; + getIteratorsForIssue(txtbuf, issue, itStart, itEnd); txtbuf->apply_tag(tag, itStart, itEnd); } -void ScriptEditor::removeIssueAnchors() { - m_ignoreEraseEvents = true; // avoid endless recursion - - for (int i = 0; i < m_issues.size(); ++i) { - const LinuxSampler::ParserIssue& issue = m_issues[i]; - printf("erase anchor at l%d c%d\n", issue.firstLine - 1, issue.firstColumn - 1); - fflush(stdout); - Gtk::TextBuffer::iterator iter = m_textBuffer->get_iter_at_line_index(issue.firstLine - 1, issue.firstColumn - 1); - Gtk::TextBuffer::iterator iterEnd = iter; - iterEnd.forward_chars(1); - m_textBuffer->erase(iter, iterEnd); - } - - m_ignoreEraseEvents = false; // back to normal -} - void ScriptEditor::updateSyntaxHighlightingByVM() { GetScriptVM(); const std::string s = m_textBuffer->get_text(); @@ -303,24 +347,13 @@ } } -static Glib::RefPtr createIcon(std::string name, const Glib::RefPtr& screen) { - const int targetH = 9; - Glib::RefPtr theme = Gtk::IconTheme::get_for_screen(screen); - int w = 0; - int h = 0; // ignored - Gtk::IconSize::lookup(Gtk::ICON_SIZE_SMALL_TOOLBAR, w, h); - 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); - } - return pixbuf; -} - void ScriptEditor::updateParserIssuesByVM() { GetScriptVM(); const std::string s = m_textBuffer->get_text(); LinuxSampler::VMParserContext* parserContext = m_vm->loadScript(s); m_issues = parserContext->issues(); + m_errors = parserContext->errors(); + m_warnings = parserContext->warnings(); for (int i = 0; i < m_issues.size(); ++i) { const LinuxSampler::ParserIssue& issue = m_issues[i]; @@ -332,42 +365,91 @@ } } - for (int i = m_issues.size() - 1; i >= 0; --i) { + delete parserContext; +} + +void ScriptEditor::updateIssueTooltip(GdkEventMotion* e) { + int x, y; + m_textView.window_to_buffer_coords(Gtk::TEXT_WINDOW_TEXT, int(e->x), int(e->y), x, y); + + Gtk::TextBuffer::iterator it; + m_textView.get_iter_at_location(it, x, y); + + const int line = it.get_line(); + const int column = it.get_line_offset(); + + //printf("mouse at l%d c%d\n", line, column); + + for (int i = 0; i < m_issues.size(); ++i) { const LinuxSampler::ParserIssue& issue = m_issues[i]; + const int firstLine = issue.firstLine - 1; + const int firstColumn = issue.firstColumn - 1; + const int lastLine = issue.lastLine - 1; + const int lastColumn = issue.lastColumn - 1; + if (firstLine <= line && line <= lastLine && + (firstLine != line || firstColumn <= column) && + (lastLine != line || lastColumn >= column)) + { + m_textView.set_tooltip_markup( + (issue.isErr() ? "ERROR: " : "Warning: ") + + issue.txt + ); + return; + } + } - if (issue.isErr() || issue.isWrn()) { - Glib::RefPtr pixbuf = createIcon(issue.isErr() ? "dialog-error" : "dialog-warning-symbolic", get_screen()); - Gtk::Image* image = Gtk::manage(new Gtk::Image(pixbuf)); - image->show(); - Gtk::TextBuffer::iterator iter = - m_textBuffer->get_iter_at_line_index(issue.firstLine - 1, issue.firstColumn - 1); - Glib::RefPtr anchor = m_textBuffer->create_child_anchor(iter); - m_textView.add_child_at_anchor(*image, anchor); - - iter = - m_textBuffer->get_iter_at_line_index(issue.firstLine - 1, issue.firstColumn - 1); - Gtk::TextBuffer::iterator itEnd = iter; - itEnd.forward_char(); + m_textView.set_tooltip_markup(""); +} - // prevent that the user can erase the icon with backspace key - m_textBuffer->apply_tag(m_readOnlyTag, iter, itEnd); +static std::string warningsCountTxt(const std::vector warnings) { + std::string txt = "" + ToString(warnings.size()); + txt += (warnings.size() == 1) ? " Warning" : " Warnings"; + txt += ""; + return txt; +} + +static std::string errorsCountTxt(const std::vector errors) { + std::string txt = "" + ToString(errors.size()); + txt += (errors.size() == 1) ? " Error" : " Errors"; + txt += ""; + return txt; +} + +void ScriptEditor::updateStatusBar() { + // update status text + std::string txt; + if (m_issues.empty()) { + txt = "No issues with this script."; + } else { + const char* txtWontLoad = ". Sampler won't load instruments using this script!"; + txt = "There "; + txt += (m_errors.size() <= 1 && m_warnings.size() <= 1) ? "is " : "are "; + if (m_errors.empty()) { + txt += warningsCountTxt(m_warnings) + ". Script will load, but might not behave as expected!"; + } else if (m_warnings.empty()) { + txt += errorsCountTxt(m_errors) + txtWontLoad; + } else { + txt += errorsCountTxt(m_errors) + " and " + + warningsCountTxt(m_warnings) + txtWontLoad; } } + m_statusLabel.set_markup(txt); - delete parserContext; + // update status icon + m_statusImage.set( + m_issues.empty() ? m_successIcon : !m_errors.empty() ? m_errorIcon : m_warningIcon + ); } #endif // USE_LS_SCRIPTVM void ScriptEditor::onTextErased(const Gtk::TextBuffer::iterator& itStart, const Gtk::TextBuffer::iterator& itEnd) { //printf("erased\n"); - if (m_ignoreEraseEvents) return; - #if USE_LS_SCRIPTVM - removeIssueAnchors(); m_textBuffer->remove_all_tags(m_textBuffer->begin(), m_textBuffer->end()); updateSyntaxHighlightingByVM(); updateParserIssuesByVM(); + updateStatusBar(); #else Gtk::TextBuffer::iterator itStart2 = itStart; if (itStart2.inside_word() || itStart2.ends_word()) @@ -380,11 +462,65 @@ #endif // USE_LS_SCRIPTVM } +bool ScriptEditor::on_motion_notify_event(GdkEventMotion* e) { +#if USE_LS_SCRIPTVM + //TODO: event throttling would be a good idea here + updateIssueTooltip(e); +#endif + return ManagedWindow::on_motion_notify_event(e); +} + +bool ScriptEditor::onWindowDelete(GdkEventAny* e) { + //printf("onWindowDelete\n"); + + if (!isModified()) return false; // propagate event further (which will close this window) + + gchar* msg = g_strdup_printf(_("Apply changes to instrument script \"%s\" before closing?"), + m_script->Name.c_str()); + Gtk::MessageDialog dialog(*this, msg, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE); + g_free(msg); + dialog.set_secondary_text(_("If you close without applying, your changes will be lost.")); + dialog.add_button(_("Close _Without Applying"), Gtk::RESPONSE_NO); + dialog.add_button(_("_Cancel"), Gtk::RESPONSE_CANCEL); + dialog.add_button(_("_Apply"), Gtk::RESPONSE_YES); + dialog.set_default_response(Gtk::RESPONSE_YES); + int response = dialog.run(); + dialog.hide(); + + // user decided to close script editor without saving + if (response == Gtk::RESPONSE_NO) + return false; // propagate event further (which will close this window) + + // user cancelled dialog, thus don't close script editor + if (response == Gtk::RESPONSE_CANCEL) { + show(); + return true; // drop event (prevents closing this window) + } + + // user wants to apply the changes, afterwards close window + if (response == Gtk::RESPONSE_YES) { + onButtonApply(); + return false; // propagate event further (which will close this window) + } + + // should never ever make it to this point actually + return false; +} + +bool ScriptEditor::isModified() const { + return m_textBuffer->get_modified(); +} + void ScriptEditor::onModifiedChanged() { - m_applyButton.set_sensitive( m_textBuffer->get_modified() ); + m_applyButton.set_sensitive(isModified()); +#if USE_LS_SCRIPTVM + updateStatusBar(); +#endif } void ScriptEditor::onButtonCancel() { + bool dropEvent = onWindowDelete(NULL); + if (dropEvent) return; hide(); }