From: Jim Procter Date: Thu, 9 Feb 2017 11:50:07 +0000 (+0000) Subject: Merge branch 'develop' into features/JAL-2316 X-Git-Tag: Release_2_10_3b1~346^2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Ffeatures%2FJAL-2316;hp=-c;p=jalview.git Merge branch 'develop' into features/JAL-2316 --- 01f25e260a8c336119462420a1c2a11512293b41 diff --combined resources/lang/Messages.properties index 13dea1e,1ba0c79..f720f39 --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@@ -138,8 -138,7 +138,8 @@@ action.view_flanking_regions = Show fla label.view_flanking_regions = Show sequence data either side of the subsequences involved in this alignment label.structures_manager = Structures Manager label.nickname = Nickname: -label.url = URL: +label.url = URL +label.url\: = URL: label.input_file_url = Enter URL or Input File label.select_feature = Select feature label.name = Name @@@ -414,6 -413,7 +414,6 @@@ label.couldnt_import_as_vamsas_session label.vamsas_document_import_failed = Vamsas Document Import Failed label.couldnt_locate = Couldn't locate {0} label.url_not_found = URL not found -label.no_link_selected = No link selected label.new_sequence_url_link = New sequence URL link label.cannot_edit_annotations_in_wrapped_view = Cannot edit annotations in wrapped view label.wrapped_view_no_edit = Wrapped view - no edit @@@ -721,7 -721,8 +721,8 @@@ label.mark_unlinked_leaves = Mark Unlin label.associate_leaves_with = Associate Leaves With label.save_colour_scheme_with_unique_name_added_to_colour_menu = Save your colour scheme with a unique name and it will be added to the Colour menu label.case_sensitive = Case Sensitive - label.lower_case_colour = Lower Case Colour + label.lower_case_colour = Colour All Lower Case + label.lower_case_tip = Chosen colour applies to all lower case symbols label.index_by_host = Index by Host label.index_by_type = Index by Type label.enable_jabaws_services = Enable JABAWS Services @@@ -1270,21 -1271,4 +1271,21 @@@ label.SEQUENCE_ID_no_longer_used = $SEQ label.SEQUENCE_ID_for_DB_ACCESSION1 = Please review your URL links in the 'Connections' tab of the Preferences window: label.SEQUENCE_ID_for_DB_ACCESSION2 = URL links using '$SEQUENCE_ID$' for DB accessions now use '$DB_ACCESSION$'. label.do_not_display_again = Do not display this message again +exception.url_cannot_have_miriam_id = {0} is a MIRIAM id and cannot be used as a custom url name +exception.url_cannot_have_duplicate_id = {0} cannot be used as a label for more than one line +label.filter = Filter text: +action.customfilter = Custom only +action.showall = Show All +label.insert = Insert: +action.seq_id = $SEQUENCE_ID$ +action.db_acc = $DB_ACCESSION$ +label.primary = Double Click +label.inmenu = In Menu +label.id = ID +label.database = Database +label.urltooltip = Only one url, which must use a sequence id, can be selected for the 'On Click' option +label.edit_sequence_url_link = Edit sequence URL link +warn.name_cannot_be_duplicate = User-defined URL names must be unique and cannot be MIRIAM ids +label.invalid_name = Invalid Name ! label.output_seq_details = Output Sequence Details to list all database references +label.urllinks = Links diff --combined resources/lang/Messages_es.properties index 9d8c9a2,7f769b3..d408fee --- a/resources/lang/Messages_es.properties +++ b/resources/lang/Messages_es.properties @@@ -135,8 -135,7 +135,8 @@@ action.view_flanking_regions = Mostrar label.view_flanking_regions = Mostrar los datos de la secuencia a ambos lados de las subsecuencias implicadas en este alineamiento label.structures_manager = Administrar estructuras label.nickname = Sobrenombre: -label.url = URL: +label.url\: = URL: +label.url = URL label.input_file_url = Introducir URL en el fichero de entrada label.select_feature = Seleccionar característica label.name = Nombre @@@ -381,6 -380,7 +381,6 @@@ label.couldnt_import_as_vamsas_session label.vamsas_document_import_failed = Fallo en la importación del documento Vamsas label.couldnt_locate = No se pudo localizar {0} label.url_not_found = URL no encontrada -label.no_link_selected = Enlace no seleccionado label.new_sequence_url_link = Enlace a una nueva secuencia URL label.cannot_edit_annotations_in_wrapped_view = No se pueden editar anotaciones en vista envolvente label.wrapped_view_no_edit = Vista envolvente - no editar @@@ -665,7 -665,8 +665,8 @@@ label.mark_unlinked_leaves = Marcar la label.associate_leaves_with = Asociar hojas con label.save_colour_scheme_with_unique_name_added_to_colour_menu = Guarde el esquema cromáticos con un nombre único y se añadirá al menú de colores label.case_sensitive = Sensible a mayúsculas - label.lower_case_colour = Color para las minúsculas + label.lower_case_colour = Colorear todas las minúsculas + label.lower_case_tip = El color elegido se aplicará a todas las minúsculas label.index_by_host = Indizar por host label.index_by_type = Indizar por tipo label.enable_jabaws_services = Habilitar servicios JABAWS @@@ -1270,21 -1271,4 +1271,21 @@@ label.SEQUENCE_ID_no_longer_used = $SEQ label.SEQUENCE_ID_for_DB_ACCESSION1 = Por favor, revise sus URLs en la pestaña 'Conexiones' de la ventana de Preferencias: label.SEQUENCE_ID_for_DB_ACCESSION2 = URL enlaza usando '$SEQUENCE_ID$' para accesiones DB ahora usar '$DB_ACCESSION$'. label.do_not_display_again = No mostrar este mensaje de nuevo +exception.url_cannot_have_miriam_id = {0} es una id MIRIAM y no puede ser usada como nombre url personalizado +exception.url_cannot_have_duplicate_id = {0} no puede ser usada como etiqueta en más de un enlace +label.filter = Filtrar texto: +action.customfilter = Sólo personalizado +action.showall = Mostrar todo +label.insert = Insertar: +action.seq_id = $SEQUENCE_ID$ +action.db_acc = $DB_ACCESSION$ +label.primary = Doble clic +label.inmenu = En Menú +label.id = ID +label.database = Base de datos +label.urltooltip = Sólo una url, que debe usar una id de secuencia, puede ser seleccionada en la opción 'On Click' +label.edit_sequence_url_link = Editar link de secuencia URL +warn.name_cannot_be_duplicate = Los nombres URL definidos por el usuario deben ser únicos y no pueden ser ids de MIRIAM +label.invalid_name = Nombre inválido ! label.output_seq_details = Seleccionar Detalles de la secuencia para ver todas +label.urllinks = Enlaces diff --combined src/jalview/appletgui/APopupMenu.java index d907a25,055fcf3..8fd317a --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@@ -210,7 -210,7 +210,7 @@@ public class APopupMenu extends java.aw Menu menu1 = new Menu(); public APopupMenu(AlignmentPanel apanel, final SequenceI seq, - Vector links) + List links) { // ///////////////////////////////////////////////////////// // If this is activated from the sequence panel, the user may want to @@@ -243,6 -243,24 +243,24 @@@ SequenceGroup sg = ap.av.getSelectionGroup(); if (sg != null && sg.getSize() > 0) { + if (sg.isNucleotide()) + { + conservationColour.setEnabled(false); + clustalColour.setEnabled(false); + BLOSUM62Colour.setEnabled(false); + zappoColour.setEnabled(false); + taylorColour.setEnabled(false); + hydrophobicityColour.setEnabled(false); + helixColour.setEnabled(false); + strandColour.setEnabled(false); + turnColour.setEnabled(false); + buriedColour.setEnabled(false); + } + else + { + purinePyrimidineColour.setEnabled(false); + nucleotideColour.setEnabled(false); + } editGroupName.setLabel(MessageManager.formatMessage( "label.name_param", new Object[] { sg.getName() })); showText.setState(sg.getDisplayText());