dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show plans in GUI using plan colour, use prefix for private plans

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-11-06 22:38:34 +00:00
parent 0902243ab3
commit d50f3cd580
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/lang/english.txt
View File

@@ -5223,11 +5223,12 @@ STR_PLANS_SHOW_ALL :{BLACK}Show all
STR_PLANS_SHOW_ALL_TOOLTIP :{BLACK}Set the visibility of all the plans and all their lines to true STR_PLANS_SHOW_ALL_TOOLTIP :{BLACK}Set the visibility of all the plans and all their lines to true
STR_PLANS_VISIBILITY_PRIVATE :{BLACK}Make private STR_PLANS_VISIBILITY_PRIVATE :{BLACK}Make private
STR_PLANS_VISIBILITY_PUBLIC :{BLACK}Make public STR_PLANS_VISIBILITY_PUBLIC :{BLACK}Make public
STR_PLANS_VISIBILITY_TOOLTIP :{BLACK}Toggle the visibility of a plan (private is yellow, public is blue). A public plan will be displayed in the plan window of the other companies but only its owner can add lines to it. STR_PLANS_VISIBILITY_TOOLTIP :{BLACK}Toggle the visibility of a plan. A public plan will be displayed in the plan window of the other companies but only its owner can add lines to it.
STR_PLANS_COLOUR :{BLACK}Colour STR_PLANS_COLOUR :{BLACK}Colour
STR_PLANS_COLOUR_TOOLTIP :{BLACK}Set the colour of a plan. STR_PLANS_COLOUR_TOOLTIP :{BLACK}Set the colour of a plan.
STR_PLANS_DELETE :{BLACK}Delete STR_PLANS_DELETE :{BLACK}Delete
STR_PLANS_DELETE_TOOLTIP :{BLACK}Delete the selected item in the list STR_PLANS_DELETE_TOOLTIP :{BLACK}Delete the selected item in the list
STR_PLANS_LIST_ITEM_PLAN_PRIVATE :[Private]: {STRING3}
STR_PLANS_LIST_ITEM_PLAN :Plan #{NUM}: {NUM} line{P "" s} ({DATE_SHORT}) STR_PLANS_LIST_ITEM_PLAN :Plan #{NUM}: {NUM} line{P "" s} ({DATE_SHORT})
STR_PLANS_LIST_ITEM_NAMED_PLAN :{RAW_STRING}: {NUM} line{P "" s} ({DATE_SHORT}) STR_PLANS_LIST_ITEM_NAMED_PLAN :{RAW_STRING}: {NUM} line{P "" s} ({DATE_SHORT})
STR_PLANS_LIST_ITEM_LINE : -- Line #{NUM}: {NUM} segment{P "" s} STR_PLANS_LIST_ITEM_LINE : -- Line #{NUM}: {NUM} segment{P "" s}

2
src/lang/german.txt
View File

@@ -4862,7 +4862,7 @@ STR_PLANS_SHOW_ALL :{BLACK}Alle zei
STR_PLANS_SHOW_ALL_TOOLTIP :{BLACK}Setze die Sichtbarkeit aller Pläne und all ihrer Strecken auf wahr STR_PLANS_SHOW_ALL_TOOLTIP :{BLACK}Setze die Sichtbarkeit aller Pläne und all ihrer Strecken auf wahr
STR_PLANS_VISIBILITY_PRIVATE :{BLACK}Privat STR_PLANS_VISIBILITY_PRIVATE :{BLACK}Privat
STR_PLANS_VISIBILITY_PUBLIC :{BLACK}Öffentlich STR_PLANS_VISIBILITY_PUBLIC :{BLACK}Öffentlich
STR_PLANS_VISIBILITY_TOOLTIP :{BLACK}Stellt die Sichtbarkeit für Mitbewerber ein (gelb ist privat, blau ist öffentlich). Öffentliche Pläne werden in der Planliste von anderen Firmen angezeigt, aber nur deren Besitzer kann diesem Strecken hinzufügen oder entfernen. STR_PLANS_VISIBILITY_TOOLTIP :{BLACK}Stellt die Sichtbarkeit für Mitbewerber ein. Öffentliche Pläne werden in der Planliste von anderen Firmen angezeigt, aber nur deren Besitzer kann diesem Strecken hinzufügen oder entfernen.
STR_PLANS_DELETE :{BLACK}Entfernen STR_PLANS_DELETE :{BLACK}Entfernen
STR_PLANS_DELETE_TOOLTIP :{BLACK}Entferne den ausgewählten Eintrag aus der Liste STR_PLANS_DELETE_TOOLTIP :{BLACK}Entferne den ausgewählten Eintrag aus der Liste
STR_PLANS_LIST_ITEM_PLAN :Plan #{NUM}: {NUM} Strecke{P 0 "" n} ({DATE_SHORT}) STR_PLANS_LIST_ITEM_PLAN :Plan #{NUM}: {NUM} Strecke{P 0 "" n} ({DATE_SHORT})

2
src/lang/japanese.txt
View File

