X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FToolbar_pimpl.C;h=7c7a58e3bc5b447cf9c310c5280093bff07a7232;hb=14c60d0aaeff364a78f77e163e6eae5fc3dab8c0;hp=4492fafb75f238fdaa7d867cf6fc3b149e5a5171;hpb=d6665cba427b04ae37f42c846398cad518d2be0f;p=lyx.git

diff --git a/src/frontends/xforms/Toolbar_pimpl.C b/src/frontends/xforms/Toolbar_pimpl.C
index 4492fafb75..7c7a58e3bc 100644
--- a/src/frontends/xforms/Toolbar_pimpl.C
+++ b/src/frontends/xforms/Toolbar_pimpl.C
@@ -26,14 +26,13 @@
 #include "BufferView.h"
 #include "buffer.h"
 #include "LyXAction.h"
+#include "MathsSymbols.h" 
 #include "support/filetools.h"
+#include "support/lstrings.h" 
 #include "gettext.h"
 
 using std::endl;
 
-// this one is not "C" because combox callbacks are really C++ %-|
-extern void LayoutsCB(int, void *, Combox *);
-extern char const ** get_pixmap_from_symbol(char const * arg, int, int);
 extern LyXAction lyxaction;
 
 // some constants
@@ -99,7 +98,7 @@ void BubbleTimerCB(FL_OBJECT *, long data)
 	// The trick we use to get the help text is to read the
 	// argument of the callback that has been registered for
 	// ToolBarCB.  (JMarc)
-	string help = lyxaction.helpText(ob->argument);
+	string help = _(lyxaction.helpText(ob->argument));
 	fl_show_oneliner(help.c_str(), ob->form->x + ob->x,
 			 ob->form->y + ob->y + ob->h);
 }
@@ -115,18 +114,18 @@ extern "C" void C_Toolbar_BubbleTimerCB(FL_OBJECT * ob, long data)
 static
 int BubblePost(FL_OBJECT *ob, int event,
 			FL_Coord /*mx*/, FL_Coord /*my*/,
-			int /*key*/, void */*xev*/)
+			int /*key*/, void * /*xev*/)
 {
 	FL_OBJECT * bubble_timer = reinterpret_cast<FL_OBJECT *>(ob->u_cdata);
 	
 	// We do not test for empty help here, since this can never happen
-	if(event == FL_ENTER){
+	if (event == FL_ENTER){
 		fl_set_object_callback(bubble_timer,
 				       C_Toolbar_BubbleTimerCB,
 				       reinterpret_cast<long>(ob));
 		fl_set_timer(bubble_timer, 1);
 	}
-	else if(event != FL_MOTION){
+	else if (event != FL_MOTION){
 		fl_set_timer(bubble_timer, 0);
 		fl_hide_oneliner();
 	}
@@ -142,6 +141,21 @@ extern "C" int C_Toolbar_BubblePost(FL_OBJECT * ob, int event,
 }
 #endif
 
+// this one is not "C" because combox callbacks are really C++ %-|
+void Toolbar::Pimpl::layoutSelectedCB(int sel, void * arg, Combox *)
+{
+	Toolbar::Pimpl * tb = reinterpret_cast<Toolbar::Pimpl *>(arg);
+
+	tb->layoutSelected(sel);
+}
+
+
+void Toolbar::Pimpl::layoutSelected(int sel)
+{
+	string const tmp = tostr(sel);
+	owner->getLyXFunc()->Dispatch(LFUN_LAYOUTNO, tmp);
+}
+ 
 
 void Toolbar::Pimpl::activate()
 {
@@ -220,15 +234,16 @@ void Toolbar::Pimpl::updateLayoutList(bool force)
 		for (LyXTextClass::const_iterator cit = tc.begin();
 		     cit != end; ++cit) {
 			if ((*cit).obsoleted_by().empty())
-				combox->addline(_((*cit).name().c_str()));
+				combox->addline(_((*cit).name()));
 			else
-				combox->addline(("@N" + string(_((*cit).name().c_str()))).c_str());
+				combox->addline("@N" + _((*cit).name()));
 		}
 	}
 	// we need to do this.
 	combox->Redraw();
 }
 
+
 void Toolbar::Pimpl::clearLayoutList()
 {
 	if (combox) {
@@ -237,19 +252,21 @@ void Toolbar::Pimpl::clearLayoutList()
 	}
 }
 
+
 void Toolbar::Pimpl::openLayoutList()
 {
 	if (combox)
 		combox->Show();
 }
 
+
 static
 void ToolbarCB(FL_OBJECT * ob, long ac)
 {
 	LyXView * owner = static_cast<LyXView *>(ob->u_vdata);
 	
 	string res = owner->getLyXFunc()->Dispatch(int(ac));
-	if(!res.empty())
+	if (!res.empty())
 		lyxerr[Debug::GUI] << "ToolbarCB: Function returned: " 
 				   << res << endl;
 }
@@ -260,6 +277,7 @@ extern "C" void C_Toolbar_ToolbarCB(FL_OBJECT * ob, long data)
 	ToolbarCB(ob, data);
 }
 
+
 #if 0
 // What are we supposed to do with that??
 int Toolbar::get_toolbar_func(string const & func)
@@ -302,12 +320,16 @@ void setPixmap(FL_OBJECT * obj, int action, int buttonwidth, int height) {
 	}
 
 	if (act == LFUN_INSERT_MATH && !arg.empty()) {
-		lyxerr[Debug::GUI] << "Using mathed-provided icon" << endl;
 		char const ** pixmap = get_pixmap_from_symbol(arg.c_str(),
 							buttonwidth,
 							height);
-		fl_set_pixmapbutton_data(obj, const_cast<char **>(pixmap));
-		return;
+		if (pixmap) {
+			lyxerr[Debug::GUI] << "Using mathed-provided icon"
+					   << endl;
+			fl_set_pixmapbutton_data(obj,
+						 const_cast<char **>(pixmap));
+			return;
+		}
 	}
 	
 	lyxerr << "Unable to find icon `" << xpm_name << "'" << endl;
@@ -341,7 +363,7 @@ void Toolbar::Pimpl::set(bool doingmain)
 	ToolbarList::iterator item = toollist.begin();
 	ToolbarList::iterator end = toollist.end();
 	for (; item != end; ++item) {
-		switch(item->action){
+		switch (item->action){
 		case ToolbarDefaults::SEPARATOR:
 			xpos += sepspace;
 			break;
@@ -353,7 +375,7 @@ void Toolbar::Pimpl::set(bool doingmain)
 			if (!combox)
 				combox = new Combox(FL_COMBOX_DROPLIST);
 			combox->add(xpos, ypos, 135, height, 400);
-			combox->setcallback(LayoutsCB);
+			combox->setcallback(layoutSelectedCB, this);
 			combox->resize(FL_RESIZE_ALL);
 			combox->gravity(NorthWestGravity, NorthWestGravity);
 			xpos += 135;
@@ -376,7 +398,7 @@ void Toolbar::Pimpl::set(bool doingmain)
 
 			// Set the tooltip
 #if FL_REVISION >= 89
-			string help = lyxaction.helpText(item->action);
+			string help = _(lyxaction.helpText(item->action));
 			fl_set_object_helper(obj, help.c_str());	
 #else
 			fl_set_object_posthandler(obj, C_Toolbar_BubblePost);