Release 3.7.2.201705011955

juliuskunze · Oct 19, 2017 · 425f27a · 425f27a
1 parent 7712b59
commit 425f27a
Show file tree

Hide file tree

Showing 121 changed files with 888 additions and 421 deletions.
diff --git a/bundles/org.xmind.cathy.fonts/META-INF/MANIFEST.MF b/bundles/org.xmind.cathy.fonts/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.xmind.cathy.fonts
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.xmind.cathy.fonts/pom.xml b/bundles/org.xmind.cathy.fonts/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.cathy.fonts</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.cathy.win32/META-INF/MANIFEST.MF b/bundles/org.xmind.cathy.win32/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.cathy.win32;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: %providerName
 Fragment-Host: org.xmind.cathy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/bundles/org.xmind.cathy.win32/pom.xml b/bundles/org.xmind.cathy.win32/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.cathy.win32</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/bundles/org.xmind.cathy/META-INF/MANIFEST.MF b/bundles/org.xmind.cathy/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-SymbolicName: org.xmind.cathy;singleton:=true
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
- org.xmind.ui;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.imports;bundle-version="[3.7.0,3.8.0)",
- org.xmind.ui.toolkit;bundle-version="[3.7.0,3.8.0)",
- org.xmind.core.command;bundle-version="[3.7.0,3.8.0)",
- org.xmind.core.command.remote;bundle-version="[3.7.0,3.8.0)",
+ org.xmind.ui;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.imports;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.ui.toolkit;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.core.command;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.core.command.remote;bundle-version="[3.7.2,3.8.0)",
  org.eclipse.e4.ui.workbench,
  org.eclipse.ui.themes,
  org.eclipse.e4.ui.model.workbench,
@@ -27,12 +27,12 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.expressions,
  org.eclipse.e4.core.commands,
  org.xmind.ui.dashboard,
- org.xmind.core.usagedata;bundle-version="[3.7.0,3.8.0)",
+ org.xmind.core.usagedata;bundle-version="[3.7.2,3.8.0)",
  org.json,
- org.xmind.ui.browser;bundle-version="[3.7.0,3.8.0)",
- org.xmind.core.licensing;bundle-version="[3.7.0,3.8.0)",
+ org.xmind.ui.browser;bundle-version="[3.7.2,3.8.0)",
+ org.xmind.core.licensing;bundle-version="[3.7.2,3.8.0)",
  org.eclipse.e4.ui.workbench.addons.swt,
- org.xmind.ui.mindmap;bundle-version="3.7.0",
+ org.xmind.ui.mindmap;bundle-version="3.7.2",
  org.eclipse.ui.net;bundle-version="1.3.0",
  org.eclipse.emf.ecore.xmi
 Bundle-ManifestVersion: 2
@@ -49,5 +49,5 @@ Export-Package: org.xmind.cathy.internal;x-internal:=true,org.xmind.ca
  l.renderer;x-internal:=true,org.xmind.ui.internal.e4handlers;x-intern
  al:=true
 Bundle-Name: %pluginName
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.cathy.internal.CathyPlugin
diff --git a/bundles/org.xmind.cathy/plugin.xml b/bundles/org.xmind.cathy/plugin.xml
@@ -111,7 +111,7 @@
       </page>
       <page
             class="org.eclipse.ui.ExtensionFactory:newKeysPreferencePage"
-            id="org.xmind.ui.prefPage.Keys"
+            id="org.eclipse.ui.preferencePages.Keys"
             name="%prefPage.keys.name">
       </page>
       <!--<page

