FIRE-9008: Fix inbox tab in inventory in Vintage skin (and get rid of orphaned Marketplace outbox stuff)

meow-7.2.2
Ansariel 2018-06-19 18:36:28 +02:00
parent 60277c7dc7
commit ee82dc3ac9
6 changed files with 137 additions and 394 deletions

View File

@ -3,47 +3,22 @@
<panel name="sidepanel_inventory_panel">
<tab_container name="inventory_tab_container">
<panel label="Inventar" name="panel_main_inventory"/>
<panel label="Marktplatz" name="inbox_outbox_layout_panel">
<layout_stack name="inbox_outbox_layout_stack_off">
<layout_panel name="inbox_layout_panel_off">
<panel name="marketplace_inbox">
<string name="InboxLabelWithArg">
Erhaltene Artikel ([NUM])
</string>
<string name="InboxLabelNoArg">
Erhaltene Artikel
</string>
<text value="Erhaltene Artikel" name="inbox_label"/>
<text name="inbox_fresh_new_count">
[NUM] Neu
</text>
<panel name="inbox_inventory_placeholder_panel" tool_tip="Artikel zur Verwendung in Ihr Inventar ziehen">
<text name="inbox_inventory_placeholder">
Einkäufe auf dem Marktplatz werden hierher geliefert.
</text>
</panel>
</panel>
</layout_panel>
<layout_panel name="outbox_layout_panel">
<panel name="marketplace_outbox">
<string name="OutboxLabelWithArg">
Händler-Outbox ([NUM])
</string>
<string name="OutboxLabelNoArg">
Händler-Outbox
</string>
<text value="Händler-Outbox" name="outbox_label"/>
<button tool_tip="In Marktplatz verschieben" name="outbox_sync_btn"/>
<panel name="outbox_inventory_placeholder_upperpanel">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
Wird geladen...
</text>
</panel>
</panel>
</panel>
</layout_panel>
</layout_stack>
<panel label="Marktplatz" name="marketplace_inbox">
<string name="InboxLabelWithArg">
Erhaltene Artikel ([NUM])
</string>
<string name="InboxLabelNoArg">
Erhaltene Artikel
</string>
<text value="Erhaltene Artikel" name="inbox_label"/>
<text name="inbox_fresh_new_count">
[NUM] Neu
</text>
<panel name="inbox_inventory_placeholder_panel" tool_tip="Artikel zur Verwendung in Ihr Inventar ziehen">
<text name="inbox_inventory_placeholder">
Einkäufe auf dem Marktplatz werden hierher geliefert.
</text>
</panel>
</panel>
</tab_container>
</panel>

View File

