Commit 459f7632 authored by Claes Sjofors's avatar Claes Sjofors

Ge method toolbar and methods menu wasn't translated

parent a7227e07
...@@ -18172,16 +18172,26 @@ int GeMethodToolbar::action( grow_tObject object, glow_tEvent event) ...@@ -18172,16 +18172,26 @@ int GeMethodToolbar::action( grow_tObject object, glow_tEvent event)
break; break;
case glow_eEvent_MB1Up: case glow_eEvent_MB1Up:
break; break;
case glow_eEvent_TipText: case glow_eEvent_TipText: {
if ( event->toolbar.category == 1) pwr_tString80 text;
grow_SetTipText( dyn->graph->grow->ctx, event->toolbar.object,
GeMethods::op_tooltip[event->toolbar.idx], if ( event->toolbar.category == 1) {
event->any.x_pixel, event->any.y_pixel); if ( grow_GetTranslate( dyn->graph->grow->ctx))
else Lng::translate( GeMethods::op_tooltip[event->toolbar.idx], text);
grow_SetTipText( dyn->graph->grow->ctx, event->toolbar.object, else
GeMethods::mnt_tooltip[event->toolbar.idx], strcpy( text, GeMethods::op_tooltip[event->toolbar.idx]);
event->any.x_pixel, event->any.y_pixel); }
else {
if ( grow_GetTranslate( dyn->graph->grow->ctx))
Lng::translate( GeMethods::mnt_tooltip[event->toolbar.idx], text);
else
strcpy( text, GeMethods::mnt_tooltip[event->toolbar.idx]);
}
grow_SetTipText( dyn->graph->grow->ctx, event->toolbar.object,
text, event->any.x_pixel, event->any.y_pixel);
break; break;
}
case glow_eEvent_Key_Return: case glow_eEvent_Key_Return:
case glow_eEvent_MB1Click: { case glow_eEvent_MB1Click: {
int sts; int sts;
...@@ -18421,7 +18431,10 @@ int GeMethodPulldownMenu::action( grow_tObject object, glow_tEvent event) ...@@ -18421,7 +18431,10 @@ int GeMethodPulldownMenu::action( grow_tObject object, glow_tEvent event)
if ( opmask & (1 << i)) { if ( opmask & (1 << i)) {
info.item[menu_idx].type = glow_eMenuItem_Button; info.item[menu_idx].type = glow_eMenuItem_Button;
strcpy( info.item[menu_idx].text, GeMethods::op_name[i]); if ( grow_GetTranslate( dyn->graph->grow->ctx))
Lng::translate( GeMethods::op_name[i], info.item[menu_idx].text);
else
strcpy( info.item[menu_idx].text, GeMethods::op_name[i]);
info.item[menu_idx].occupied = true; info.item[menu_idx].occupied = true;
if ( insensitive_opmask & (1 << i)) if ( insensitive_opmask & (1 << i))
info.item[menu_idx].type = glow_eMenuItem_ButtonDisabled; info.item[menu_idx].type = glow_eMenuItem_ButtonDisabled;
...@@ -18440,7 +18453,10 @@ int GeMethodPulldownMenu::action( grow_tObject object, glow_tEvent event) ...@@ -18440,7 +18453,10 @@ int GeMethodPulldownMenu::action( grow_tObject object, glow_tEvent event)
if ( mntmask & (1 << i)) { if ( mntmask & (1 << i)) {
info.item[menu_idx].type = glow_eMenuItem_Button; info.item[menu_idx].type = glow_eMenuItem_Button;
strcpy( info.item[menu_idx].text, GeMethods::mnt_name[i]); if ( grow_GetTranslate( dyn->graph->grow->ctx))
Lng::translate( GeMethods::mnt_name[i], info.item[menu_idx].text);
else
strcpy( info.item[menu_idx].text, GeMethods::mnt_name[i]);
info.item[menu_idx].occupied = true; info.item[menu_idx].occupied = true;
if ( insensitive_mntmask & (1 << i)) if ( insensitive_mntmask & (1 << i))
info.item[menu_idx].type = glow_eMenuItem_ButtonDisabled; info.item[menu_idx].type = glow_eMenuItem_ButtonDisabled;
......
...@@ -510,6 +510,10 @@ E 1.20.5 "Value below minvalue" ...@@ -510,6 +510,10 @@ E 1.20.5 "Value below minvalue"
# Method toolbar # Method toolbar
E 1.21.1 "Fast curve" E 1.21.1 "Fast curve"
E 1.21.2 "Block events" E 1.21.2 "Block events"
E 1.21.3 "Event log"
E 1.21.4 "Simulate"
E 1.21.5 "Open parent object graph"
E 1.21.6 "Camera"
# #
# Video management system # Video management system
E 1.22.1 "Panels" E 1.22.1 "Panels"
......
...@@ -507,6 +507,10 @@ E 1.20.5 "Minv ...@@ -507,6 +507,10 @@ E 1.20.5 "Minv
# Method toolbar # Method toolbar
E 1.21.1 "Snabbkurva" E 1.21.1 "Snabbkurva"
E 1.21.2 "Blockera hndelser" E 1.21.2 "Blockera hndelser"
E 1.21.3 "Hndelselogg"
E 1.21.4 "Simulera"
E 1.21.5 "ppna frlders objektsbild"
E 1.21.6 "Kamera"
# #
# Video management system # Video management system
E 1.22.1 "Paneler" E 1.22.1 "Paneler"
...@@ -735,6 +739,10 @@ E 4.15.7 "Order ...@@ -735,6 +739,10 @@ E 4.15.7 "Order
E 4.15.8 "Order Stng" E 4.15.8 "Order Stng"
# BaseCDamper # BaseCDamper
E 4.16.1 "Spjll" E 4.16.1 "Spjll"
# BaseFilter
E 4.17.1 "Filter igensatt"
# BasePositSensor
E 4.18.1 "Kalibrering"
# #
# Manufacturer components # Manufacturer components
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment