Skip to content

Commit

Permalink
Import give money to company patch
Browse files Browse the repository at this point in the history 
From: https://www.tt-forums.net/viewtopic.php?p=1183311#p1183311

Fix language files and minor formatting issues
  • Loading branch information
@JGRennison
patch-import authored and JGRennison committed Mar 2, 2017
1 parent 04040a6 commit f820543
Show file tree
Hide file tree
Showing 62 changed files with 162 additions and 169 deletions.
51 changes: 40 additions & 11 deletions src/company_gui.cpp
View file
Expand Up @@ -10,6 +10,7 @@
/** @file company_gui.cpp %Company related GUIs. */

#include "stdafx.h"
#include "currency.h"
#include "error.h"
#include "gui.h"
#include "window_gui.h"
Expand Down Expand Up @@ -1943,14 +1944,27 @@ static const NWidgetPart _nested_company_widgets[] = {
NWidget(NWID_SPACER), SetFill(0, 1),
EndContainer(),
EndContainer(),
NWidget(NWID_SPACER), SetFill(1, 0),
NWidget(NWID_SELECTION, INVALID_COLOUR, WID_C_SELECT_GIVE_MONEY),
NWidget(NWID_VERTICAL),
NWidget(NWID_SPACER), SetFill(0, 1), SetMinimalSize(90, 0),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_GIVE_MONEY), SetDataTip(STR_COMPANY_VIEW_GIVE_MONEY_BUTTON, STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP),
EndContainer(),
EndContainer(),
EndContainer(),
/* Multi player buttons. */
NWidget(NWID_HORIZONTAL),
NWidget(NWID_SPACER), SetFill(1, 0),
NWidget(NWID_VERTICAL), SetPIP(4, 2, 4),
NWidget(NWID_SPACER), SetMinimalSize(90, 0), SetFill(0, 1),
/* Multi player buttons. */
NWidget(NWID_HORIZONTAL),
NWidget(NWID_SPACER), SetMinimalSize(95, 0), SetFill(0, 1),
NWidget(NWID_HORIZONTAL), SetPIP(0, 5, 0),
NWidget(WWT_EMPTY, COLOUR_GREY, WID_C_HAS_PASSWORD),
NWidget(NWID_SELECTION, INVALID_COLOUR, WID_C_SELECT_MULTIPLAYER),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_PASSWORD), SetFill(1, 0), SetDataTip(STR_COMPANY_VIEW_PASSWORD, STR_COMPANY_VIEW_PASSWORD_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_JOIN), SetFill(1, 0), SetDataTip(STR_COMPANY_VIEW_JOIN, STR_COMPANY_VIEW_JOIN_TOOLTIP),
NWidget(NWID_VERTICAL),
NWidget(NWID_SPACER), SetMinimalSize(90, 0), SetFill(0, 1),
NWidget(NWID_SELECTION, INVALID_COLOUR, WID_C_SELECT_MULTIPLAYER),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_PASSWORD), SetFill(1, 0), SetDataTip(STR_COMPANY_VIEW_PASSWORD, STR_COMPANY_VIEW_PASSWORD_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_JOIN), SetFill(1, 0), SetDataTip(STR_COMPANY_VIEW_JOIN, STR_COMPANY_VIEW_JOIN_TOOLTIP),
EndContainer(),
EndContainer(),
EndContainer(),
EndContainer(),
Expand Down Expand Up @@ -2033,16 +2047,15 @@ struct CompanyWindow : Window
if (plane != wi->shown_plane) {
wi->SetDisplayedPlane(plane);
this->InvalidateData();
return;
reinit = true;
}

/* Build HQ button handling. */
plane = (local && c->location_of_HQ == INVALID_TILE) ? CWP_VB_BUILD : CWP_VB_VIEW;
wi = this->GetWidget<NWidgetStacked>(WID_C_SELECT_VIEW_BUILD_HQ);
if (plane != wi->shown_plane) {
wi->SetDisplayedPlane(plane);
this->SetDirty();
return;
reinit = true;
}

this->SetWidgetDisabledState(WID_C_VIEW_HQ, c->location_of_HQ == INVALID_TILE);
Expand All @@ -2052,8 +2065,7 @@ struct CompanyWindow : Window
wi = this->GetWidget<NWidgetStacked>(WID_C_SELECT_RELOCATE);
if (plane != wi->shown_plane) {
wi->SetDisplayedPlane(plane);
this->SetDirty();
return;
reinit = true;
}

