--- gigedit/trunk/src/gigedit/scripteditor.h 2016/04/25 17:35:21 2890 +++ gigedit/trunk/src/gigedit/scripteditor.h 2016/05/02 14:36:40 2899 @@ -11,29 +11,37 @@ #include #include #include - #include "compat.h" +#include "ManagedWindow.h" // Should we use a very simple (and buggy) local NKSP syntax parser, or should -// we rather use the full features NKSP syntax highlighting backend from +// we rather use the full featured NKSP syntax highlighting backend from // liblinuxsampler for syntax highlighting of this text editor? #if HAVE_LINUXSAMPLER # define USE_LS_SCRIPTVM 1 #endif #if USE_LS_SCRIPTVM -namespace LinuxSampler { - class ScriptVM; -} +# include +# include #endif -class ScriptEditor : public Gtk::Window { +class ScriptEditor : public ManagedWindow { public: ScriptEditor(); ~ScriptEditor(); void setScript(gig::Script* script); + + // implementation for abstract methods of interface class "ManagedWindow" + virtual Settings::Property* windowSettingX() { return &Settings::singleton()->scriptEditorWindowX; } + virtual Settings::Property* windowSettingY() { return &Settings::singleton()->scriptEditorWindowY; } + virtual Settings::Property* windowSettingWidth() { return &Settings::singleton()->scriptEditorWindowW; } + virtual Settings::Property* windowSettingHeight() { return &Settings::singleton()->scriptEditorWindowH; } + protected: Gtk::VBox m_vbox; + Gtk::HBox m_footerHBox; + Gtk::HBox m_statusHBox; Gtk::HButtonBox m_buttonBox; Gtk::ScrolledWindow m_scrolledWindow; Glib::RefPtr m_textBuffer; @@ -49,14 +57,24 @@ Glib::RefPtr m_errorTag; Glib::RefPtr m_warningTag; Gtk::TextView m_textView; + Gtk::Image m_statusImage; + Gtk::Label m_statusLabel; Gtk::Button m_applyButton; Gtk::Button m_cancelButton; + Glib::RefPtr m_warningIcon; + Glib::RefPtr m_errorIcon; + Glib::RefPtr m_successIcon; + gig::Script* m_script; #if USE_LS_SCRIPTVM LinuxSampler::ScriptVM* m_vm; + std::vector m_issues; + std::vector m_errors; + std::vector m_warnings; #endif + bool isModified() const; void onButtonCancel(); void onButtonApply(); void onWindowHide(); @@ -67,7 +85,11 @@ void updateSyntaxHighlightingByVM(); void updateParserIssuesByVM(); LinuxSampler::ScriptVM* GetScriptVM(); + void updateIssueTooltip(GdkEventMotion* e); + void updateStatusBar(); #endif + bool on_motion_notify_event(GdkEventMotion* e); + bool onWindowDelete(GdkEventAny* e); }; #endif // GIGEDIT_SCRIPTEDITOR_H