/[svn]/gigedit/trunk/src/gigedit/scripteditor.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/scripteditor.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2956 by schoenebeck, Sat Jul 16 15:31:47 2016 UTC revision 3158 by schoenebeck, Mon May 8 18:05:35 2017 UTC
# Line 60  static Glib::RefPtr<Gdk::Pixbuf> createI Line 60  static Glib::RefPtr<Gdk::Pixbuf> createI
60    
61  ScriptEditor::ScriptEditor() :  ScriptEditor::ScriptEditor() :
62      m_statusLabel("",  Gtk::ALIGN_START),      m_statusLabel("",  Gtk::ALIGN_START),
63      m_applyButton(_("_Apply"), true),      m_applyButton(Gtk::Stock::APPLY),
64      m_cancelButton(_("_Cancel"), true)      m_cancelButton(Gtk::Stock::CANCEL)
65  {  {
66      m_script = NULL;      m_script = NULL;
67  #if USE_LS_SCRIPTVM  #if USE_LS_SCRIPTVM
# Line 242  ScriptEditor::~ScriptEditor() { Line 242  ScriptEditor::~ScriptEditor() {
242    
243  int ScriptEditor::currentFontSize() const {  int ScriptEditor::currentFontSize() const {
244  #if defined(__APPLE__)  #if defined(__APPLE__)
245      const int defaultFontSize = 14;      const int defaultFontSize = 13;
246  #else  #else
247      const int defaultFontSize = 10;      const int defaultFontSize = 10;
248  #endif  #endif
# Line 367  static void applyCodeTag(Glib::RefPtr<Gt Line 367  static void applyCodeTag(Glib::RefPtr<Gt
367  void ScriptEditor::updateSyntaxHighlightingByVM() {  void ScriptEditor::updateSyntaxHighlightingByVM() {
368      GetScriptVM();      GetScriptVM();
369      const std::string s = m_textBuffer->get_text();      const std::string s = m_textBuffer->get_text();
370        if (s.empty()) return;
371      std::vector<LinuxSampler::VMSourceToken> tokens = m_vm->syntaxHighlighting(s);      std::vector<LinuxSampler::VMSourceToken> tokens = m_vm->syntaxHighlighting(s);
372    
373      for (int i = 0; i < tokens.size(); ++i) {      for (int i = 0; i < tokens.size(); ++i) {
# Line 403  void ScriptEditor::updateParserIssuesByV Line 404  void ScriptEditor::updateParserIssuesByV
404      m_errors = parserContext->errors();      m_errors = parserContext->errors();
405      m_warnings = parserContext->warnings();      m_warnings = parserContext->warnings();
406    
407      for (int i = 0; i < m_issues.size(); ++i) {      if (!s.empty()) {
408          const LinuxSampler::ParserIssue& issue = m_issues[i];          for (int i = 0; i < m_issues.size(); ++i) {
409                const LinuxSampler::ParserIssue& issue = m_issues[i];
410          if (issue.isErr()) {  
411              applyCodeTag(m_textBuffer, issue, m_errorTag);              if (issue.isErr()) {
412          } else if (issue.isWrn()) {                  applyCodeTag(m_textBuffer, issue, m_errorTag);
413              applyCodeTag(m_textBuffer, issue, m_warningTag);              } else if (issue.isWrn()) {
414                    applyCodeTag(m_textBuffer, issue, m_warningTag);
415                }
416          }          }
417      }      }
418    
Legend:
Removed from v.2956  
changed lines
  Added in v.3158
  ViewVC Help
Powered by ViewVC