diff --git a/bundles/org.xmind.cathy/pom.xml b/bundles/org.xmind.cathy/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.cathy</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/CathyPlugin.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/CathyPlugin.java
@@ -174,6 +174,8 @@ public class CathyPlugin extends AbstractUIPlugin {
     public static final int AUTO_SAVE_EDITOR_STATE_INTERVALS = 60000;
     public static final String OPTION_AUTO_SAVE_EDITOR_STATE_INTERVALS = "/debug/autoSaveEditorStateIntervals"; //$NON-NLS-1$
 
+    public static final String KEY_NOT_SHOW_UPLOAD_DATA_CHECK = "org.xmind.cathy.notShowUploadDataCheck"; //$NON-NLS-1$
+
     // The shared instance.
     private static CathyPlugin plugin;
 

diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/OpenFilesProcess.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/OpenFilesProcess.java
@@ -140,7 +140,7 @@ protected IEditorInput createEditorInput(String fileName) throws Exception {
     protected IEditorInput newFromTemplate(String path, String fileName)
             throws Exception {
         IWorkbookRef ref = ClonedWorkbookRef
-                .createFromSourceWorkbookURI(new File(path).toURI());
+                .createFromSourceWorkbookURI(new File(path).toURI(), fileName);
         return MindMapUI.getEditorInputFactory().createEditorInput(ref);
     }
 

diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartUpProcess.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartUpProcess.java
@@ -45,6 +45,7 @@ public StartUpProcess(IWorkbench workbench) {
     }
 
     public void startUp() {
+        hideRightStack();
         checkAndRecoverFiles();
 
         if (DEBUG_CHECK_OPEN_FILE) {
@@ -68,6 +69,14 @@ public void run() {
         }
     }
 
+    private void hideRightStack() {
+        MApplication application = workbench.getService(MApplication.class);
+        for (MWindow window : application.getChildren()) {
+            DashboardAutomationAddon.hideVisiblePart(window,
+                    "org.xmind.ui.stack.right"); //$NON-NLS-1$
+        }
+    }
+
     private void checkAndOpenFiles() {
         new CheckOpenFilesProcess(workbench).doCheckAndOpenFiles();
     }
@@ -94,7 +103,6 @@ private void openStartupMap() {
                 doOpenLastSession();
             }
             if (!hasOpenedEditors()) {
-//                doOpenDashboard();
                 closeOpenedDashboard();
             }
         }

diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartupPreferencePageSection.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartupPreferencePageSection.java
@@ -62,7 +62,9 @@ public void createControl(Composite parent) {
     @Override
     protected void createFieldEditors() {
         addStartupGroup(container);
-        addSendUsageDataGroup(container);
+        if (isShowUploadDataCheck()) {
+            addSendUsageDataGroup(container);
+        }
         this.initialize();
     }
 
@@ -74,8 +76,16 @@ private void addStartupGroup(Composite parent) {
 
         startupActionButton = new Button(container, SWT.CHECK);
         startupActionButton.setText(WorkbenchMessages.RestoreLastSession_label);
-        addField(new BooleanFieldEditor(CathyPlugin.CHECK_UPDATES_ON_STARTUP,
-                WorkbenchMessages.CheckUpdates_label, container));
+
+        if (isShowUploadDataCheck()) {
+            addField(
+                    new BooleanFieldEditor(CathyPlugin.CHECK_UPDATES_ON_STARTUP,
+                            WorkbenchMessages.CheckUpdates_label, container));
+        }
+    }
+
+    private boolean isShowUploadDataCheck() {
+        return !Boolean.getBoolean(CathyPlugin.KEY_NOT_SHOW_UPLOAD_DATA_CHECK);
     }
 
     private void addSendUsageDataGroup(Composite parent) {

diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/WelcomeDialog.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/WelcomeDialog.java
@@ -458,7 +458,7 @@ private void createButtonSection(Composite parent) {
         GridData layoutData = new GridData(SWT.FILL, SWT.BOTTOM, true, false);
         composite.setLayoutData(layoutData);
 
-        GridLayout layout = new GridLayout(2, false);
+        GridLayout layout = new GridLayout(0, false);
         layout.marginWidth = 27;
         layout.marginHeight = 10;
         composite.setLayout(layout);
@@ -468,6 +468,11 @@ private void createButtonSection(Composite parent) {
     }
 
     private void createUploadDataCheck(Composite parent) {
+        if (!isShowUploadDataCheck()) {
+            return;
+        }
+        ((GridLayout) parent.getLayout()).numColumns++;
+
         Composite composite = new Composite(parent, SWT.NONE);
         composite.setBackground(parent.getBackground());
         GridData layoutData = new GridData(SWT.FILL, SWT.CENTER, true, false);
@@ -514,10 +519,22 @@ public void linkActivated(HyperlinkEvent e) {
         });
     }
 
+    private boolean isShowUploadDataCheck() {
+        return !Boolean.getBoolean(CathyPlugin.KEY_NOT_SHOW_UPLOAD_DATA_CHECK);
+    }
+
     private void createOkButton(Composite parent) {
+        ((GridLayout) parent.getLayout()).numColumns++;
+
         final Button okButton = new Button(parent, SWT.PUSH);
         okButton.setBackground(parent.getBackground());
-        GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, false, true);
+
+        GridData gridData = null;
+        if (((GridLayout) parent.getLayout()).numColumns > 1) {
+            gridData = new GridData(SWT.CENTER, SWT.CENTER, false, true);
+        } else {
+            gridData = new GridData(SWT.RIGHT, SWT.CENTER, true, true);
+        }
         gridData.widthHint = 92;
         okButton.setLayoutData(gridData);
         okButton.setText(WorkbenchMessages.WelcomeDialog_okButton_text);
@@ -540,12 +557,14 @@ public void mouseDoubleClick(MouseEvent e) {
     }
 
     private void close(boolean restoreDefaults) {
-        boolean isUploadData = true;
-        if (!restoreDefaults) {
-            isUploadData = uploadDataCheck.getSelection();
+        if (uploadDataCheck != null && !uploadDataCheck.isDisposed()) {
+            boolean isUploadData = true;
+            if (!restoreDefaults) {
+                isUploadData = uploadDataCheck.getSelection();
+            }
+            CathyPlugin.getDefault().getPreferenceStore().setValue(
+                    CathyPlugin.USAGE_DATA_UPLOADING_ENABLED, isUploadData);
         }
-        CathyPlugin.getDefault().getPreferenceStore().setValue(
-                CathyPlugin.USAGE_DATA_UPLOADING_ENABLED, isUploadData);
 
         super.close();
     }

diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/DashboardAutomationAddon.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/DashboardAutomationAddon.java
@@ -272,7 +272,7 @@ private void updateDashboardToolItems(MWindow window) {
         }
     }
 
-    private static final String hideVisiblePart(MWindow window,
+    public static final String hideVisiblePart(MWindow window,
             String partStackId) {
         if (window == null || partStackId == null) {
             return null;

diff --git a/...rg.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromStructuresDashboardPage.java b/...rg.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromStructuresDashboardPage.java
@@ -136,8 +136,11 @@ public void run() {
                 .increase(UserDataConstants.CREATE_WORKBOOK_COUNT);
         MindMapUIPlugin.getDefault().getUsageDataCollector()
                 .increase(UserDataConstants.CREATE_SHEET_COUNT);
+
+        String vs = structure.getValue();
+        String ID = vs.replaceAll("\\.", "_");  //$NON-NLS-1$//$NON-NLS-2$
         MindMapUIPlugin.getDefault().getUsageDataCollector().increase(
-                UserDataConstants.STRUCTURE_TYPE_COUNT + structure.getValue());
+                String.format(UserDataConstants.STRUCTURE_TYPE_COUNT, ID));
         WorkbookInitializer initializer = WorkbookInitializer.getDefault()
                 .withStructureClass(structure.getValue()).withTheme(theme);
         IEditorInput editorInput = MindMapUI.getEditorInputFactory()

diff --git a/bundles/org.xmind.core.command.remote/META-INF/MANIFEST.MF b/bundles/org.xmind.core.command.remote/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.xmind.core.command.remote;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.core.internal.command.remote.RemoteCommandPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
- org.xmind.core.command;bundle-version="[3.7.0,3.8.0)";visibility:=reexport
+ org.xmind.core.command;bundle-version="[3.7.2,3.8.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.xmind.core.command.remote,

diff --git a/bundles/org.xmind.core.command.remote/pom.xml b/bundles/org.xmind.core.command.remote/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.command.remote</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.command/META-INF/MANIFEST.MF b/bundles/org.xmind.core.command/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.xmind.core.command;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.core.internal.command.XMindCommandPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime

diff --git a/bundles/org.xmind.core.command/pom.xml b/bundles/org.xmind.core.command/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.command</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.io/META-INF/MANIFEST.MF b/bundles/org.xmind.core.io/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.core.io;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy

diff --git a/bundles/org.xmind.core.io/pom.xml b/bundles/org.xmind.core.io/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.io</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.licensing/META-INF/MANIFEST.MF b/bundles/org.xmind.core.licensing/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Licensing API
 Bundle-SymbolicName: org.xmind.core.licensing
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Vendor: XMind Ltd.
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.xmind.core.licensing
diff --git a/bundles/org.xmind.core.licensing/pom.xml b/bundles/org.xmind.core.licensing/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.licensing</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.7.2-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.7.2-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.net/META-INF/MANIFEST.MF b/bundles/org.xmind.core.net/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.core.net;singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.2.qualifier
 Bundle-Activator: org.xmind.core.net.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.json;bundle-version="1.0.0"