Skip to content

IEP-1090: Close the welcome page if opened when new project is created #1035

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

Merged
alirana01 merged 1 commit into from
Aug 29, 2024
Merged

IEP-1090: Close the welcome page if opened when new project is created #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions bundles/com.espressif.idf.core/src/com/espressif/idf/core/util/IDFUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.launchbar.core.ILaunchBarManager;
import org.eclipse.launchbar.core.target.ILaunchTarget;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.part.ViewPart;
import org.osgi.service.prefs.BackingStoreException;

import com.espressif.idf.core.IDFConstants;
Expand Down Expand Up @@ -813,4 +817,23 @@ public static String getIDFToolsPathFromPreferences()
IDFCorePreferenceConstants.IDF_TOOLS_PATH, IDFCorePreferenceConstants.IDF_TOOLS_PATH_DEFAULT, null);
return idfToolsPath;
}

public static void closeWelcomePage(IWorkbenchWindow activeww)
{
Display.getDefault().syncExec(()-> {
if (activeww != null)
{
IWorkbenchPage page = activeww.getActivePage();
if (page != null)
{
ViewPart viewPart = (ViewPart) page.findView("org.eclipse.ui.internal.introview"); //$NON-NLS-1$
if (viewPart != null)
{
page.hideView(viewPart);
}

}
}
});
}
}
2 changes: 2 additions & 0 deletions bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/handlers/NewProjectHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;

import com.espressif.idf.core.util.IDFUtil;
import com.espressif.idf.ui.wizard.NewIDFProjectWizard;

/**
Expand All @@ -18,6 +19,7 @@ public class NewProjectHandler extends AbstractHandler
@Override
public Object execute(ExecutionEvent event) throws ExecutionException
{
IDFUtil.closeWelcomePage(EclipseHandler.getActiveWorkbenchWindow());
if (!NewProjectHandlerUtil.installToolsCheck())
{
return null;
Expand Down
19 changes: 3 additions & 16 deletions bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/tools/ManageEspIdfVersionsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.ViewPart;

import com.espressif.idf.core.logging.Logger;
import com.espressif.idf.core.tools.IToolsInstallationWizardConstants;
import com.espressif.idf.core.util.IDFUtil;
import com.espressif.idf.ui.handlers.EclipseHandler;
import com.espressif.idf.ui.tools.manager.ESPIDFManagerEditor;

Expand All @@ -39,19 +38,8 @@ private void launchEditor()
public void run()
{
IWorkbenchWindow activeww = EclipseHandler.getActiveWorkbenchWindow();
if (activeww != null)
{
IWorkbenchPage page = activeww.getActivePage();
if (page != null)
{
ViewPart viewPart = (ViewPart) page.findView("org.eclipse.ui.internal.introview");
if (viewPart != null)
{
page.hideView(viewPart);
}

}
}
IDFUtil.closeWelcomePage(activeww);

try
{
File inputFile = new File(toolSetConfigFilePath());
Expand All @@ -62,7 +50,6 @@ public void run()

IFile iFile = ResourcesPlugin.getWorkspace().getRoot()
.getFile(new Path(inputFile.getAbsolutePath()));

IDE.openEditor(activeww.getActivePage(), new FileEditorInput(iFile), ESPIDFManagerEditor.EDITOR_ID);
}
catch (Exception e)
Expand Down