@@ -4115,7 +4115,7 @@ STR_PLANS_SHOW_ALL :{BLACK}全て
STR_PLANS_SHOW_ALL_TOOLTIP :{BLACK}全ての計画を画面に表示します。 STR_PLANS_SHOW_ALL_TOOLTIP :{BLACK}全ての計画を画面に表示します。
STR_PLANS_VISIBILITY_PRIVATE :{BLACK}秘匿にする STR_PLANS_VISIBILITY_PRIVATE :{BLACK}秘匿にする
STR_PLANS_VISIBILITY_PUBLIC :{BLACK}公表にする STR_PLANS_VISIBILITY_PUBLIC :{BLACK}公表にする
STR_PLANS_VISIBILITY_TOOLTIP :{BLACK}計画を秘匿にするか公表にするかを設定します。 (秘匿した計画が黄色で表示、公表した計画が青色で表示) 公表した計画は他の会社にも表示されていますが、他の会社は編集できません。 STR_PLANS_VISIBILITY_TOOLTIP :{BLACK}計画を秘匿にするか公表にするかを設定します。 公表した計画は他の会社にも表示されていますが、他の会社は編集できません。
STR_PLANS_DELETE :{BLACK}削除 STR_PLANS_DELETE :{BLACK}削除
STR_PLANS_DELETE_TOOLTIP :{BLACK}計画を削除します STR_PLANS_DELETE_TOOLTIP :{BLACK}計画を削除します
STR_PLANS_LIST_ITEM_PLAN :第{NUM}計画: {NUM} 線 ({DATE_SHORT}) STR_PLANS_LIST_ITEM_PLAN :第{NUM}計画: {NUM} 線 ({DATE_SHORT})

2
src/lang/korean.txt
View File

@@ -5218,7 +5218,7 @@ STR_PLANS_SHOW_ALL :{BLACK}모두
STR_PLANS_SHOW_ALL_TOOLTIP :{BLACK}모든 계획을 보이게 합니다. STR_PLANS_SHOW_ALL_TOOLTIP :{BLACK}모든 계획을 보이게 합니다.
STR_PLANS_VISIBILITY_PRIVATE :{BLACK}개인적으로 STR_PLANS_VISIBILITY_PRIVATE :{BLACK}개인적으로
STR_PLANS_VISIBILITY_PUBLIC :{BLACK}공용으로 STR_PLANS_VISIBILITY_PUBLIC :{BLACK}공용으로
STR_PLANS_VISIBILITY_TOOLTIP :{BLACK}계획의 보기 권한을 수정합니다. (개인적은 노랑, 공용은 파랑). 공용 계획은 타사가 계획 창에서 계획을 열람하거나 선을 추가할 수 있습니다. STR_PLANS_VISIBILITY_TOOLTIP :{BLACK}계획의 보기 권한을 수정합니다. 공용 계획은 타사가 계획 창에서 계획을 열람하거나 선을 추가할 수 있습니다.
STR_PLANS_DELETE :{BLACK}삭제 STR_PLANS_DELETE :{BLACK}삭제
STR_PLANS_DELETE_TOOLTIP :{BLACK}목록에서 선택된 계획을 삭제합니다. STR_PLANS_DELETE_TOOLTIP :{BLACK}목록에서 선택된 계획을 삭제합니다.
STR_PLANS_LIST_ITEM_PLAN :계획 #{NUM}: 선 {NUM}개 ({DATE_SHORT}) STR_PLANS_LIST_ITEM_PLAN :계획 #{NUM}: 선 {NUM}개 ({DATE_SHORT})

20
src/plans_gui.cpp
View File

@@ -283,14 +283,20 @@ struct PlansWindow : Window {
if (list[i].is_plan) { if (list[i].is_plan) {
DrawCompanyIcon(p->owner, icon_left, y + (this->resize.step_height - this->company_icon_spr_dim.height) / 2); DrawCompanyIcon(p->owner, icon_left, y + (this->resize.step_height - this->company_icon_spr_dim.height) / 2);
DrawBoolButton(btn_left, y + (this->resize.step_height - SETTING_BUTTON_HEIGHT) / 2, p->visible, true); DrawBoolButton(btn_left, y + (this->resize.step_height - SETTING_BUTTON_HEIGHT) / 2, p->visible, true);
if (p->HasName()) { uint dparam_offset = 0;
SetDParamStr(0, p->GetName().c_str()); StringID str = p->HasName() ? STR_PLANS_LIST_ITEM_NAMED_PLAN : STR_PLANS_LIST_ITEM_PLAN;
} else { if (!p->visible_by_all) {
SetDParam(0, list[i].plan_id + 1); SetDParam(dparam_offset++, str);
str = STR_PLANS_LIST_ITEM_PLAN_PRIVATE;
} }
SetDParam(1, p->lines.size()); if (p->HasName()) {
SetDParam(2, p->creation_date); SetDParamStr(dparam_offset++, p->GetName().c_str());
DrawString(text_left, text_right, y + (this->resize.step_height - FONT_HEIGHT_NORMAL) / 2, p->HasName() ? STR_PLANS_LIST_ITEM_NAMED_PLAN : STR_PLANS_LIST_ITEM_PLAN, p->visible_by_all ? TC_LIGHT_BLUE : TC_YELLOW); } else {
SetDParam(dparam_offset++, list[i].plan_id + 1);
}
SetDParam(dparam_offset++, p->lines.size());
SetDParam(dparam_offset++, p->creation_date);
DrawString(text_left, text_right, y + (this->resize.step_height - FONT_HEIGHT_NORMAL) / 2, str, TC_IS_PALETTE_COLOUR | (TextColour)_colour_value[p->colour]);
} else { } else {
PlanLine *pl = p->lines[list[i].line_id]; PlanLine *pl = p->lines[list[i].line_id];
DrawBoolButton(btn_left, y + (this->resize.step_height - SETTING_BUTTON_HEIGHT) / 2, pl->visible, true); DrawBoolButton(btn_left, y + (this->resize.step_height - SETTING_BUTTON_HEIGHT) / 2, pl->visible, true);