diff --git a/TODO.network b/TODO.network index 54d83dae1..251aed152 100644 --- a/TODO.network +++ b/TODO.network @@ -7,7 +7,7 @@ DONE Комментарий к этому пункту = "Добавление O ** Какую-нибудь иконку к добавленным вручную каталогам DONE Звездочку к 2-м обязательным пунктам при добавлении каталога ?? Убрать 3-й пункт при добавлении???? -** Может быть сделать примеры мелким шрифтом под полями??? +DONE Может быть сделать примеры мелким шрифтом под полями ** Сразу (по нажатию Ok) проверять и говорить, верный ли URL (Ex: Это не OPDS-каталог) Это не должно мешать добавлению, но пользователь д.б. предупрежден (типа -- это не OPDS каталог -> Edit/Continue/Cancel) diff --git a/data/resources/application/de.xml b/data/resources/application/de.xml index 472261a3d..8500d4d78 100644 --- a/data/resources/application/de.xml +++ b/data/resources/application/de.xml @@ -316,6 +316,9 @@ + + + diff --git a/data/resources/application/en.xml b/data/resources/application/en.xml index 840305f43..ddefaa4e5 100644 --- a/data/resources/application/en.xml +++ b/data/resources/application/en.xml @@ -315,6 +315,9 @@ + + + diff --git a/data/resources/application/fr.xml b/data/resources/application/fr.xml index c4c010ba4..596b50ac7 100644 --- a/data/resources/application/fr.xml +++ b/data/resources/application/fr.xml @@ -316,6 +316,9 @@ + + + diff --git a/data/resources/application/hu.xml b/data/resources/application/hu.xml index 1fd1d645b..cdfe59816 100644 --- a/data/resources/application/hu.xml +++ b/data/resources/application/hu.xml @@ -316,6 +316,9 @@ + + + diff --git a/data/resources/application/it.xml b/data/resources/application/it.xml index 24ac7944b..d23ab0b70 100644 --- a/data/resources/application/it.xml +++ b/data/resources/application/it.xml @@ -316,6 +316,9 @@ + + + diff --git a/data/resources/application/ru.xml b/data/resources/application/ru.xml index f832d5507..112764c3e 100644 --- a/data/resources/application/ru.xml +++ b/data/resources/application/ru.xml @@ -315,6 +315,9 @@ + + + diff --git a/data/resources/application/vi.xml b/data/resources/application/vi.xml index 85431f2b4..4a6b1cd96 100644 --- a/data/resources/application/vi.xml +++ b/data/resources/application/vi.xml @@ -316,6 +316,9 @@ + + + diff --git a/data/resources/application/zh.xml b/data/resources/application/zh.xml index 094501848..7bafad212 100644 --- a/data/resources/application/zh.xml +++ b/data/resources/application/zh.xml @@ -316,6 +316,9 @@ + + + diff --git a/icons/tree/link.xml b/icons/tree/link.xml new file mode 100644 index 000000000..03463bc56 --- /dev/null +++ b/icons/tree/link.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/icons/tree/link_default.9.png b/icons/tree/link_default.9.png new file mode 100644 index 000000000..7a486f6fc Binary files /dev/null and b/icons/tree/link_default.9.png differ diff --git a/icons/tree/link_pressed.9.png b/icons/tree/link_pressed.9.png new file mode 100644 index 000000000..6259c6360 Binary files /dev/null and b/icons/tree/link_pressed.9.png differ diff --git a/icons/tree/link_selected.9.png b/icons/tree/link_selected.9.png new file mode 100644 index 000000000..e5c46298c Binary files /dev/null and b/icons/tree/link_selected.9.png differ diff --git a/res/layout/network_authentication_dialog.xml b/res/layout/network_authentication_dialog.xml index e8ba3b004..0ec1f45ac 100644 --- a/res/layout/network_authentication_dialog.xml +++ b/res/layout/network_authentication_dialog.xml @@ -7,54 +7,32 @@ android:paddingRight="10dp" android:orientation="vertical" > - - - - - - - - - - + android:singleLine="true" + /> + + + diff --git a/res/layout/network_custom_catalog_dialog.xml b/res/layout/network_custom_catalog_dialog.xml index 873b299f6..4605066fb 100644 --- a/res/layout/network_custom_catalog_dialog.xml +++ b/res/layout/network_custom_catalog_dialog.xml @@ -11,101 +11,102 @@ android:paddingRight="10dp" android:orientation="vertical" > - + - - - - - - + - - - - - - - - - - - + android:singleLine="true" + android:layout_alignParentLeft="true" + android:layout_toLeftOf="@id/network_catalog_title_star" + /> + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + android:singleLine="true" + /> + + + + + + +