sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nav: same icon size for active & inactive lanes (#25383)

Browse Source 
* nav: same icon size for active & inactive lanes

* update translations
old-commit-hash: ac305dacef
taco
Adeeb Shihadeh 3 years ago committed by GitHub
parent 700d1362af
commit 62b8b25cdf
5 changed files with 21 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      selfdrive/ui/qt/maps/map.cc
  2. 10
      selfdrive/ui/translations/main_ja.ts
  3. 10
      selfdrive/ui/translations/main_ko.ts
  4. 10
      selfdrive/ui/translations/main_zh-CHS.ts
  5. 10
      selfdrive/ui/translations/main_zh-CHT.ts

3
selfdrive/ui/qt/maps/map.cc
Unescape View File

@ -531,8 +531,7 @@ void MapInstructions::updateInstructions(cereal::NavInstruction::Reader instruct
} }
auto icon = new QLabel; auto icon = new QLabel;
int wh = active ? 125 : 75; icon->setPixmap(loadPixmap(fn + ICON_SUFFIX, {125, 125}, Qt::IgnoreAspectRatio));
icon->setPixmap(loadPixmap(fn + ICON_SUFFIX, {wh, wh}, Qt::IgnoreAspectRatio));
icon->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); icon->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
lane_layout->addWidget(icon); lane_layout->addWidget(icon);
} }

10
selfdrive/ui/translations/main_ja.ts
Unescape View File

@ -340,27 +340,27 @@
<context> <context>
<name>MapETA</name> <name>MapETA</name>
<message> <message>
<location filename="../qt/maps/map.cc" line="622"/> <location filename="../qt/maps/map.cc" line="621"/>
<source>eta</source> <source>eta</source>
<translation>予定到着時間</translation> <translation>予定到着時間</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="632"/> <location filename="../qt/maps/map.cc" line="631"/>
<source>min</source> <source>min</source>
<translation>分</translation> <translation>分</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="636"/> <location filename="../qt/maps/map.cc" line="635"/>
<source>hr</source> <source>hr</source>
<translation>時間</translation> <translation>時間</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="656"/> <location filename="../qt/maps/map.cc" line="655"/>
<source>km</source> <source>km</source>
<translation>ｷﾛﾒｰﾄﾙ</translation> <translation>ｷﾛﾒｰﾄﾙ</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="659"/> <location filename="../qt/maps/map.cc" line="658"/>
<source>mi</source> <source>mi</source>
<translation>ﾏｲﾙ</translation> <translation>ﾏｲﾙ</translation>
</message> </message>

10
selfdrive/ui/translations/main_ko.ts
Unescape View File

@ -340,27 +340,27 @@
<context> <context>
<name>MapETA</name> <name>MapETA</name>
<message> <message>
<location filename="../qt/maps/map.cc" line="622"/> <location filename="../qt/maps/map.cc" line="621"/>
<source>eta</source> <source>eta</source>
<translation>도착</translation> <translation>도착</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="632"/> <location filename="../qt/maps/map.cc" line="631"/>
<source>min</source> <source>min</source>
<translation>분</translation> <translation>분</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="636"/> <location filename="../qt/maps/map.cc" line="635"/>
<source>hr</source> <source>hr</source>
<translation>시간</translation> <translation>시간</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="656"/> <location filename="../qt/maps/map.cc" line="655"/>
<source>km</source> <source>km</source>
<translation>km</translation> <translation>km</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="659"/> <location filename="../qt/maps/map.cc" line="658"/>
<source>mi</source> <source>mi</source>
<translation>mi</translation> <translation>mi</translation>
</message> </message>

10
selfdrive/ui/translations/main_zh-CHS.ts
Unescape View File

@ -340,27 +340,27 @@
<context> <context>
<name>MapETA</name> <name>MapETA</name>
<message> <message>
<location filename="../qt/maps/map.cc" line="622"/> <location filename="../qt/maps/map.cc" line="621"/>
<source>eta</source> <source>eta</source>
<translation>埃塔</translation> <translation>埃塔</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="632"/> <location filename="../qt/maps/map.cc" line="631"/>
<source>min</source> <source>min</source>
<translation>分钟</translation> <translation>分钟</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="636"/> <location filename="../qt/maps/map.cc" line="635"/>
<source>hr</source> <source>hr</source>
<translation>小时</translation> <translation>小时</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="656"/> <location filename="../qt/maps/map.cc" line="655"/>
<source>km</source> <source>km</source>
<translation>km</translation> <translation>km</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="659"/> <location filename="../qt/maps/map.cc" line="658"/>
<source>mi</source> <source>mi</source>
<translation>mi</translation> <translation>mi</translation>
</message> </message>

10
selfdrive/ui/translations/main_zh-CHT.ts
Unescape View File

@ -340,27 +340,27 @@
<context> <context>
<name>MapETA</name> <name>MapETA</name>
<message> <message>
<location filename="../qt/maps/map.cc" line="622"/> <location filename="../qt/maps/map.cc" line="621"/>
<source>eta</source> <source>eta</source>
<translation>抵達</translation> <translation>抵達</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="632"/> <location filename="../qt/maps/map.cc" line="631"/>
<source>min</source> <source>min</source>
<translation>分鐘</translation> <translation>分鐘</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="636"/> <location filename="../qt/maps/map.cc" line="635"/>
<source>hr</source> <source>hr</source>
<translation>小時</translation> <translation>小時</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="656"/> <location filename="../qt/maps/map.cc" line="655"/>
<source>km</source> <source>km</source>
<translation>km</translation> <translation>km</translation>
</message> </message>
<message> <message>
<location filename="../qt/maps/map.cc" line="659"/> <location filename="../qt/maps/map.cc" line="658"/>
<source>mi</source> <source>mi</source>
<translation>mi</translation> <translation>mi</translation>
</message> </message>

Write Preview
Loading…
Cancel
Save