diff options
47 files changed, 212 insertions, 197 deletions
diff --git a/src/company_gui.cpp b/src/company_gui.cpp index cd9ea1ce3..7e6a34bb5 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -1420,20 +1420,35 @@ static void DoSelectCompanyManagerFace(Window *parent, bool adv, int top, int le enum CompanyWindowWidgets { CW_WIDGET_CLOSEBOX = 0, CW_WIDGET_CAPTION, + CW_WIDGET_BACKGROUND, + CW_WIDGET_FACE, + CW_WIDGET_FACE_TITLE, + + CW_WIDGET_DESC_INAUGURATION, + CW_WIDGET_DESC_COLOUR_SCHEME, + CW_WIDGET_DESC_COLOUR_SCHEME_EXAMPLE, + CW_WIDGET_DESC_VEHICLE, + CW_WIDGET_DESC_VEHICLE_COUNTS, + CW_WIDGET_DESC_COMPANY_VALUE, + CW_WIDGET_DESC_OWNERS, + CW_WIDGET_SELECT_BUTTONS, ///< Selection widget for the button bar. CW_WIDGET_NEW_FACE, CW_WIDGET_COLOUR_SCHEME, CW_WIDGET_PRESIDENT_NAME, CW_WIDGET_COMPANY_NAME, - CW_WIDGET_BUILD_VIEW_HQ, - CW_WIDGET_SELECT_RELOCATE, ///< View/hide the 'Relocate HQ' button. - CW_WIDGET_RELOCATE_EMPTY, ///< Empty widget to hide the relocate HQ button. - CW_WIDGET_RELOCATE_HQ, CW_WIDGET_BUY_SHARE, CW_WIDGET_SELL_SHARE, + + CW_WIDGET_SELECT_VIEW_BUILD_HQ, + CW_WIDGET_VIEW_HQ, + CW_WIDGET_BUILD_HQ, + + CW_WIDGET_SELECT_RELOCATE, ///< View/hide the 'Relocate HQ' button. + CW_WIDGET_RELOCATE_HQ, + CW_WIDGET_SELECT_MULTIPLAYER, ///< Multiplayer selection panel. - CW_WIDGET_MP_EMPTY, CW_WIDGET_COMPANY_PASSWORD, CW_WIDGET_COMPANY_JOIN, }; @@ -1443,101 +1458,76 @@ static const NWidgetPart _nested_company_widgets[] = { NWidget(WWT_CLOSEBOX, COLOUR_GREY, CW_WIDGET_CLOSEBOX), NWidget(WWT_CAPTION, COLOUR_GREY, CW_WIDGET_CAPTION), SetDataTip(STR_COMPANY_VIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), EndContainer(), - NWidget(WWT_PANEL, COLOUR_GREY, CW_WIDGET_FACE), - NWidget(NWID_SPACER), SetMinimalSize(360, 4), - NWidget(NWID_HORIZONTAL), - NWidget(NWID_SPACER), SetFill(true, false), - NWidget(WWT_TEXTBTN, COLOUR_GREY, CW_WIDGET_BUILD_VIEW_HQ), SetMinimalSize(90, 12), SetPadding(0, 4, 0, 0), - SetDataTip(STR_COMPANY_VIEW_VIEW_HQ_BUTTON, STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP), - EndContainer(), - NWidget(NWID_SPACER), SetMinimalSize(0, 2), - NWidget(NWID_SELECTION, INVALID_COLOUR, CW_WIDGET_SELECT_RELOCATE), - NWidget(NWID_HORIZONTAL), - NWidget(NWID_SPACER), SetFill(true, false), - NWidget(WWT_TEXTBTN, COLOUR_GREY, CW_WIDGET_RELOCATE_HQ), SetMinimalSize(90, 12), SetPadding(0, 4, 0, 0), - SetDataTip(STR_COMPANY_VIEW_RELOCATE_HQ, STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS), + NWidget(WWT_PANEL, COLOUR_GREY, CW_WIDGET_BACKGROUND), + NWidget(NWID_HORIZONTAL), SetPIP(4, 6, 4), + NWidget(NWID_VERTICAL), SetPIP(4, 2, 4), + NWidget(WWT_EMPTY, INVALID_COLOUR, CW_WIDGET_FACE), SetMinimalSize(91, 120), SetFill(true, false), + NWidget(WWT_EMPTY, INVALID_COLOUR, CW_WIDGET_FACE_TITLE), SetFill(true, true), SetMinimalTextLines(2, 0), EndContainer(), - NWidget(WWT_EMPTY, INVALID_COLOUR, CW_WIDGET_RELOCATE_EMPTY), SetFill(true, true), - EndContainer(), - NWidget(NWID_SPACER), SetMinimalSize(0, 94), - /* Multi player buttons. */ - NWidget(NWID_SELECTION, INVALID_COLOUR, CW_WIDGET_SELECT_MULTIPLAYER), - NWidget(WWT_EMPTY, INVALID_COLOUR, CW_WIDGET_MP_EMPTY), SetFill(true, true), - NWidget(NWID_HORIZONTAL), - NWidget(NWID_SPACER), SetFill(true, false), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_COMPANY_PASSWORD), SetMinimalSize(90, 12), SetPadding(0, 4, 0, 0), - SetDataTip(STR_COMPANY_VIEW_PASSWORD, STR_COMPANY_VIEW_PASSWORD_TOOLTIP), - EndContainer(), - NWidget(NWID_HORIZONTAL), - NWidget(NWID_SPACER), SetFill(true, false), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_COMPANY_JOIN), SetMinimalSize(90, 12), SetPadding(0, 4, 0, 0), - SetDataTip(STR_COMPANY_VIEW_JOIN, STR_COMPANY_VIEW_JOIN_TOOLTIP), + NWidget(NWID_VERTICAL), + NWidget(NWID_HORIZONTAL), + NWidget(NWID_VERTICAL), SetPIP(4, 5, 5), + NWidget(WWT_TEXT, COLOUR_GREY, CW_WIDGET_DESC_INAUGURATION), SetDataTip(STR_COMPANY_VIEW_INAUGURATED_TITLE, STR_NULL), SetFill(true, false), + NWidget(NWID_HORIZONTAL), SetPIP(0, 5, 0), + NWidget(WWT_LABEL, COLOUR_GREY, CW_WIDGET_DESC_COLOUR_SCHEME), SetDataTip(STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE, STR_NULL), + NWidget(WWT_EMPTY, INVALID_COLOUR, CW_WIDGET_DESC_COLOUR_SCHEME_EXAMPLE), SetMinimalSize(30, 0), SetFill(false, true), + NWidget(NWID_SPACER), SetFill(true, false), + EndContainer(), + NWidget(NWID_HORIZONTAL), SetPIP(0, 4, 0), + NWidget(NWID_VERTICAL), + NWidget(WWT_TEXT, COLOUR_GREY, CW_WIDGET_DESC_VEHICLE), SetDataTip(STR_COMPANY_VIEW_VEHICLES_TITLE, STR_NULL), + NWidget(NWID_SPACER), SetFill(false, true), + EndContainer(), + NWidget(WWT_EMPTY, INVALID_COLOUR, CW_WIDGET_DESC_VEHICLE_COUNTS), SetMinimalTextLines(4, 0), + NWidget(NWID_SPACER), SetFill(true, false), + EndContainer(), + EndContainer(), + NWidget(NWID_VERTICAL), SetPIP(4, 2, 4), + NWidget(NWID_SELECTION, INVALID_COLOUR, CW_WIDGET_SELECT_VIEW_BUILD_HQ), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_VIEW_HQ), SetFill(true, false), SetDataTip(STR_COMPANY_VIEW_VIEW_HQ_BUTTON, STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP), + NWidget(WWT_TEXTBTN, COLOUR_GREY, CW_WIDGET_BUILD_HQ), SetFill(true, false), SetDataTip(STR_COMPANY_VIEW_BUILD_HQ_BUTTON, STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP), + EndContainer(), + NWidget(NWID_SELECTION, INVALID_COLOUR, CW_WIDGET_SELECT_RELOCATE), + NWidget(WWT_TEXTBTN, COLOUR_GREY, CW_WIDGET_RELOCATE_HQ), SetFill(true, false), SetDataTip(STR_COMPANY_VIEW_RELOCATE_HQ, STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS), + NWidget(NWID_SPACER), SetMinimalSize(90, 0), + EndContainer(), + NWidget(NWID_SPACER), SetFill(false, true), + EndContainer(), + EndContainer(), + NWidget(WWT_TEXT, COLOUR_GREY, CW_WIDGET_DESC_COMPANY_VALUE), SetDataTip(STR_COMPANY_VIEW_COMPANY_VALUE, STR_NULL), SetFill(true, false), + NWidget(NWID_HORIZONTAL), + NWidget(NWID_VERTICAL), SetPIP(5, 5, 4), + NWidget(WWT_EMPTY, INVALID_COLOUR, CW_WIDGET_DESC_OWNERS), SetMinimalTextLines(3, 0), + NWidget(NWID_SPACER), SetFill(false, true), + EndContainer(), + NWidget(NWID_VERTICAL), SetPIP(4, 2, 4), + NWidget(NWID_SPACER), SetMinimalSize(90, 0), SetFill(false, true), + /* Multi player buttons. */ + NWidget(NWID_SELECTION, INVALID_COLOUR, CW_WIDGET_SELECT_MULTIPLAYER), + NWidget(NWID_SPACER), SetFill(true, false), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_COMPANY_PASSWORD), SetFill(true, false), SetDataTip(STR_COMPANY_VIEW_PASSWORD, STR_COMPANY_VIEW_PASSWORD_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_COMPANY_JOIN), SetFill(true, false), SetDataTip(STR_COMPANY_VIEW_JOIN, STR_COMPANY_VIEW_JOIN_TOOLTIP), + EndContainer(), + EndContainer(), + EndContainer(), EndContainer(), EndContainer(), - NWidget(NWID_SPACER), SetMinimalSize(0, 8), EndContainer(), /* Button bars at the bottom. */ NWidget(NWID_SELECTION, INVALID_COLOUR, CW_WIDGET_SELECT_BUTTONS), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_NEW_FACE), SetMinimalSize(90, 12), SetFill(true, false), - SetDataTip(STR_COMPANY_VIEW_NEW_FACE_BUTTON, STR_COMPANY_VIEW_NEW_FACE_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_COLOUR_SCHEME), SetMinimalSize(90, 12), SetFill(true, false), - SetDataTip(STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON, STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_PRESIDENT_NAME), SetMinimalSize(90, 12), SetFill(true, false), - SetDataTip(STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON, STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_COMPANY_NAME), SetMinimalSize(90, 12), SetFill(true, false), - SetDataTip(STR_COMPANY_VIEW_COMPANY_NAME_BUTTON, STR_COMPANY_VIEW_COMPANY_NAME_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_NEW_FACE), SetFill(true, false), SetDataTip(STR_COMPANY_VIEW_NEW_FACE_BUTTON, STR_COMPANY_VIEW_NEW_FACE_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_COLOUR_SCHEME), SetFill(true, false), SetDataTip(STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON, STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_PRESIDENT_NAME), SetFill(true, false), SetDataTip(STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON, STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_COMPANY_NAME), SetFill(true, false), SetDataTip(STR_COMPANY_VIEW_COMPANY_NAME_BUTTON, STR_COMPANY_VIEW_COMPANY_NAME_TOOLTIP), EndContainer(), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_BUY_SHARE), SetMinimalSize(180, 12), SetFill(true, false), - SetDataTip(STR_COMPANY_VIEW_BUY_SHARE_BUTTON, STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_SELL_SHARE), SetMinimalSize(180, 12), SetFill(true, false), - SetDataTip(STR_COMPANY_VIEW_SELL_SHARE_BUTTON, STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_BUY_SHARE), SetFill(true, false), SetDataTip(STR_COMPANY_VIEW_BUY_SHARE_BUTTON, STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP), + NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_SELL_SHARE), SetFill(true, false), SetDataTip(STR_COMPANY_VIEW_SELL_SHARE_BUTTON, STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP), EndContainer(), EndContainer(), }; -/** - * Draws text "Vehicles:" and number of all vehicle types, or "(none)" - * @param company ID of company to print statistics of - * @param right the right most location to draw to - */ -static void DrawCompanyVehiclesAmount(CompanyID company, int right) -{ - const int x = 110; - int y = 63; - uint amounts[] = { 0, 0, 0, 0 }; - - DrawString(x, right, y, STR_COMPANY_VIEW_VEHICLES_TITLE); - - const Vehicle *v; - FOR_ALL_VEHICLES(v) { - if (v->owner == company) { - if (v->IsPrimaryVehicle()) { - assert((size_t)v->type < lengthof(amounts)); - amounts[v->type]++; - } - } - } - - if (amounts[0] + amounts[1] + amounts[2] + amounts[3] == 0) { - DrawString(x + 70, right, y, STR_COMPANY_VIEW_VEHICLES_NONE); - } else { - static const StringID strings[] = { - STR_COMPANY_VIEW_TRAINS, STR_COMPANY_VIEW_ROAD_VEHICLES, STR_COMPANY_VIEW_SHIPS, STR_COMPANY_VIEW_AIRCRAFT - }; - assert_compile(lengthof(amounts) == lengthof(strings)); - - for (uint i = 0; i < lengthof(amounts); i++) { - if (amounts[i] != 0) { - SetDParam(0, amounts[i]); - DrawString(x + 70, right, y, strings[i]); - y += 10; - } - } - } -} - int GetAmountOwnedBy(const Company *c, Owner owner) { return (c->share_owners[0] == owner) + @@ -1546,26 +1536,10 @@ int GetAmountOwnedBy(const Company *c, Owner owner) (c->share_owners[3] == owner); } -/** - * Draws list of all companies with shares - * @param c pointer to the Company structure - */ -static void DrawCompanyOwnerText(const Company *c) -{ - const Company *c2; - uint num = 0; - const byte height = GetCharacterHeight(FS_NORMAL); - - FOR_ALL_COMPANIES(c2) { - uint amt = GetAmountOwnedBy(c, c2->index); - if (amt != 0) { - SetDParam(0, amt * 25); - SetDParam(1, c2->index); - - DrawString(120, 359, (num++) * height + 116, STR_COMPANY_VIEW_SHARES_OWNED_BY); - } - } -} +/** Strings for the company vehicle counts */ +static const StringID _company_view_vehicle_count_strings[] = { + STR_COMPANY_VIEW_TRAINS, STR_COMPANY_VIEW_ROAD_VEHICLES, STR_COMPANY_VIEW_SHIPS, STR_COMPANY_VIEW_AIRCRAFT +}; /** * Window with general information about a company @@ -1581,6 +1555,10 @@ struct CompanyWindow : Window CWP_MP_C_PWD, ///< Display the company password button. CWP_MP_C_JOIN, ///< Display the join company button. + /* Display planes of the #CW_WIDGET_SELECT_VIEW_BUILD_HQ selection widget. */ + CWP_VB_VIEW = 0, ///< Display the view button + CWP_VB_BUILD, ///< Display the build button + /* Display planes of the #CW_WIDGET_SELECT_RELOCATE selection widget. */ CWP_RELOCATE_SHOW = 0, ///< Show the relocate HQ button. CWP_RELOCATE_HIDE, ///< Hide the relocate HQ button. @@ -1604,7 +1582,6 @@ struct CompanyWindow : Window /* Button bar selection. */ int plane = local ? CWP_BUTTONS_LOCAL : CWP_BUTTONS_OTHER; NWidgetStacked *wi = this->GetWidget<NWidgetStacked>(CW_WIDGET_SELECT_BUTTONS); - wi = this->GetWidget<NWidgetStacked>(CW_WIDGET_SELECT_BUTTONS); if (plane != wi->shown_plane) { wi->SetDisplayedPlane(plane); this->SetDirty(); @@ -1612,10 +1589,15 @@ struct CompanyWindow : Window } /* Build HQ button handling. */ - NWidgetCore *wi_core = this->GetWidget<NWidgetCore>(CW_WIDGET_BUILD_VIEW_HQ); - wi_core->widget_data = (local && c->location_of_HQ == INVALID_TILE) ? STR_COMPANY_VIEW_BUILD_HQ_BUTTON : STR_COMPANY_VIEW_VIEW_HQ_BUTTON; - if (local && c->location_of_HQ != INVALID_TILE) wi_core->type = WWT_PUSHTXTBTN; // HQ is already built. - wi_core->SetDisabled(!local && c->location_of_HQ == INVALID_TILE); + plane = (local && c->location_of_HQ == INVALID_TILE) ? CWP_VB_BUILD : CWP_VB_VIEW; + wi = this->GetWidget<NWidgetStacked>(CW_WIDGET_SELECT_VIEW_BUILD_HQ); + if (plane != wi->shown_plane) { + wi->SetDisplayedPlane(plane); + this->SetDirty(); + return; + } + + this->SetWidgetDisabledState(CW_WIDGET_VIEW_HQ, c->location_of_HQ == INVALID_TILE); /* Enable/disable 'Relocate HQ' button. */ plane = (!local || c->location_of_HQ == INVALID_TILE) ? CWP_RELOCATE_HIDE : CWP_RELOCATE_SHOW; @@ -1656,46 +1638,123 @@ struct CompanyWindow : Window } this->DrawWidgets(); + } -#ifdef ENABLE_NETWORK - if (_networking && NetworkCompanyIsPassworded(c->index)) { - const NWidgetBase *wi = this->GetWidget<NWidgetBase>(CW_WIDGET_COMPANY_JOIN); - DrawSprite(SPR_LOCK, PAL_NONE, wi->pos_x - 10, wi->pos_y + 2); + virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *resize) + { + switch (widget) { + case CW_WIDGET_DESC_COMPANY_VALUE: + SetDParam(0, INT64_MAX); // Arguably the maximum company value + size->width = GetStringBoundingBox(STR_COMPANY_VIEW_COMPANY_VALUE).width; + break; + + case CW_WIDGET_DESC_VEHICLE_COUNTS: + SetDParam(0, 5000); // Maximum number of vehicles + for (uint i = 0; i < lengthof(_company_view_vehicle_count_strings); i++) { + size->width = max(size->width, GetStringBoundingBox(_company_view_vehicle_count_strings[i]).width); + } + break; + + case CW_WIDGET_DESC_OWNERS: { + const Company *c2; + + FOR_ALL_COMPANIES(c2) { + SetDParam(0, 25); + SetDParam(1, c2->index); + + size->width = max(size->width, GetStringBoundingBox(STR_COMPANY_VIEW_SHARES_OWNED_BY).width); + } + } break; } -#endif /* ENABLE_NETWORK */ + } + + virtual void DrawWidget(const Rect &r, int widget) const + { + const Company *c = Company::Get((CompanyID)this->window_number); + switch (widget) { + case CW_WIDGET_FACE: + DrawCompanyManagerFace(c->face, c->colour, r.left, r.top); + break; - /* Company manager's face */ - DrawCompanyManagerFace(c->face, c->colour, 2, 16); + case CW_WIDGET_FACE_TITLE: + SetDParam(0, c->index); + DrawStringMultiLine(r.left, r.right, r.top, r.bottom, STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE, TC_FROMSTRING, SA_CENTER); + break; + + case CW_WIDGET_DESC_COLOUR_SCHEME_EXAMPLE: + DrawSprite(SPR_VEH_BUS_SW_VIEW, COMPANY_SPRITE_COLOUR(c->index), (r.left + r.right) / 2, r.top + FONT_HEIGHT_NORMAL / 10); + break; + + case CW_WIDGET_DESC_VEHICLE_COUNTS: { + uint amounts[] = { 0, 0, 0, 0 }; + int y = r.top; + + const Vehicle *v; + FOR_ALL_VEHICLES(v) { + if (v->owner == c->index) { + if (v->IsPrimaryVehicle()) { + assert((size_t)v->type < lengthof(amounts)); + amounts[v->type]++; + } + } + } - /* "xxx (Manager)" */ - SetDParam(0, c->index); - DrawStringMultiLine(48 - MAX_LENGTH_PRESIDENT_NAME_PIXELS / 2, 48 + MAX_LENGTH_PRESIDENT_NAME_PIXELS / 2, 135, 157, STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE, TC_FROMSTRING, SA_CENTER); + if (amounts[0] + amounts[1] + amounts[2] + amounts[3] == 0) { + DrawString(r.left, r.right, y, STR_COMPANY_VIEW_VEHICLES_NONE); + } else { + assert_compile(lengthof(amounts) == lengthof(_company_view_vehicle_count_strings)); - /* "Inaugurated:" */ - SetDParam(0, c->inaugurated_year); - DrawString(110, this->width, 23, STR_COMPANY_VIEW_INAUGURATED_TITLE); + for (uint i = 0; i < lengthof(amounts); i++) { + if (amounts[i] != 0) { + SetDParam(0, amounts[i]); + DrawString(r.left, r.right, y, _company_view_vehicle_count_strings[i]); + y += FONT_HEIGHT_NORMAL; + } + } + } + } break; - /* "Colour scheme:" */ - DrawString(110, this->width, 43, STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE); - /* Draw company-colour bus */ - DrawSprite(SPR_VEH_BUS_SW_VIEW, COMPANY_SPRITE_COLOUR(c->index), 215, 44); + case CW_WIDGET_DESC_OWNERS: { + const Company *c2; + uint y = r.top; - /* "Vehicles:" */ - DrawCompanyVehiclesAmount((CompanyID)this->window_number, this->width); + FOR_ALL_COMPANIES(c2) { + uint amt = GetAmountOwnedBy(c, c2->index); + if (amt != 0) { + SetDParam(0, amt * 25); + SetDParam(1, c2->index); - /* "Company value:" */ - SetDParam(0, CalculateCompanyValue(c)); - DrawString(110, this->width, 106, STR_COMPANY_VIEW_COMPANY_VALUE); + DrawString(r.left, r.right, y, STR_COMPANY_VIEW_SHARES_OWNED_BY); + y += FONT_HEIGHT_NORMAL; + } + } + } break; - /* Shares list */ - DrawCompanyOwnerText(c); +#ifdef ENABLE_NETWORK + case CW_WIDGET_COMPANY_PASSWORD: + if (_networking && NetworkCompanyIsPassworded(c->index)) { + DrawSprite(SPR_LOCK, PAL_NONE, _dynlang.text_dir == TD_RTL ? r.right + 10 : r.left - 10, r.top + 2); + } + break; +#endif /* ENABLE_NETWORK */ + } } virtual void SetStringParameters(int widget) const { - if (widget == CW_WIDGET_CAPTION) { - SetDParam(0, (CompanyID)this->window_number); - SetDParam(1, (CompanyID)this->window_number); + switch (widget) { + case CW_WIDGET_CAPTION: + SetDParam(0, (CompanyID)this->window_number); + SetDParam(1, (CompanyID)this->window_number); + break; + + case CW_WIDGET_DESC_INAUGURATION: + SetDParam(0, Company::Get((CompanyID)this->window_number)->inaugurated_year); + break; + + case CW_WIDGET_DESC_COMPANY_VALUE: + SetDParam(0, CalculateCompanyValue(Company::Get((CompanyID)this->window_number))); + break; } } @@ -1721,24 +1780,24 @@ struct CompanyWindow : Window ShowQueryString(STR_COMPANY_NAME, STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION, MAX_LENGTH_COMPANY_NAME_BYTES, MAX_LENGTH_COMPANY_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT); break; - case CW_WIDGET_BUILD_VIEW_HQ: { + case CW_WIDGET_VIEW_HQ: { TileIndex tile = Company::Get((CompanyID)this->window_number)->location_of_HQ; - if (tile == INVALID_TILE) { - if ((byte)this->window_number != _local_company) return; - SetObjectToPlaceWnd(SPR_CURSOR_HQ, PAL_NONE, HT_RECT, this); - SetTileSelectSize(2, 2); - this->LowerWidget(CW_WIDGET_BUILD_VIEW_HQ); - this->SetWidgetDirty(CW_WIDGET_BUILD_VIEW_HQ); + if (_ctrl_pressed) { + ShowExtraViewPortWindow(tile); } else { - if (_ctrl_pressed) { - ShowExtraViewPortWindow(tile); - } else { - ScrollMainWindowToTile(tile); - } + ScrollMainWindowToTile(tile); } break; } + case CW_WIDGET_BUILD_HQ: + if ((byte)this->window_number != _local_company) return; + SetObjectToPlaceWnd(SPR_CURSOR_HQ, PAL_NONE, HT_RECT, this); + SetTileSelectSize(2, 2); + this->LowerWidget(CW_WIDGET_BUILD_HQ); + this->SetWidgetDirty(CW_WIDGET_BUILD_HQ); + break; + case CW_WIDGET_RELOCATE_HQ: SetObjectToPlaceWnd(SPR_CURSOR_HQ, PAL_NONE, HT_RECT, this); SetTileSelectSize(2, 2); diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 2090a583e..dff3f4df8 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -2437,7 +2437,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Bou HK STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Wys HK -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Bou maatskappy hoofkwartiers / wys maatskappy hoofkwartiers STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Beweeg HQ STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Herbou maatskappy hoofkwartiers elders vir 1% koste van maatskappy waarde diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 49ee94a3e..e7795fba3 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -2521,7 +2521,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE} ( {COMM STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}بناء مقر الشركة الرئيسي STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}عرض مبنى الشركة الئيسي -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}بناء / عرض مبنى الشركة الرئيسي STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}اعادة بناء مقر الشركة STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}اعادة بناء مقر الشركة بمكان آخر و بتكلفة 1% من قيمة الشركة. diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 23ea6a5ab..b01569d98 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -2521,7 +2521,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Construir sede STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Ver sede -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Construir sede da empresa / ver sede da empresa STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Mover sede STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Reconstruir sede da empresa em outro local por 1% do valor da empresa diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 3c37d5242..1c6195136 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -2488,7 +2488,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Построй Централен Офис STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Покажи Централния Офис -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Построй централен офис на компанията / покажи централния офис на компанията STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Преместване ЦК STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Преместване централата на компанията другаде за 1% от стойноста на компанията diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index deaf9620e..b23457e25 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -2531,7 +2531,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Construir Seu STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Veure Seu -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Construir seu de la companyia / veure seu de la companyia STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Trasllada la Seu STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Trasllada la seu de la companyia a un altre lloc amb el cost d'un 1% del seu valor diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 5357def35..f153fb9e9 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -2562,7 +2562,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Izgradi sjedište tvrtke STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Pogledaj sjedište tvrtke -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Izgradi središte tvrtke / pogledaj sjedište tvrtke STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Premjesti sjedište kompanije STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Izgradi sjedište tvrtke negdje drugdje za 1% troška od cjelokupne vrijednosti tvrtke diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 44fbc1230..c34774e91 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -2575,7 +2575,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Ředitelství STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Ředitelství -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Vybudovat ředitelství společnosti nebo ho ukázat STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Přesídlit STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Sídlo společnosti můžeš vystavit jinde za 1 % její hodnoty diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 1bb8703a6..d23035126 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -2519,7 +2519,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Byg HK STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Vis HK -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Byg selskabets hovedkvarter / centrer over hovedkvarteret STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Flyt hovedkvarter STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Flyt selskabets hovedkvarter for 1% af selskabsværdien diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 8a96a2507..5a604e5c2 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -2531,7 +2531,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Bouw bedrijfshoofdkwartier STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Bekijk bedrijfshoofdkwartier -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Bouw bedrijfshoofdkwartier / bekijk bedrijfshoofdkwartier STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Verplaats bedrijfshoofdkwartier STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Herbouw bedrijfshoofdkwartier ergens anders voor 1% van de bedrijfswaarde diff --git a/src/lang/english.txt b/src/lang/english.txt index 0e02df2d1..52ab9218e 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2530,8 +2530,9 @@ STR_COMPANY_VIEW_COMPANY_VALUE :{GOLD}Company v STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA}% owned by {COMPANY}) STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Build HQ +STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Build company headquarters STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}View HQ -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Build company headquarters / view company headquarters +STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP :{BLACK}View company headquarters STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Relocate HQ STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Rebuild company headquarters elsewhere for 1% cost of company value diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index e45a70f4f..7ecb15406 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -2518,7 +2518,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Build HQ STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}View HQ -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Build company headquarters / view company headquarters STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Relocate HQ STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Rebuild company headquarters elsewhere for 1% cost of company value diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 610776920..ef6da1d0c 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -2294,7 +2294,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Faru HQ STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Vidu HQ -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Konstruu kompanian ĉefkonstruaĵon / vidu kompanian ĉefkonstruaĵon STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Relokigu HQ STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Rekonstruu kompanian ĉefkonstruaĵon aliloke por 1% de kompanivaloro diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 8ef0aba9d..2a42e06f8 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -2577,7 +2577,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Ehita peakorter STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Vaata peakorterit -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Ehita ettevõtte peakorter või vii vaade peakorterile STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Liiguta peakorterit STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Ehita ettevõtte peakorter mujale 1% firmaväärtuse tasu eest diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index e0bca2bbb..9d55330f6 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -2531,7 +2531,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Rakenna päämaja STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Näytä päämaja -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Rakenna yhtiön päärakennus / näytä yhtiön päärakennus. STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Sijoita päämaja STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Rakenna yhtiön päärakennus muualle, hintana 1{NBSP}% yhtiön arvosta. diff --git a/src/lang/french.txt b/src/lang/french.txt index 020f81ede..0fe9ccf7d 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -2532,7 +2532,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Const. siège STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Voir le siège -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Contruire/voir le Siège Social STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Déménager le QG STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Reconstruit le quartier général de la compagnie ailleurs pour le prix de 1% de la valeur de la compagnie diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 0bfe0732f..1e4b05dfe 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -2471,7 +2471,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Construír CX STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Ve-lo CX -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Construír/ver cuartel xeral da compañía STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Reposicionar CX STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Recontruí-lo cuartel xeral da compañía en calquer lugar cun custo do 1% do valor da compañía diff --git a/src/lang/german.txt b/src/lang/german.txt index 4b85f5644..0adc89be9 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -2532,7 +2532,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Firmensitz bauen STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Firmensitz -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Firmensitz bauen / anzeigen STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}verlegen STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Errichte Firmensitz für 1% des Firmenwertes an anderer Stelle neu. diff --git a/src/lang/greek.txt b/src/lang/greek.txt index d82d1cb12..13627d6c5 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -2595,7 +2595,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Χτίσιμο Αρχηγείου STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Προβολή Αρχηγείου -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Χτίστιμο αρχηγείου εταιρίας / προβολή αρχηγείου STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Ανοικοδόμηση Αρχηγείου STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Ανοικοδόμηση του αρχηγείου της εταιρίας σε άλλο μέρος, με κόστος το 1% της αξίας της εταιρίας diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index fe10ed307..afbd5b55a 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -2517,7 +2517,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({1:COMP STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}בנה בניין מטה STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}צפה במטה -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}בנה/צפה במטה החברה STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}שנה מיקום המטה STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}מקם מחדש את מטה החברה תמורת 1% משווי החברה diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 31e3c62d7..5b9fde425 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -2564,7 +2564,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Székház építése STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Székház -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}A cég székházának megépítése/ megtekintése STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}SZH áthelyezése STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}A cég székházának újraépítése máshol a cég értékének 1%-áért diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 039408b68..783b85b4a 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -2495,7 +2495,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Byggja HS STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Skoða HS -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Byggja höfuðstöðvar fyrirtækisins / skoða höfuðstöðvar fyrirtækisins STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Flytja HS STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Endurreisa höfuðstöðvarnar annarsstaðar fyrir 1% af verðmæti fyrirtækis diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 4f0740838..7bad4be48 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -2525,7 +2525,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Kantor Pusat STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Lokasi Kantor -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Membangun kantor pusat perusahaan / melihat kantor pusat STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Relokasi Kantor STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Membangun kembali kantor pusat perusahaan di tempat lain dengan 1% ongkos dari nilai perusahaan diff --git a/src/lang/italian.txt b/src/lang/italian.txt index d7d1c0118..45f1524b2 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -2533,7 +2533,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Costr. sede STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Vedi sede -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Costruisce la sede della compagnia / visualizza la sede della compagnia STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Sposta sede STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Ricostruisce la sede della compagnia in un altro luogo pagando l'1% del valore della compagnia diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index ed7a71d72..2a45da436 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -2450,7 +2450,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}（{1:CO STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}本部ビルを建設 STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}本部ビルを見る -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}本部ビルを建設／見る STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}本部ビルを移動 STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}会社の本部ビルを移動します（価格：会社の価値の１％） diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 3d02141c9..2665e754f 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -2519,7 +2519,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}본사(HQ) 건설 STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}본사 보기 -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}본사를 건설합니다 / 본사를 봅니다 STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}본사 재위치 STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}회사가치의 1% 가격으로 본사를 다른 위치에 재건축합니다. diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index d6509fb94..5ee945d91 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -2513,7 +2513,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Celt biroju STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Skatīt biroju -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Būvēt uzņēmuma biroju / skatīt uzņēmuma biroju STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Pārvietot biroju STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Pārcelt kompānijas centrālo biroju uz citu vietu samaksājot 1% no kompānijas vērtības diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 42ef56f57..afeacc3ea 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -2515,7 +2515,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Pastatyti firmos bustinę STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Apžiūrėti būstinę -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Statyti/apžiurėti kompanijos bustinę STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Perkelti bustinę STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Perstatyti kompanijos bustinę kitur už 1% kompanijos vertės diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 6063e0eae..0a921b024 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -2491,7 +2491,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Haaptgebai bauen STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Weist Haaptgebai -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Baut/Weist d'Firmenhaaptgebai STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Firmenhaaptgebai réckelen STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Bau d'Firmenhaaptgebai op eng aaner Palatz.{}Käschten: 1% vun dem Firmenwert diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index cb50c7e8a..e29a643ca 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -2516,7 +2516,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Bygg hovedkontor STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Se hovedkontor -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Bygg firmaets hovedkontor/se firmaets hovedkontor STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Omplasser hovedkvarter STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Gjenoppbygg spelskapets hovedkvarter en annen plass for 1{NBSP}% av selskapsverdien diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 425ef945f..6321834c0 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -2476,7 +2476,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Bygg hovudkontor STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Sjå hovudkontor -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Bygg firmaet sitt hovudkontor/sjå firmaet sitt hovudkontor STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Omplasser hovudkvarter STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Gjenoppbygg selskapets hovudkvarter ein annan stad for 1 % av verdien til firmaet diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 0f406e3ed..696eb62af 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2911,7 +2911,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Budowa Siedziby STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Zobacz SG -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Buduj siedzibę główną / zobacz siedzibę główną STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Przenieś SG STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Zbuduj siedzibę główna w innym miejscu za cenę 1% wartości firmy diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index a8673ffae..f631c47f3 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -2521,7 +2521,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Construir sede STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Ver sede -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Construir sede da empresa / ver sede da empresa STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Mover sede STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Reconstruir sede da empresa noutro sítio por 1% do valor da empresa diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index febb88a98..3ef548d53 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -2530,7 +2530,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Constr. sediu STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Vezi sediul -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Construieşte sau arată sediul companiei STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Mută sediu STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Mută sediul companiei (costa 1% din valoarea companiei) diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 370652514..c5cd1d2a0 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -2681,7 +2681,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Построить штаб STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Осмотреть штаб -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Построить/осмотреть штаб-квартиру компании STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Переместить STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Переместить штаб компании в другом месте за 1% оценочной стоимости капитала компании diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 5e6c4bc1e..3e51d3ab2 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -2716,7 +2716,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Izgradnja centrale preduzeća STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Prikaži centralu preduzeća -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Izgradnja i prikaz centrale preduzeća STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Preseli Sedište STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Premesti sedište preduzeća drugde za cenu od 1% vrednosti preduzeća diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 109d99452..90a9d80dd 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -2520,7 +2520,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}设立总部 STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}查看总部 -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}建设/查看公司总部 STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}重置总部 STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}以公司市值 1% 的代价重建总部 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index b3127ee66..d8dabc230 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -2587,7 +2587,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Postavit sidlo STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Pozriet sidlo -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Postavit sidlo spolocnosti / pozriet sidlo spolocnosti STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Premiestnit sidlo STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Sidlo spolocnosti je mozne premiestnit za 1% hodnoty spolocnosti diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 89a18f953..1e0f4252f 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -2536,7 +2536,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Zgradi sedež podjetja STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Poglej sedež podjetja -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Zgradi sedež podjetja / poglej sedež podjetja STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Preseli sedež STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Preseli sedež podjetja drugam za ceno 1% vrednosti podjetja diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 341ab4f53..02b9697cf 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -2532,7 +2532,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Construir Sede STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Ver Sede -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Construir sede de la empresa / ver sede de la empresa STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Reubicar Sede STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Reubica la sede de la empresa a cualquier otro lugar, con el coste del 1% del valor total de la empresa diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 45b426bf3..9f70ebb29 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -2530,7 +2530,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Bygg Högkvarter STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Visa högkvarter -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Bygg huvudkontor / visa företagets huvudkontor STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Flytta högkvarter STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Bygg om högkvarter på annan plats (kostar 1% av företagets värde) diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index a239d56e1..404351f31 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -2530,7 +2530,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}建造總部 STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}檢視總部 -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}建造／檢視公司總部 STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}搬移總部 STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}以公司總值的 1% 在其它地方建造新公司總部 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index a51c7b224..96c3636f9 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -2520,7 +2520,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}(%{COMMA STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Bina Yap STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Binaya Bak -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Şirket binasi yap / şirket binasina bak STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Binayı Taşı STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Şirket değerinin %1'i karşılığında binanın yerini değiştir diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index f60c6a2d9..c4cb043de 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -2655,7 +2655,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Будувати Офіс STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Показати Офіс -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Будувати Офіс/Показати Офіс STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Перенести Офіс STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Перенесення Офісу в інше місце. Коштує 1% від вартості компанії diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index b33cad109..45a02a7a1 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -1491,7 +1491,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Bou haadkantoar STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Sjoch haadkantoar -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Bou haadkantoar / sjoch haadkantoar STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nei Gesicht STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Selektear nei gesicht foar de bedriuwslieder diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index d751a27ae..63de9bc20 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -1201,7 +1201,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}ساخت ساختمان مرکزی STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}دیدن ساختمان مرکزی -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}ساخت / دیدن ساختمان مرکزی STR_COMPANY_VIEW_BUY_SHARE_BUTTON :{BLACK}25% سهام شرکت را بخر diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 6583098ca..036649044 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -2494,7 +2494,6 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA} STR_COMPANY_VIEW_BUILD_HQ_BUTTON :{BLACK}Adeiladu Pencadlys STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Gweld pencadlys cwmni -STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Adeiladu pencadlys cwmni STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Ail-leoli pencadlys cwmni STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Ailadeiladu pencadlys cwmni mewn man arall am 1% o werth y cwmni |