/* Owners of company */
Expand All @@ -2070,6 +2082,14 @@ struct CompanyWindow : Window
reinit = true;
}

/* Enable/disable 'Give money' button. */
plane = ((local || (_local_company == COMPANY_SPECTATOR)) ? SZSP_NONE : 0);
wi = this->GetWidget<NWidgetStacked>(WID_C_SELECT_GIVE_MONEY);
if (plane != wi->shown_plane) {
wi->SetDisplayedPlane(plane);
reinit = true;
}

/* Multiplayer buttons. */
plane = ((!_networking) ? (int)SZSP_NONE : (int)(local ? CWP_MP_C_PWD : CWP_MP_C_JOIN));
wi = this->GetWidget<NWidgetStacked>(WID_C_SELECT_MULTIPLAYER);
Expand Down Expand Up @@ -2341,6 +2361,11 @@ struct CompanyWindow : Window
ShowCompanyInfrastructure((CompanyID)this->window_number);
break;

case WID_C_GIVE_MONEY:
this->query_widget = WID_C_GIVE_MONEY;
ShowQueryString(STR_EMPTY, STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION, 30, this, CS_NUMERAL, QSF_NONE);
break;

case WID_C_BUY_SHARE:
DoCommandP(0, this->window_number, 0, CMD_BUY_SHARE_IN_COMPANY | CMD_MSG(STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS));
break;
Expand Down Expand Up @@ -2399,6 +2424,10 @@ struct CompanyWindow : Window
switch (this->query_widget) {
default: NOT_REACHED();

case WID_C_GIVE_MONEY:
DoCommandP(0, (atoi(str) / _currency->rate), this->window_number, CMD_GIVE_MONEY | CMD_MSG(STR_ERROR_INSUFFICIENT_FUNDS), CcGiveMoney, str);
break;

case WID_C_PRESIDENT_NAME:
DoCommandP(0, 0, 0, CMD_RENAME_PRESIDENT | CMD_MSG(STR_ERROR_CAN_T_CHANGE_PRESIDENT), NULL, str);
break;
Expand Down
4 changes: 2 additions & 2 deletions src/lang/afrikaans.txt
View file
Expand Up @@ -2076,7 +2076,6 @@ STR_NETWORK_COMPANY_LIST_NEW_COMPANY :{WHITE}Nuwe maa
# Network client list
STR_NETWORK_CLIENTLIST_KICK :Skop
STR_NETWORK_CLIENTLIST_BAN :Verbod
STR_NETWORK_CLIENTLIST_GIVE_MONEY :Gee geld
STR_NETWORK_CLIENTLIST_SPEAK_TO_ALL :Praat met almal
STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY :Praat met maatskappy
STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT :Privaate boodskap
Expand All @@ -2085,7 +2084,6 @@ STR_NETWORK_SERVER :Verskaffer
STR_NETWORK_CLIENT :Klient
STR_NETWORK_SPECTATORS :Aanskouers

STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Sleutel die bedrag geld in wat u wil gee
STR_NETWORK_TOOLBAR_LIST_SPECTATOR :{BLACK}Toeskouer

# Network set password
Expand Down Expand Up @@ -3237,6 +3235,7 @@ STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Beweeg H
STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Bou hoofkwartier elders teen 'n koste gelykstaande aan 1% van maatskappy se waarde. Shift+klik vir kwotasie
STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Besonderhede
STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Sien gedetaileerde infrastruktuur telling
STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Gee geld

STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nuwe Gesig
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Kies nuwe gesig vir bestuurder
Expand All @@ -3254,6 +3253,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Verkoop

STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Maatskappy Naam
STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Bestuurder se Naam
STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Sleutel die bedrag geld in wat u wil gee

STR_BUY_COMPANY_MESSAGE :{WHITE}Ons is opsoek na 'n vervoer maatskappy wat ons se maatskappy sal oorvat.{}{}Wil jy {COMPANY} koop vir {CURRENCY_LONG}?

Expand Down
4 changes: 2 additions & 2 deletions src/lang/arabic_egypt.txt
View file
Expand Up @@ -1738,7 +1738,6 @@ STR_NETWORK_COMPANY_LIST_NEW_COMPANY :{WHITE}شركة
# Network client list
STR_NETWORK_CLIENTLIST_KICK :اطرد
STR_NETWORK_CLIENTLIST_BAN :بان
STR_NETWORK_CLIENTLIST_GIVE_MONEY :اعط اموال
STR_NETWORK_CLIENTLIST_SPEAK_TO_ALL :تحدث مع الكل
STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY :تحدث لشركة
STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT :رسالة خاصة
Expand All @@ -1747,7 +1746,6 @@ STR_NETWORK_SERVER :خادم
STR_NETWORK_CLIENT :عميل
STR_NETWORK_SPECTATORS :المشاهدين

STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}ادخل رقم المبلغ الذى تود إعطائه

