/[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 3314 by schoenebeck, Tue Jul 18 22:00:56 2017 UTC revision 3364 by schoenebeck, Tue Nov 14 18:07:25 2017 UTC
# Line 7  Line 7 
7    
8  #include "scripteditor.h"  #include "scripteditor.h"
9  #include "global.h"  #include "global.h"
10    #include "compat.h"
11  #include <gtk/gtkwidget.h> // for gtk_widget_modify_*()  #include <gtk/gtkwidget.h> // for gtk_widget_modify_*()
12  #if defined(__APPLE__)  #if defined(__APPLE__)
13  # include "MacHelper.h"  # include "MacHelper.h"
# Line 65  static Glib::RefPtr<Gdk::Pixbuf> createI Line 66  static Glib::RefPtr<Gdk::Pixbuf> createI
66    
67  ScriptEditor::ScriptEditor() :  ScriptEditor::ScriptEditor() :
68      m_statusLabel("",  Gtk::ALIGN_START),      m_statusLabel("",  Gtk::ALIGN_START),
69    #if HAS_GTKMM_STOCK
70      m_applyButton(Gtk::Stock::APPLY),      m_applyButton(Gtk::Stock::APPLY),
71      m_cancelButton(Gtk::Stock::CANCEL)      m_cancelButton(Gtk::Stock::CANCEL)
72    #else
73        m_applyButton(_("_Apply"), true),
74        m_cancelButton(_("_Cancel"), true)
75    #endif
76  {  {
77      m_script = NULL;      m_script = NULL;
78  #if USE_LS_SCRIPTVM  #if USE_LS_SCRIPTVM
# Line 161  ScriptEditor::ScriptEditor() : Line 167  ScriptEditor::ScriptEditor() :
167      m_tagTable->add(m_lineNrTag);      m_tagTable->add(m_lineNrTag);
168    
169      // create menu      // create menu
170    #if USE_GTKMM_BUILDER
171        m_actionGroup = Gio::SimpleActionGroup::create();
172        m_actionGroup->add_action(
173            "Apply", sigc::mem_fun(*this, &ScriptEditor::onButtonApply)
174        );
175        m_actionGroup->add_action(
176            "Close", sigc::mem_fun(*this, &ScriptEditor::onButtonCancel)
177        );
178        m_actionGroup->add_action(
179            "ChangeFont", sigc::mem_fun(*this, &ScriptEditor::onMenuChangeFontSize)
180        );
181        insert_action_group("ScriptEditor", m_actionGroup);
182    
183        m_uiManager = Gtk::Builder::create();
184        Glib::ustring ui_info =
185            "<interface>"
186            "  <menubar id='MenuBar'>"
187            "    <menu id='MenuScript'>"
188            "      <section>"
189            "        <item id='Apply'>"
190            "          <attribute name='label' translatable='yes'>_Apply</attribute>"
191            "          <attribute name='action'>ScriptEditor.Apply</attribute>"
192            "          <attribute name='accel'>&lt;Primary&gt;s</attribute>"
193            "        </item>"
194            "      </section>"
195            "      <section>"
196            "        <item id='Close'>"
197            "          <attribute name='label' translatable='yes'>_Close</attribute>"
198            "          <attribute name='action'>ScriptEditor.Close</attribute>"
199            "          <attribute name='accel'>&lt;Primary&gt;q</attribute>"
200            "        </item>"
201            "      </section>"
202            "    </menu>"
203            "    <menu id='MenuEditor'>"
204            "      <section>"
205            "        <item id='ChangeFont'>"
206            "          <attribute name='label' translatable='yes'>_Font Size ...</attribute>"
207            "          <attribute name='action'>ScriptEditor.ChangeFont</attribute>"
208            "        </item>"
209            "      </section>"
210            "    </menu>"
211            "  </menubar>"
212            "</interface>";
213        m_uiManager->add_from_string(ui_info);
214        /*{
215            auto object = uiManager->get_object("MenuBar");
216            auto gmenu = Glib::RefPtr<Gio::Menu>::cast_dynamic(object);
217            set_menubar(gmenu);
218        }*/
219    #else
220      m_actionGroup = Gtk::ActionGroup::create();      m_actionGroup = Gtk::ActionGroup::create();
221      m_actionGroup->add(Gtk::Action::create("MenuScript", _("_Script")));      m_actionGroup->add(Gtk::Action::create("MenuScript", _("_Script")));
222      m_actionGroup->add(Gtk::Action::create("Apply", _("_Apply")),      m_actionGroup->add(Gtk::Action::create("Apply", _("_Apply")),
# Line 189  ScriptEditor::ScriptEditor() : Line 245  ScriptEditor::ScriptEditor() :
245          "  </menubar>"          "  </menubar>"
246          "</ui>"          "</ui>"
247      );      );
248    #endif
249    
250      m_lineNrBuffer = Gtk::TextBuffer::create(m_tagTable);      m_lineNrBuffer = Gtk::TextBuffer::create(m_tagTable);
251      m_lineNrView.set_buffer(m_lineNrBuffer);      m_lineNrView.set_buffer(m_lineNrBuffer);
# Line 196  ScriptEditor::ScriptEditor() : Line 253  ScriptEditor::ScriptEditor() :
253      m_lineNrView.set_right_margin(3);      m_lineNrView.set_right_margin(3);
254      m_lineNrTextViewSpacer.set_size_request(5);      m_lineNrTextViewSpacer.set_size_request(5);
255      {      {
256    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
257          Gdk::Color color;          Gdk::Color color;
258    #else
259            Gdk::RGBA color;
260    #endif
261          color.set("#F5F5F5");          color.set("#F5F5F5");
262          GtkWidget* widget = (GtkWidget*) m_lineNrView.gobj();          GtkWidget* widget = (GtkWidget*) m_lineNrView.gobj();
263    #if GTK_MAJOR_VERSION < 3
264          gtk_widget_modify_base(widget, GTK_STATE_NORMAL, color.gobj());          gtk_widget_modify_base(widget, GTK_STATE_NORMAL, color.gobj());
265          gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, color.gobj());          gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, color.gobj());
266    #endif
267      }      }
268      {      {
269    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
270          Gdk::Color color;          Gdk::Color color;
271    #else
272            Gdk::RGBA color;
273    #endif
274          color.set("#EEEEEE");          color.set("#EEEEEE");
275          GtkWidget* widget = (GtkWidget*) m_lineNrTextViewSpacer.gobj();          GtkWidget* widget = (GtkWidget*) m_lineNrTextViewSpacer.gobj();
276    #if GTK_MAJOR_VERSION < 3
277          gtk_widget_modify_base(widget, GTK_STATE_NORMAL, color.gobj());          gtk_widget_modify_base(widget, GTK_STATE_NORMAL, color.gobj());
278          gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, color.gobj());          gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, color.gobj());
279    #endif
280      }      }
281      m_textBuffer = Gtk::TextBuffer::create(m_tagTable);      m_textBuffer = Gtk::TextBuffer::create(m_tagTable);
282      m_textView.set_buffer(m_textBuffer);      m_textView.set_buffer(m_textBuffer);
# Line 219  ScriptEditor::ScriptEditor() : Line 288  ScriptEditor::ScriptEditor() :
288      m_scrolledWindow.add(m_textViewHBox);      m_scrolledWindow.add(m_textViewHBox);
289      m_scrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);      m_scrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
290    
291    #if USE_GTKMM_BUILDER
292        Gtk::Widget* menuBar = new Gtk::MenuBar(
293            Glib::RefPtr<Gio::Menu>::cast_dynamic(
294                m_uiManager->get_object("MenuBar")
295            )
296        );
297    #else
298      Gtk::Widget* menuBar = m_uiManager->get_widget("/MenuBar");      Gtk::Widget* menuBar = m_uiManager->get_widget("/MenuBar");
299    #endif
300    
301      m_vbox.pack_start(*menuBar, Gtk::PACK_SHRINK);      m_vbox.pack_start(*menuBar, Gtk::PACK_SHRINK);
302      m_vbox.pack_start(m_scrolledWindow);      m_vbox.pack_start(m_scrolledWindow);
303    
# Line 230  ScriptEditor::ScriptEditor() : Line 308  ScriptEditor::ScriptEditor() :
308      m_applyButton.set_sensitive(false);      m_applyButton.set_sensitive(false);
309      m_applyButton.grab_focus();      m_applyButton.grab_focus();
310    
311  #if GTKMM_MAJOR_VERSION >= 3  #if GTKMM_MAJOR_VERSION < 3
312        m_statusHBox.set_spacing(6);
313    #elif GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION < 12
314      m_statusImage.set_margin_left(6);      m_statusImage.set_margin_left(6);
315      m_statusImage.set_margin_right(6);      m_statusImage.set_margin_right(6);
316  #else  #else
317      m_statusHBox.set_spacing(6);      m_statusImage.set_margin_start(6);
318        m_statusImage.set_margin_end(6);
319  #endif  #endif
320    
321      m_statusHBox.pack_start(m_statusImage, Gtk::PACK_SHRINK);      m_statusHBox.pack_start(m_statusImage, Gtk::PACK_SHRINK);
322      m_statusHBox.pack_start(m_statusLabel);      m_statusHBox.pack_start(m_statusLabel);
323    #if HAS_GTKMM_SHOW_ALL_CHILDREN
324      m_statusHBox.show_all_children();      m_statusHBox.show_all_children();
325    #endif
326    
327      m_footerHBox.pack_start(m_statusHBox);      m_footerHBox.pack_start(m_statusHBox);
328      m_footerHBox.pack_start(m_buttonBox, Gtk::PACK_SHRINK);      m_footerHBox.pack_start(m_buttonBox, Gtk::PACK_SHRINK);
# Line 271  ScriptEditor::ScriptEditor() : Line 354  ScriptEditor::ScriptEditor() :
354      );      );
355    
356      signal_delete_event().connect(      signal_delete_event().connect(
357    #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
358          sigc::mem_fun(*this, &ScriptEditor::onWindowDelete)          sigc::mem_fun(*this, &ScriptEditor::onWindowDelete)
359    #else
360            sigc::mem_fun(*this, &ScriptEditor::onWindowDeleteP)
361    #endif
362      );      );
363    
364    #if HAS_GTKMM_SHOW_ALL_CHILDREN
365      show_all_children();      show_all_children();
366    #endif
367  }  }
368    
369  ScriptEditor::~ScriptEditor() {  ScriptEditor::~ScriptEditor() {
# Line 297  int ScriptEditor::currentFontSize() cons Line 386  int ScriptEditor::currentFontSize() cons
386    
387  void ScriptEditor::setFontSize(int size, bool save) {  void ScriptEditor::setFontSize(int size, bool save) {
388      //printf("setFontSize(%d,%d)\n", size, save);      //printf("setFontSize(%d,%d)\n", size, save);
389    #if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION < 20)
390      Pango::FontDescription fdesc;      Pango::FontDescription fdesc;
391      fdesc.set_family("monospace");      fdesc.set_family("monospace");
392  #if defined(__APPLE__)  # if defined(__APPLE__)
393      // fixes poor readability of default monospace font on Macs      // fixes poor readability of default monospace font on Macs
394      if (macIsMinMac10_6())      if (macIsMinMac10_6())
395          fdesc.set_family("Menlo");          fdesc.set_family("Menlo");
396  #endif  # endif
397      fdesc.set_size(size * PANGO_SCALE);      fdesc.set_size(size * PANGO_SCALE);
398      /*Glib::RefPtr<Pango::Context> context = m_textView.get_pango_context();  # if GTKMM_MAJOR_VERSION < 3
     Cairo::FontOptions options;  
     options.set_antialias(Cairo::ANTIALIAS_NONE);  
     context->set_cairo_font_options(options);*/  
 #if GTKMM_MAJOR_VERSION < 3  
399      m_lineNrView.modify_font(fdesc);      m_lineNrView.modify_font(fdesc);
400      m_textView.modify_font(fdesc);      m_textView.modify_font(fdesc);
401  #else  # else
402      m_lineNrView.override_font(fdesc);      m_lineNrView.override_font(fdesc);
403      m_textView.override_font(fdesc);      m_textView.override_font(fdesc);
404    # endif
405    #else
406        Glib::ustring family = "monospace";
407    # if defined(__APPLE__)
408        // fixes poor readability of default monospace font on Macs
409        if (macIsMinMac10_6())
410            family = "Menlo";
411    # endif
412        if (!m_css) {
413            m_css = Gtk::CssProvider::create();
414            m_lineNrView.get_style_context()->add_provider(m_css, GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
415            m_textView.get_style_context()->add_provider(m_css, GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
416        }
417        m_css->load_from_data(
418            "* {"
419            "  font: " + ToString(size) + " " + family + ";"
420            "}"
421        );
422  #endif  #endif
423      if (save) Settings::singleton()->scriptEditorFontSize = size;      if (save) Settings::singleton()->scriptEditorFontSize = size;
424  }  }
# Line 638  bool ScriptEditor::on_motion_notify_even Line 742  bool ScriptEditor::on_motion_notify_even
742      //TODO: event throttling would be a good idea here      //TODO: event throttling would be a good idea here
743      updateIssueTooltip(e);      updateIssueTooltip(e);
744  #endif  #endif
745    #if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION <= 22)
746      return ManagedWindow::on_motion_notify_event(e);      return ManagedWindow::on_motion_notify_event(e);
747    #else
748        Gdk::EventMotion em = Glib::wrap(e, true);
749        return ManagedWindow::on_motion_notify_event(em);
750    #endif
751  }  }
752    
753  void ScriptEditor::onMenuChangeFontSize() {  void ScriptEditor::onMenuChangeFontSize() {
754      //TODO: for GTKMM >= 3.2 class Gtk::FontChooser could be used instead      //TODO: for GTKMM >= 3.2 class Gtk::FontChooser could be used instead
755      Gtk::Dialog dialog(_("Font Size"), true /*modal*/);      Gtk::Dialog dialog(_("Font Size"), true /*modal*/);
756      Gtk::HBox hbox;      HBox hbox;
757      hbox.set_spacing(6);      hbox.set_spacing(6);
758    
759      Gtk::Label label(_("Editor's Font Size:"), Gtk::ALIGN_START);      Gtk::Label label(_("Editor's Font Size:"), Gtk::ALIGN_START);
# Line 656  void ScriptEditor::onMenuChangeFontSize( Line 765  void ScriptEditor::onMenuChangeFontSize(
765      spinButton.set_value(currentFontSize());      spinButton.set_value(currentFontSize());
766      hbox.pack_start(spinButton);      hbox.pack_start(spinButton);
767    
768    #if USE_GTKMM_BOX
769        dialog.get_content_area()->pack_start(hbox);
770    #else
771      dialog.get_vbox()->pack_start(hbox);      dialog.get_vbox()->pack_start(hbox);
772    #endif
773      dialog.add_button(_("_OK"), 0);      dialog.add_button(_("_OK"), 0);
774      dialog.add_button(_("_Cancel"), 1);      dialog.add_button(_("_Cancel"), 1);
775    
776    #if HAS_GTKMM_SHOW_ALL_CHILDREN
777      dialog.show_all_children();      dialog.show_all_children();
778    #endif
779    
780      if (!dialog.run()) { // OK selected ...      if (!dialog.run()) { // OK selected ...
781          const int newFontSize = spinButton.get_value_as_int();          const int newFontSize = spinButton.get_value_as_int();
# Line 669  void ScriptEditor::onMenuChangeFontSize( Line 784  void ScriptEditor::onMenuChangeFontSize(
784      }      }
785  }  }
786    
787  bool ScriptEditor::onWindowDelete(GdkEventAny* e) {  #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
788    bool ScriptEditor::onWindowDelete(Gdk::Event& e) {
789        return onWindowDeleteP(NULL);
790    }
791    #endif
792    
793    bool ScriptEditor::onWindowDeleteP(GdkEventAny* /*e*/) {
794      //printf("onWindowDelete\n");      //printf("onWindowDelete\n");
795    
796      if (!isModified()) return false; // propagate event further (which will close this window)      if (!isModified()) return false; // propagate event further (which will close this window)
# Line 718  void ScriptEditor::onModifiedChanged() { Line 839  void ScriptEditor::onModifiedChanged() {
839  }  }
840    
841  void ScriptEditor::onButtonCancel() {  void ScriptEditor::onButtonCancel() {
842      bool dropEvent = onWindowDelete(NULL);      bool dropEvent = onWindowDeleteP(NULL);
843      if (dropEvent) return;      if (dropEvent) return;
844      hide();      hide();
845  }  }
Legend:
Removed from v.3314  
changed lines
  Added in v.3364
  ViewVC Help
Powered by ViewVC