@ -34,206 +34,69 @@
layout="topleft"
name="panel_main_inventory" />
<panel
label="Marketplace"
follows="all"
layout="topleft"
follows="bottom|left|right"
name="inbox_outbox_layout_panel"
visible="true">
<layout_stack
follows="all"
label="Marketplace"
name="marketplace_inbox"
class="panel_marketplace_inbox"
top="0"
height="550">
<string name="InboxLabelWithArg">Received Items ([NUM])</string>
<string name="InboxLabelNoArg">Received Items</string>
<text
layout="topleft"
left="0"
value="Received Items"
name="inbox_label"
height="16"
width="200"
follows="top|left|right"
h_pad="3"
top="0"
orientation="vertical"
name="inbox_outbox_layout_stack_off"
bottom="-1"
right="-1">
<layout_panel
layout="topleft"
auto_resize="true"
user_resize="false"
follows="left|right|top"
name="inbox_layout_panel_off"
visible="true">
<panel
follows="all"
layout="topleft"
name="marketplace_inbox"
class="panel_marketplace_inbox"
label="">
<string name="InboxLabelWithArg">Received Items ([NUM])</string>
<string name="InboxLabelNoArg">Received Items</string>
<text
layout="topleft"
value="Received Items"
name="inbox_label"
height="16"
width="200"
follows="top|left|right"
h_pad="3"
top="0"
left="2" />
<!-- gets auto-hidden in preview editor, change name to view -->
<text
type="string"
length="1"
follows="right|top"
layout="topleft"
height="16"
top_delta="0"
right="-3"
name="inbox_fresh_new_count"
halign="right"
width="300">
[NUM] New
</text>
<view_border
layout="topleft"
follows="all"
bevel_style="in"
left="3"
height="50"
right="-3"
top_pad="2" />
<panel
name="inbox_inventory_placeholder_panel"
follows="all"
left_delta="0"
height="50"
right="-3"
top_delta="1"
tool_tip="Drag and drop items to your inventory to manage and use them">
<text
name="inbox_inventory_placeholder"
type="string"
follows="all"
left="0"
bottom="-1"
right="-1"
top="0"
layout="topleft"
wrap="true"
halign="center">
Purchases from the marketplace will be delivered here.
</text>
</panel>
</panel>
</layout_panel>
<layout_panel
layout="topleft"
auto_resize="true"
user_resize="false"
left="2" />
<!-- gets auto-hidden in preview editor, change name to view -->
<text
type="string"
length="1"
follows="right|top"
layout="topleft"
height="16"
top_delta="0"
right="-3"
name="inbox_fresh_new_count"
halign="right"
width="300">
[NUM] New
</text>
<view_border
layout="topleft"
follows="all"
bevel_style="in"
left="3"
height="529"
right="-3"
top_pad="2" />
<panel
name="inbox_inventory_placeholder_panel"
follows="all"
left_delta="0"
height="529"
right="-3"
top_delta="1"
tool_tip="Drag and drop items to your inventory to manage and use them">
<text
name="inbox_inventory_placeholder"
type="string"
follows="all"
name="outbox_layout_panel"
visible="false">
<panel
follows="all"
layout="topleft"
left="0"
name="marketplace_outbox"
class="panel_marketplace_outbox"
top="0"
label=""
height="200"
width="330">
<string name="OutboxLabelWithArg">Merchant Outbox ([NUM])</string>
<string name="OutboxLabelNoArg">Merchant Outbox</string>
<text
value="Merchant Outbox"
name="outbox_label"
height="16"
width="200"
follows="top|left|right"
h_pad="3"
top="5"
left="2" />
<button
image_unselected="OutboxPush_Off"
image_selected="OutboxPush_Selected"
image_hover_selected="OutboxPush_Selected_Over"
image_hover_unselected="OutboxPush_Over"
image_disabled_selected="OutboxPush_Selected_Disabled"
image_disabled="OutboxPush_Disabled"
image_pressed="OutboxPush_Press"
image_pressed_selected="OutboxPush_Selected_Press"
label=""
tool_tip="Push to my Marketplace Storefront"
is_toggle="false"
name="outbox_sync_btn"
follows="top|right"
tab_stop="false"
top="0"
right="-6"
height="23"
width="32"
enabled="false" />
<loading_indicator
follows="top|right"
name="outbox_sync_indicator"
top_delta="0"
left_delta="0"
height="23"
width="32"
images_per_sec="1.15"
tab_stop="false"
visible="false">
<images>
<image name="OutboxPush_Progress_1"/>
<image name="OutboxPush_Progress_2"/>
<image name="OutboxPush_Progress_3"/>
<image name="OutboxPush_Progress_4"/>
<image name="OutboxPush_Progress_5"/>
<image name="OutboxPush_Progress_6"/>
</images>
</loading_indicator>
<view_border
layout="topleft"
follows="all"
bevel_style="in"
left="3"
height="50"
right="-3"
top_pad="2" />
<panel
name="outbox_inventory_placeholder_upperpanel"
follows="all"
left_delta="0"
height="50"
right="-3"
top_delta="1">
<panel
name="outbox_inventory_placeholder_panel"
follows="all"
left="0"
bottom="-1"
right="-1"
top="0"
layout="topleft"
bg_opaque_color="InventoryBackgroundColor"
background_visible="true"
background_opaque="true">
<text
name="outbox_inventory_placeholder_title"
type="string"
follows="all"
layout="topleft"
wrap="true"
halign="center">
Loading...
</text>
<text
name="outbox_inventory_placeholder_text"
type="string"
follows="all"
layout="topleft"
wrap="true"
halign="left" />
</panel>
</panel>
</panel>
</layout_panel>
</layout_stack>
left="0"
bottom="-1"
right="-1"
top="0"
layout="topleft"
wrap="true"
halign="center">
Purchases from the marketplace will be delivered here.
</text>
</panel>
</panel>
</tab_container>
</panel>

View File