# Network set password
STR_COMPANY_PASSWORD_CANCEL :{BLACK}لا تحفظ كلمة المرور المدخلة
Expand Down Expand Up @@ -2775,6 +2773,7 @@ STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}عرض
STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP :{BLACK}اعرض مقر الشركة
STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}اعادة بناء مقر الشركة
STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}اعادة بناء مقر الشركة بمكان آخر و بتكلفة 1% من قيمة الشركة.
STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}اعط اموال

STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}وجة جديد
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}اختر وجة جديد للمدير
Expand All @@ -2792,6 +2791,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}بيع 2

STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :اسم الشركة
STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :اسم صاحب الشركة
STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :ادخل رقم المبلغ الذى تود إعطائه

STR_BUY_COMPANY_MESSAGE :{WHITE}نحن نبحث عن شركة لتشتري شركتنا.{}{} عل ترغب في شراء {COMPANY} بـ {CURRENCY_LONG}؟

Expand Down
4 changes: 2 additions & 2 deletions src/lang/basque.txt
View file
Expand Up @@ -1984,7 +1984,6 @@ STR_NETWORK_COMPANY_LIST_NEW_COMPANY :{WHITE}Konpaini
# Network client list
STR_NETWORK_CLIENTLIST_KICK :Kanporatu
STR_NETWORK_CLIENTLIST_BAN :Debekatu
STR_NETWORK_CLIENTLIST_GIVE_MONEY :Dirua eman
STR_NETWORK_CLIENTLIST_SPEAK_TO_ALL :Guztiei hitz egin
STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY :Konpainiari hitz egin
STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT :Mezu pribatua
Expand All @@ -1993,7 +1992,6 @@ STR_NETWORK_SERVER :Zerbitzaria
STR_NETWORK_CLIENT :Bezeroa
STR_NETWORK_SPECTATORS :Ikusleak

STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Eman nahi duzun diru kantitatea ezarri
STR_NETWORK_TOOLBAR_LIST_SPECTATOR :{BLACK}Ikusle

# Network set password
Expand Down Expand Up @@ -3122,6 +3120,7 @@ STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Konpaini
STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Konpainiaren egoitza birkokatu, konpainiaren balioaren %1 gatik. Shift+klik gutxi gora beherako kostea erakutsi
STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Xehetasunak
STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Azpiegitura kantitateak xehetasunez ikusi
STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Dirua eman

STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Aurpegi berria
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Lehendakariaren aurpegi berria aukeratu
Expand All @@ -3139,6 +3138,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Konpaini

STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Konpainiaren izena
STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Lehendakariaren izena
STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Eman nahi duzun diru kantitatea ezarri

STR_BUY_COMPANY_MESSAGE :{WHITE}Gure konpainia erostea nahiko genuke{}{}{COMPANY} {CURRENCY_LONG}rengatik erosi nahi duzu?

Expand Down
4 changes: 2 additions & 2 deletions src/lang/belarusian.txt
View file
Expand Up @@ -2388,7 +2388,6 @@ STR_NETWORK_COMPANY_LIST_NEW_COMPANY :{WHITE}Нова
# Network client list
STR_NETWORK_CLIENTLIST_KICK :Выкінуць гульца
STR_NETWORK_CLIENTLIST_BAN :Бан
STR_NETWORK_CLIENTLIST_GIVE_MONEY :Передаць грошай
STR_NETWORK_CLIENTLIST_SPEAK_TO_ALL :Пагутарыць з усімі
STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY :Пагутарыць з кампаніяй
STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT :Прыватнае паведамленьне
Expand All @@ -2397,7 +2396,6 @@ STR_NETWORK_SERVER :Сэрвэр
STR_NETWORK_CLIENT :Кліент
STR_NETWORK_SPECTATORS :Назіральнікі

STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Увядзіце суму грошай, якую вы хочаце перадаць
STR_NETWORK_TOOLBAR_LIST_SPECTATOR :{BLACK}Назіральнік

