X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fintl.h;h=2e173f5cb89e01fdcfc3948ac5ddc250542363f8;hb=f65b7ff4ab2fe8ad0d9196c231064240e3fde81f;hp=8cf5bf36d5976c5340fb2687168fa010c926e407;hpb=ee1229d7431f99788d04e99fcd8c57de69b4acaf;p=lyx.git

diff --git a/src/intl.h b/src/intl.h
index 8cf5bf36d5..2e173f5cb8 100644
--- a/src/intl.h
+++ b/src/intl.h
@@ -6,17 +6,24 @@
 #ifndef INTL_H
 #define INTL_H
 
+#include FORMS_H_LOCATION
+
 #ifdef __GNUG__
 #pragma interface
 #endif
 
+#include <sigc++/signal_system.h>
 #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"
@@ -26,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(); 
@@ -53,26 +61,28 @@ public:
 	/// initialize key mapper
 	void InitKeyMapper(bool on);
 
-	/// Get the Translation Manager
-	inline TransManager * getTrans();
+	// Get the Translation Manager
+	TransManager & getTrans();
 	///
 	bool keymapon;
 	///
+	bool primarykeymap;
+	///
 	char * chsetcode;
 	///
 	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);
 	///
-	bool primarykeymap;
-	///
 	int curkeymap;
 	///
 	int otherkeymap;
@@ -88,11 +98,14 @@ private:
 	///
 	string & sec_lang;
 	///
-	TransManager * trans;
+	TransManager trans;
+	/// Redraw connection.
+	Connection r_;
 };
 
 
-TransManager * Intl::getTrans()
+inline
+TransManager & Intl::getTrans()
 {
 	return trans;
 }