@ -3,43 +3,18 @@
<panel name="sidepanel_inventory_panel">
<tab_container name="inventory_tab_container">
<panel label="Inventario" name="panel_main_inventory"/>
<panel label="Marketplace" name="inbox_outbox_layout_panel">
<layout_stack name="inbox_outbox_layout_stack_off">
<layout_panel name="inbox_layout_panel_off">
<panel name="marketplace_inbox">
<string name="InboxLabelWithArg">Items recibidos ([NUM])</string>
<string name="InboxLabelNoArg">Items recibidos</string>
<text value="Items recibidos" name="inbox_label"/>
<text name="inbox_fresh_new_count">
[NUM] Nuevo(s)
</text>
<panel name="inbox_inventory_placeholder_panel" tool_tip="Arrastra aquí items de tu inventario para gestionarlos y usarlos">
<panel name="inbox_inventory_placeholder">
Las compras realizadas en Marketplace serán entregadas aquí.
</panel>
</panel>
</panel>
</layout_panel>
<layout_panel name="outbox_layout_panel">
<panel name="marketplace_outbox">
<string name="OutboxLabelWithArg">
Merchant Outbox ([NUM])
</string>
<string name="OutboxLabelNoArg">
Merchant Outbox
</string>
<text value="Merchant Outbox" name="outbox_label"/>
<button tool_tip="Enviar a mi tienda en Marketplace" name="outbox_sync_btn"/>
<panel name="outbox_inventory_placeholder_upperpanel">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
Cargando...
</text>
</panel>
</panel>
</panel>
</layout_panel>
</layout_stack>
<panel label="Marketplace" name="marketplace_inbox">
<string name="InboxLabelWithArg">Items recibidos ([NUM])</string>
<string name="InboxLabelNoArg">Items recibidos</string>
<text value="Items recibidos" name="inbox_label"/>
<text name="inbox_fresh_new_count">
[NUM] Nuevo(s)
</text>
<panel name="inbox_inventory_placeholder_panel" tool_tip="Arrastra aquí items de tu inventario para gestionarlos y usarlos">
<panel name="inbox_inventory_placeholder">
Las compras realizadas en Marketplace serán entregadas aquí.
</panel>
</panel>
</panel>
</tab_container>
</panel>

View File

@ -3,52 +3,24 @@
<panel name="sidepanel_inventory_panel" label="">
<tab_container name="inventory_tab_container">
<panel label="インベントリ" name="panel_main_inventory" />
<panel label="マーケットプレイス" name="inbox_outbox_layout_panel">
<layout_stack name="inbox_outbox_layout_stack_off">
<layout_panel name="inbox_layout_panel_off">
<panel name="marketplace_inbox" label="">
<string name="InboxLabelWithArg">
受け取ったアイテム([NUM])
</string>
<string name="InboxLabelNoArg">
受け取ったアイテム
</string>
<text value="受け取ったアイテム" name="inbox_label" />
<!-- gets auto-hidden in preview editor, change name to view -->
<text name="inbox_fresh_new_count">
[NUM] 個の新アイテム
</text>
<view_border />
<panel name="inbox_inventory_placeholder_panel" tool_tip="アイテムを使用するには、そのアイテムをインベントリにドラッグアンドドロップ">
<text name="inbox_inventory_placeholder">
マーケットプレイスから購入した商品はここに配達されます。
</text>
</panel>
</panel>
</layout_panel>
<layout_panel name="outbox_layout_panel">
<panel name="marketplace_outbox">
<string name="OutboxLabelWithArg">
マーチャントアウトボックス([NUM])
</string>
<string name="OutboxLabelNoArg">
マーチャントアウトボックス
</string>
<text value="マーチャントアウトボックス" name="outbox_label" />
<button label="" tool_tip="自分のマーケットプレイス店頭に移動" name="outbox_sync_btn" />
<loading_indicator name="outbox_sync_indicator" />
<view_border />
<panel name="outbox_inventory_placeholder_upperpanel">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
取得中...
</text>
<text name="outbox_inventory_placeholder_text" />
</panel>
</panel>
</panel>
</layout_panel>
</layout_stack>
<panel label="マーケットプレイス" name="marketplace_inbox">
<string name="InboxLabelWithArg">
受け取ったアイテム([NUM])
</string>
<string name="InboxLabelNoArg">
受け取ったアイテム
</string>
<text value="受け取ったアイテム" name="inbox_label" />
<!-- gets auto-hidden in preview editor, change name to view -->
<text name="inbox_fresh_new_count">
[NUM] 個の新アイテム
</text>
<view_border />
<panel name="inbox_inventory_placeholder_panel" tool_tip="アイテムを使用するには、そのアイテムをインベントリにドラッグアンドドロップ">
<text name="inbox_inventory_placeholder">
マーケットプレイスから購入した商品はここに配達されます。
</text>
</panel>
</panel>
</tab_container>
</panel>

View File