# Network set password
Expand Down Expand Up @@ -3569,6 +3567,7 @@ STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Пера
STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Перамясьціць штаб-кватэру кампаніі ў іншае месца за 1% ацэнкавага кошту капіталу кампаніі. Shift+пстрычка — ацэнка кошту пераносу.
STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Дэталi
STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Паказаць дэталёвыя iнфраструктурныя падлiкi
STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Передаць грошай

STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Зьнешнасьць
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Зьмяніць зьнешнасьць дырэктара
Expand All @@ -3586,6 +3585,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Прад

STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Кампанія
STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Імя дырэктара
STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Увядзіце суму грошай, якую вы хочаце перадаць

STR_BUY_COMPANY_MESSAGE :{WHITE}Мы шукаем транспартную кампанію для далучэньня да яе.{}{}Вы хочаце купіць {COMPANY} за {CURRENCY_LONG}?

Expand Down
4 changes: 2 additions & 2 deletions src/lang/brazilian_portuguese.txt
View file
Expand Up @@ -2076,7 +2076,6 @@ STR_NETWORK_COMPANY_LIST_NEW_COMPANY :{WHITE}Nova Com
# Network client list
STR_NETWORK_CLIENTLIST_KICK :Banir
STR_NETWORK_CLIENTLIST_BAN :Banir
STR_NETWORK_CLIENTLIST_GIVE_MONEY :Dar dinheiro
STR_NETWORK_CLIENTLIST_SPEAK_TO_ALL :Falar com todos
STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY :Falar com a empresa
STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT :Mensagem privada
Expand All @@ -2085,7 +2084,6 @@ STR_NETWORK_SERVER :Servidor
STR_NETWORK_CLIENT :Cliente
STR_NETWORK_SPECTATORS :Espectadores

STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Entre a quantia a ser dada
STR_NETWORK_TOOLBAR_LIST_SPECTATOR :{BLACK}Espectador

# Network set password
Expand Down Expand Up @@ -3237,6 +3235,7 @@ STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Mover se
STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Reconstruir sede da empresa em outro local por 1% do valor da empresa. Shift+Clique mostra o preço estimado sem reconstruir a sede
STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Detalhes
STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Ver informações detalhadas de infraestrutura
STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Dar dinheiro

STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Novo Rosto
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Selecionar novo rosto para o presidente
Expand All @@ -3254,6 +3253,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Vender 2

STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Nome da Empresa
STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Nome do Presidente
STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Entre a quantia a ser dada

STR_BUY_COMPANY_MESSAGE :{WHITE}Estamos à procura de uma empresa de transportes para comprar a nossa empresa{}{}Deseja comprar {COMPANY} por {CURRENCY_LONG}?

Expand Down
4 changes: 2 additions & 2 deletions src/lang/bulgarian.txt
View file
Expand Up @@ -2017,7 +2017,6 @@ STR_NETWORK_COMPANY_LIST_NEW_COMPANY :{WHITE}Нова
# Network client list
STR_NETWORK_CLIENTLIST_KICK :Изгони
STR_NETWORK_CLIENTLIST_BAN :Бан
STR_NETWORK_CLIENTLIST_GIVE_MONEY :Дай пари
STR_NETWORK_CLIENTLIST_SPEAK_TO_ALL :Кажи на всички
STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY :Кажи на компания
STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT :Лично съобщение
Expand All @@ -2026,7 +2025,6 @@ STR_NETWORK_SERVER :Сървър
STR_NETWORK_CLIENT :Клиент
STR_NETWORK_SPECTATORS :Наблюдатели

STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Въведете количеството пари, което искате да дадете
STR_NETWORK_TOOLBAR_LIST_SPECTATOR :{BLACK}Зрител

# Network set password
Expand Down Expand Up @@ -3158,6 +3156,7 @@ STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Прем
STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Преместване централата на компанията другаде за 1% от стойноста на компанията. Shift показва цена за преместване
STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Детайли
STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Детайлна бройка на инфраструктурите
STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Дай пари

STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Ново лице
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Избери друго лице за управителя
Expand All @@ -3175,6 +3174,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Прод

STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Име на компанията
STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Име на управителя
STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Въведете количеството пари, което искате да дадете

STR_BUY_COMPANY_MESSAGE :{WHITE}Ние търсим транспортна компания, която да поеме нашата компания.{}{}Do you want to purchase {COMPANY} for {CURRENCY_LONG}?

Expand Down

0 comments on commit f820543

Please sign in to comment.