Skip to content

Commit 768f5cf

Browse files
committed
updated ui as per discussion
1 parent 9a904c7 commit 768f5cf

File tree

4 files changed

+25
-93
lines changed

4 files changed

+25
-93
lines changed

bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/dialogs/URLDialog.java

Lines changed: 0 additions & 85 deletions
This file was deleted.

bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/tools/ToolsInstallationHandler.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import com.espressif.idf.core.util.IDFUtil;
5050
import com.espressif.idf.core.util.StringUtil;
5151
import com.espressif.idf.ui.UIPlugin;
52-
import com.espressif.idf.ui.dialogs.URLDialog;
5352
import com.espressif.idf.ui.tools.wizard.pages.ManageToolsInstallationWizardPage;
5453
import com.espressif.idf.ui.update.InstallToolsHandler;
5554

@@ -638,21 +637,22 @@ else if (environment.containsKey("Path"))
638637

639638
StringBuilder stringBuilder = new StringBuilder();
640639
stringBuilder.append(Messages.MissingToolsValidationMessage_A);
641-
stringBuilder.append(System.lineSeparator());
642640
for (ToolsVO toolsVO : missingToolsVOs)
643641
{
644642
stringBuilder.append(toolsVO.getName());
645-
stringBuilder.append(System.lineSeparator());
643+
stringBuilder.append(" ");
646644
}
647645

648646
stringBuilder.append(Messages.MissingToolsValidationMessage_B);
649-
stringBuilder.append(System.lineSeparator());
647+
stringBuilder.append("<a>");
650648
stringBuilder.append(Messages.MissingToolsValidationLink);
649+
stringBuilder.append("</a>");
650+
651+
logQueue.add(stringBuilder.toString());
651652

652653
manageToolsInstallationWizardPage.getShell().getDisplay().asyncExec(() -> {
653-
URLDialog urlDialog = new URLDialog(manageToolsInstallationWizardPage.getShell(), "Missing Tools",
654-
stringBuilder.toString());
655-
urlDialog.open();
654+
manageToolsInstallationWizardPage.getLinkForDoc().setText(stringBuilder.toString());
655+
manageToolsInstallationWizardPage.getLinkForDoc().setVisible(true);
656656
});
657657
}
658658

bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/tools/messages.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,5 +108,5 @@ IDFDownloadWizard_UpdatingIDFPathMessage=Updating IDF_PATH to: {0}
108108
FilterTargetBoxToolTip=Filter the tools based on the target selection of ESP chips
109109
ShowAvailableVersionsOnlyToolTip=Shows the versions that are available already and downloaded. The versions should be in the espressif home directory to be visible with this.
110110
MissingToolsValidationMessage_A=Following required tools are missing:
111-
MissingToolsValidationMessage_B=Please visit the Link below to see configuration for these tools
111+
MissingToolsValidationMessage_B=Please visit the Link to see configuration for these tools
112112
MissingToolsValidationLink=https://github.com/espressif/idf-eclipse-plugin/blob/master/docs/MissingToolsManualPathUpdateGuide.md

bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/tools/wizard/pages/ManageToolsInstallationWizardPage.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@
2828
import org.eclipse.swt.graphics.Image;
2929
import org.eclipse.swt.layout.GridData;
3030
import org.eclipse.swt.layout.GridLayout;
31+
import org.eclipse.swt.program.Program;
3132
import org.eclipse.swt.widgets.Button;
3233
import org.eclipse.swt.widgets.Combo;
3334
import org.eclipse.swt.widgets.Composite;
3435
import org.eclipse.swt.widgets.Event;
3536
import org.eclipse.swt.widgets.Label;
37+
import org.eclipse.swt.widgets.Link;
3638
import org.eclipse.swt.widgets.Listener;
3739
import org.eclipse.swt.widgets.MessageBox;
3840
import org.eclipse.swt.widgets.ProgressBar;
@@ -110,6 +112,7 @@ public class ManageToolsInstallationWizardPage extends WizardPage implements ITo
110112
private Preferences scopedPreferenceStore;
111113
private Button forceDownloadBtn;
112114
private Listener[] listenersForFinish;
115+
private Link linkForDoc;
113116

114117
public ManageToolsInstallationWizardPage(WizardDialog parentWizardDialog, ToolsJsonParser toolsJsonParser)
115118
{
@@ -270,6 +273,10 @@ public void widgetSelected(SelectionEvent e)
270273
progressBar.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
271274
progressBar.setVisible(false);
272275

276+
linkForDoc = new Link(logAreaComposite, SWT.WRAP | SWT.MULTI);
277+
linkForDoc.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 3));
278+
linkForDoc.addListener(SWT.Selection, e -> Program.launch(e.text));
279+
linkForDoc.setVisible(false);
273280
createButtonsBar(logAreaComposite);
274281

275282
setButtonsEnabled(itemChecked);
@@ -942,6 +949,16 @@ public void afterDeleteToolMessage()
942949
}
943950
}
944951

952+
public Link getLinkForDoc()
953+
{
954+
return linkForDoc;
955+
}
956+
957+
public void setLinkForDoc(Link linkForDoc)
958+
{
959+
this.linkForDoc = linkForDoc;
960+
}
961+
945962
private class SelectRecommendedButtonSelectionAdapter extends SelectionAdapter
946963
{
947964
@Override

0 commit comments

Comments
 (0)