diff --git a/src/org/omegat/gui/main/BaseMainWindowMenu.java b/src/org/omegat/gui/main/BaseMainWindowMenu.java index 5048808df5..02ff13faeb 100644 --- a/src/org/omegat/gui/main/BaseMainWindowMenu.java +++ b/src/org/omegat/gui/main/BaseMainWindowMenu.java @@ -224,8 +224,6 @@ protected void createComponents() { projectCommitTargetFiles = createMenuItem("TF_MENU_FILE_TARGET"); projectCompileMenuItem = createMenuItem("TF_MENU_FILE_COMPILE"); projectSingleCompileMenuItem = createMenuItem("TF_MENU_FILE_SINGLE_COMPILE"); - projectMedOpenMenuItem = createMenuItem("TF_MENU_FILE_MED_OPEN"); - projectMedCreateMenuItem = createMenuItem("TF_MENU_FILE_MED_CREATE"); projectEditMenuItem = createMenuItem("MW_PROJECTMENU_EDIT"); viewFileListMenuItem = createMenuItem("TF_MENU_FILE_PROJWIN"); @@ -446,9 +444,6 @@ protected void constructMenu() { projectMenu.add(projectCompileMenuItem); projectMenu.add(projectSingleCompileMenuItem); projectMenu.addSeparator(); - projectMenu.add(projectMedOpenMenuItem); - projectMenu.add(projectMedCreateMenuItem); - projectMenu.addSeparator(); projectMenu.add(projectEditMenuItem); projectMenu.add(viewFileListMenuItem); projectMenu.add(projectAccessProjectFilesMenu); @@ -827,12 +822,11 @@ protected void setActionCommands() { protected void onProjectStatusChanged(final boolean isProjectOpened) { JMenuItem[] itemsToSwitchOff = new JMenuItem[] { projectNewMenuItem, projectTeamNewMenuItem, - projectOpenMenuItem, projectMedOpenMenuItem }; + projectOpenMenuItem }; JMenuItem[] itemsToSwitchOn = new JMenuItem[] { projectImportMenuItem, projectWikiImportMenuItem, projectReloadMenuItem, projectCloseMenuItem, projectSaveMenuItem, projectEditMenuItem, projectCompileMenuItem, projectSingleCompileMenuItem, projectAccessProjectFilesMenu, - projectMedCreateMenuItem, editMenu, editFindInProjectMenuItem, editReplaceInProjectMenuItem, editInsertSourceMenuItem, editInsertTranslationMenuItem, editTagPainterMenuItem, editOverwriteSourceMenuItem, @@ -1081,8 +1075,6 @@ public JMenu getMenu(MenuExtender.MenuKey marker) { JMenuItem projectCommitTargetFiles; JMenuItem projectCompileMenuItem; JMenuItem projectSingleCompileMenuItem; - JMenuItem projectMedOpenMenuItem; - JMenuItem projectMedCreateMenuItem; JMenuItem projectEditMenuItem; JMenuItem projectExitMenuItem; JMenuItem projectRestartMenuItem; diff --git a/src/org/omegat/gui/main/MainWindowMenuHandler.java b/src/org/omegat/gui/main/MainWindowMenuHandler.java index 400e209760..c61e3c0722 100644 --- a/src/org/omegat/gui/main/MainWindowMenuHandler.java +++ b/src/org/omegat/gui/main/MainWindowMenuHandler.java @@ -129,20 +129,6 @@ public void projectClearRecentMenuItemActionPerformed() { RecentProjects.clear(); } - /** - * Open MED project. - */ - public void projectMedOpenMenuItemActionPerformed() { - ProjectUICommands.projectOpenMED(); - } - - /** - * Create MED project. - */ - public void projectMedCreateMenuItemActionPerformed() { - ProjectUICommands.projectCreateMED(); - } - /** * Imports the file/files/folder into project's source files. */ diff --git a/src/org/omegat/gui/main/ProjectUICommands.java b/src/org/omegat/gui/main/ProjectUICommands.java index 69ac9eb506..bf86afcaaa 100644 --- a/src/org/omegat/gui/main/ProjectUICommands.java +++ b/src/org/omegat/gui/main/ProjectUICommands.java @@ -41,7 +41,6 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import java.util.Locale; import java.util.concurrent.ExecutionException; import javax.swing.JFileChooser; @@ -69,7 +68,6 @@ import org.omegat.core.team2.RemoteRepositoryProvider; import org.omegat.filters2.master.FilterMaster; import org.omegat.filters2.master.PluginUtils; -import org.omegat.gui.dialogs.ChooseMedProject; import org.omegat.gui.dialogs.FileCollisionDialog; import org.omegat.gui.dialogs.NewProjectFileChooser; import org.omegat.gui.dialogs.NewTeamProjectController; @@ -173,136 +171,6 @@ protected Void doInBackground() throws Exception { }.execute(); } - public static void projectOpenMED() { - UIThreadsUtil.mustBeSwingThread(); - - if (Core.getProject().isProjectLoaded()) { - return; - } - - // ask for MED file - ChooseMedProject ndm = new ChooseMedProject(); - int ndmResult = ndm.showOpenDialog(Core.getMainWindow().getApplicationFrame()); - if (ndmResult != OmegaTFileChooser.APPROVE_OPTION) { - // user press 'Cancel' in project creation dialog - return; - } - final File med = ndm.getSelectedFile(); - - // ask for new project dir - NewProjectFileChooser ndc = new NewProjectFileChooser(); - int ndcResult = ndc.showSaveDialog(Core.getMainWindow().getApplicationFrame()); - if (ndcResult != OmegaTFileChooser.APPROVE_OPTION) { - // user press 'Cancel' in project creation dialog - return; - } - final File dir = ndc.getSelectedFile(); - if (!ensureProjectDir(dir)) { - return; - } - - new SwingWorker() { - protected Void doInBackground() throws Exception { - - final ProjectProperties newProps = new ProjectProperties(dir); - ProjectMedProcessing.extractFromMed(med, newProps); - // create project - try { - ProjectFactory.createProject(newProps); - RecentProjects.add(dir.getAbsolutePath()); - } catch (Exception ex) { - Log.logErrorRB(ex, "PP_ERROR_UNABLE_TO_READ_PROJECT_FILE"); - Core.getMainWindow().displayErrorRB(ex, "PP_ERROR_UNABLE_TO_READ_PROJECT_FILE"); - } - - return null; - } - - protected void done() { - try { - get(); - SwingUtilities.invokeLater(Core.getEditor()::requestFocus); - } catch (Exception ex) { - Log.logErrorRB(ex, "PP_ERROR_UNABLE_TO_READ_PROJECT_FILE"); - Core.getMainWindow().displayErrorRB(ex, "PP_ERROR_UNABLE_TO_READ_PROJECT_FILE"); - } - } - }.execute(); - } - - public static void projectCreateMED() { - UIThreadsUtil.mustBeSwingThread(); - - if (!Core.getProject().isProjectLoaded()) { - return; - } - - // commit the current entry first - Core.getEditor().commitAndLeave(); - - // ask for new MED file - ChooseMedProject ndm = new ChooseMedProject(); - // default name - String zipName = null; - try { - File origin = ProjectMedProcessing.getOriginMedFile(Core.getProject().getProjectProperties()); - if (origin != null) { - zipName = origin.getName(); - } - } catch (Exception ignored) { - } - if (zipName == null) { - zipName = Core.getProject().getProjectProperties().getProjectName() + "-MED.zip"; - } - ndm.setSelectedFile(new File( - Core.getProject().getProjectProperties().getProjectRootDir().getParentFile(), zipName)); - int ndmResult = ndm.showSaveDialog(Core.getMainWindow().getApplicationFrame()); - if (ndmResult != OmegaTFileChooser.APPROVE_OPTION) { - // user press 'Cancel' in project creation dialog - return; - } - // add .zip extension if there is no - final File med = ndm.getSelectedFile().getName().toLowerCase(Locale.ENGLISH).endsWith(".zip") - ? ndm.getSelectedFile() - : new File(ndm.getSelectedFile().getAbsolutePath() + ".zip"); - - new SwingWorker() { - protected Void doInBackground() throws Exception { - IMainWindow mainWindow = Core.getMainWindow(); - Cursor hourglassCursor = Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR); - Cursor oldCursor = mainWindow.getCursor(); - mainWindow.setCursor(hourglassCursor); - - mainWindow.showStatusMessageRB("MW_STATUS_SAVING"); - - Core.executeExclusively(true, () -> { - Core.getProject().saveProject(true); - try { - Core.getProject().compileProject(".*"); - } catch (Exception ex) { - throw new RuntimeException(ex); - } - }); - - ProjectMedProcessing.createMed(med, Core.getProject().getProjectProperties()); - - mainWindow.showStatusMessageRB("MW_STATUS_SAVED"); - mainWindow.setCursor(oldCursor); - return null; - } - - protected void done() { - try { - get(); - SwingUtilities.invokeLater(Core.getEditor()::requestFocus); - } catch (Exception ex) { - Log.logErrorRB(ex, "PP_ERROR_UNABLE_TO_READ_PROJECT_FILE"); - Core.getMainWindow().displayErrorRB(ex, "PP_ERROR_UNABLE_TO_READ_PROJECT_FILE"); - } - } - }.execute(); - } - public static void projectTeamCreate() { UIThreadsUtil.mustBeSwingThread(); diff --git a/src/org/omegat/util/gui/MenuExtender.java b/src/org/omegat/util/gui/MenuExtender.java index 97d6f79df9..3e83b05884 100644 --- a/src/org/omegat/util/gui/MenuExtender.java +++ b/src/org/omegat/util/gui/MenuExtender.java @@ -42,7 +42,7 @@ public enum MenuKey { /** * Project menu. */ - PROJECT("project", 21), + PROJECT("project", 18), /** * Edit menu. */