Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GSOC 2020: [Preferences] Button problem in Preferences #9185 requires translation #9947

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

GSOC 2020: [Preferences] Button problem in Preferences #9185 requires translation #9947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ca9290
[Preferences] Button problem in Preferences #9185 requires translation
yzykov Mar 28, 2020
17fe835
Added field in Preferences.form
yzykov Mar 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions app/src/cc/arduino/view/preferences/Preferences.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
<Connection code="tr(&quot;Additional Boards Manager URLs: &quot;)" type="code"/>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="tr(&quot;Enter a comma separated list of urls&quot;)" type="code"/>
<Connection code="tr(&quot;Enter a comma separated list of urls or use a pop-up window on the right&quot;)" type="code"/>
</Property>
</Properties>
<AuxValues>
Expand All @@ -357,7 +357,7 @@
<Component class="javax.swing.JTextField" name="additionalBoardsManagerField">
<Properties>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="tr(&quot;Enter a comma separated list of urls&quot;)" type="code"/>
<Connection code="tr(&quot;Enter a comma separated list of urls or use a pop-up window on the right&quot;)" type="code"/>
</Property>
</Properties>
</Component>
Expand All @@ -366,6 +366,9 @@
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="new ImageIcon(Theme.getThemeImage(&quot;newwindow&quot;, this, Theme.scale(16), Theme.scale(14)))" type="code"/>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="tr(&quot;Opens a window to enter additional URLs, one for each row&quot;)" type="code"/>
</Property>
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[1, 1, 1, 1]"/>
</Property>
Expand Down
5 changes: 3 additions & 2 deletions app/src/cc/arduino/view/preferences/Preferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,13 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
comboWarningsLabel.setLabelFor(comboWarnings);

additionalBoardsManagerLabel.setText(tr("Additional Boards Manager URLs: "));
additionalBoardsManagerLabel.setToolTipText(tr("Enter a comma separated list of urls"));
additionalBoardsManagerLabel.setToolTipText(tr("Enter a comma separated list of urls or use a pop-up window on the right"));
additionalBoardsManagerLabel.setLabelFor(additionalBoardsManagerField);

additionalBoardsManagerField.setToolTipText(tr("Enter a comma separated list of urls"));
additionalBoardsManagerField.setToolTipText(tr("Enter a comma separated list of urls or use a pop-up window on the right"));

extendedAdditionalUrlFieldWindow.setIcon(new ImageIcon(Theme.getThemeImage("newwindow", this, Theme.scale(16), Theme.scale(14))));
extendedAdditionalUrlFieldWindow.setToolTipText(tr("Opens a window to enter additional URLs, one for each row"));
extendedAdditionalUrlFieldWindow.setMargin(new java.awt.Insets(1, 1, 1, 1));
extendedAdditionalUrlFieldWindow.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
Expand Down