X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fintl.h;h=2e173f5cb89e01fdcfc3948ac5ddc250542363f8;hb=f65b7ff4ab2fe8ad0d9196c231064240e3fde81f;hp=e85036ceaba903745c6f95838c81fe06fd185008;hpb=8ed9dbabde30b31a6a14e032fa42f682a196ef7a;p=lyx.git diff --git a/src/intl.h b/src/intl.h index e85036ceab..2e173f5cb8 100644 --- a/src/intl.h +++ b/src/intl.h @@ -12,13 +12,18 @@ #pragma interface #endif +#include #include "LString.h" #include "form1.h" +#include "trans_mgr.h" class LyXText; class Combox; -class TransManager; +#ifdef SIGC_CXX_NAMESPACES +using SigC::Object; +using SigC::Connection; +#endif /// default character set #define DEFCHSET "iso8859-1" @@ -28,11 +33,12 @@ class TransManager; classes. Probably should the gui class just have a pointer to the non gui class. */ -class Intl -{ +class Intl : public Object { public: /// Intl(); + /// + ~Intl(); /// show key mapping dialog void MenuKeymap(); @@ -55,8 +61,8 @@ public: /// initialize key mapper void InitKeyMapper(bool on); - /// Get the Translation Manager - TransManager * getTrans(); + // Get the Translation Manager + TransManager & getTrans(); /// bool keymapon; /// @@ -66,12 +72,14 @@ public: /// static void DispatchCallback(FL_OBJECT *, long); private: + /** Redraw the form (on receipt of a Signal indicating, for example, + that the xform colors have been re-mapped). + */ + void redraw(); /// void update(); /// - static void LCombo(int i, void *); // callback - /// - static void LCombo2(int i, void *); // callback + static void LCombo(int i, void *, Combox *); // callback /// void Keymap(long code); /// @@ -90,12 +98,14 @@ private: /// string & sec_lang; /// - TransManager * trans; + TransManager trans; + /// Redraw connection. + Connection r_; }; inline -TransManager * Intl::getTrans() +TransManager & Intl::getTrans() { return trans; }