1
0
Fork 0

(svn r18981) -Change: show empty query after creating new group (instead of 'Group nnn')

release/1.0
smatz 2010-02-01 18:38:28 +00:00
parent 06e80d0a1f
commit 78ffa78ee7
1 changed files with 10 additions and 5 deletions

View File

@ -498,7 +498,7 @@ public:
} }
case GRP_WIDGET_RENAME_GROUP: // Rename the selected roup case GRP_WIDGET_RENAME_GROUP: // Rename the selected roup
this->ShowRenameGroupWindow(this->group_sel); this->ShowRenameGroupWindow(this->group_sel, false);
break; break;
case GRP_WIDGET_AVAILABLE_VEHICLES: case GRP_WIDGET_AVAILABLE_VEHICLES:
@ -658,12 +658,17 @@ public:
this->SetWidgetDirty(GRP_WIDGET_LIST_VEHICLE); this->SetWidgetDirty(GRP_WIDGET_LIST_VEHICLE);
} }
void ShowRenameGroupWindow(GroupID group) void ShowRenameGroupWindow(GroupID group, bool empty)
{ {
assert(Group::IsValidID(group)); assert(Group::IsValidID(group));
this->group_rename = group; this->group_rename = group;
SetDParam(0, group); /* Show empty query for new groups */
ShowQueryString(STR_GROUP_NAME, STR_GROUP_RENAME_CAPTION, MAX_LENGTH_GROUP_NAME_BYTES, MAX_LENGTH_GROUP_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT); StringID str = STR_EMPTY;
if (!empty) {
SetDParam(0, group);
str = STR_GROUP_NAME;
}
ShowQueryString(str, STR_GROUP_RENAME_CAPTION, MAX_LENGTH_GROUP_NAME_BYTES, MAX_LENGTH_GROUP_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT);
} }
/** /**
@ -730,7 +735,7 @@ void CcCreateGroup(const CommandCost &result, TileIndex tile, uint32 p1, uint32
assert(p1 <= VEH_AIRCRAFT); assert(p1 <= VEH_AIRCRAFT);
VehicleGroupWindow *w = FindVehicleGroupWindow((VehicleType)p1, _current_company); VehicleGroupWindow *w = FindVehicleGroupWindow((VehicleType)p1, _current_company);
if (w != NULL) w->ShowRenameGroupWindow(_new_group_id); if (w != NULL) w->ShowRenameGroupWindow(_new_group_id, true);
} }
/** /**