@ -3,43 +3,22 @@
<panel name="sidepanel_inventory_panel">
<tab_container name="inventory_tab_container">
<panel label="Szafa" name="panel_main_inventory" />
<panel label="Marketplace" name="inbox_outbox_layout_panel">
<layout_stack name="inbox_outbox_layout_stack_off">
<layout_panel name="inbox_layout_panel_off">
<panel name="marketplace_inbox">
<string name="InboxLabelWithArg">
Odebrane przedmioty ([NUM])
</string>
<string name="InboxLabelNoArg">
Odebrane przedmioty
</string>
<text value="Odebrane przedmioty" name="inbox_label" />
<text name="inbox_fresh_new_count">
[NUM] nowe/y
</text>
<panel name="inbox_inventory_placeholder_panel" tool_tip="Przeciągnij przedmioty do swojej Szafy, aby ich używać">
<panel name="inbox_inventory_placeholder">
Rzeczy kupione na Marketplace będą tu dostarczane.
</panel>
</panel>
</panel>
</layout_panel>
<layout_panel name="outbox_layout_panel">
<panel name="marketplace_outbox">
<string name="OutboxLabelWithArg">Skrzynka nad. kupca ([NUM])</string>
<string name="OutboxLabelNoArg">Skrzynka nad. kupca</string>
<text value="Skrzynka nad. kupca" name="outbox_label" />
<button tool_tip="Wyślij na mój Marketplace" name="outbox_sync_btn" />
<panel name="outbox_inventory_placeholder_upperpanel">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
Ładowanie...
</text>
</panel>
</panel>
</panel>
</layout_panel>
</layout_stack>
<panel label="Marketplace" name="marketplace_inbox">
<string name="InboxLabelWithArg">
Odebrane przedmioty ([NUM])
</string>
<string name="InboxLabelNoArg">
Odebrane przedmioty
</string>
<text value="Odebrane przedmioty" name="inbox_label" />
<text name="inbox_fresh_new_count">
[NUM] nowe/y
</text>
<panel name="inbox_inventory_placeholder_panel" tool_tip="Przeciągnij przedmioty do swojej Szafy, aby ich używać">
<panel name="inbox_inventory_placeholder">
Rzeczy kupione na Marketplace będą tu dostarczane.
</panel>
</panel>
</panel>
</tab_container>
</panel>

View File

@ -3,43 +3,22 @@
<panel name="sidepanel_inventory_panel">
<tab_container name="inventory_tab_container">
<panel label="Инвентарь" name="panel_main_inventory" />
<panel label="Marketplace" name="inbox_outbox_layout_panel">
<layout_stack name="inbox_outbox_layout_stack_off">
<layout_panel name="inbox_layout_panel_off">
<panel name="marketplace_inbox">
<string name="InboxLabelWithArg">
Полученные вещи ([NUM])
</string>
<string name="InboxLabelNoArg">
Полученные вещи
</string>
<text value="Полученные вещи" name="inbox_label" />
<text name="inbox_fresh_new_count">
Новых: [NUM]
</text>
<panel name="inbox_inventory_placeholder_panel" tool_tip="Перетащите вещи в ваш инвентарь для их использования">
<panel name="inbox_inventory_placeholder">
Покупки из Marketplace будут доставлены сюда.
</panel>
</panel>
</panel>
</layout_panel>
<layout_panel name="outbox_layout_panel">
<panel name="marketplace_outbox">
<string name="OutboxLabelWithArg">Исходящие продавца ([NUM])</string>
<string name="OutboxLabelNoArg">Исходящие продавца</string>
<text value="Исходящие продавца" name="outbox_label" />
<button tool_tip="Отправить на Marketplace" name="outbox_sync_btn" />
<panel name="outbox_inventory_placeholder_upperpanel">
<panel name="outbox_inventory_placeholder_panel">
<text name="outbox_inventory_placeholder_title">
Загрузка...
</text>
</panel>
</panel>
</panel>
</layout_panel>
</layout_stack>
<panel label="Marketplace" name="marketplace_inbox">
<string name="InboxLabelWithArg">
Полученные вещи ([NUM])
</string>
<string name="InboxLabelNoArg">
Полученные вещи
</string>
<text value="Полученные вещи" name="inbox_label" />
<text name="inbox_fresh_new_count">
Новых: [NUM]
</text>
<panel name="inbox_inventory_placeholder_panel" tool_tip="Перетащите вещи в ваш инвентарь для их использования">
<panel name="inbox_inventory_placeholder">
Покупки из Marketplace будут доставлены сюда.
</panel>
</panel>
</panel>
</tab_container>
</panel>