Release 3.6.1.201512240104

juliuskunze · Jan 6, 2016 · 4ee030c · 4ee030c
1 parent eddbc1c
commit 4ee030c
Show file tree

Hide file tree

Showing 488 changed files with 28,842 additions and 759 deletions.
diff --git a/bundles/net.xmind.share/META-INF/MANIFEST.MF b/bundles/net.xmind.share/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: net.xmind.share;singleton:=true
-Bundle-Version: 3.6.0.qualifier
+Bundle-Version: 3.6.1.qualifier
 Bundle-Activator: net.xmind.share.XmindSharePlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,

diff --git a/bundles/net.xmind.share/pom.xml b/bundles/net.xmind.share/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>net.xmind.share</artifactId>
-    <version>3.6.0-SNAPSHOT</version>
+    <version>3.6.1-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.1-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/net.xmind.share/src/net/xmind/share/Messages.java b/bundles/net.xmind.share/src/net/xmind/share/Messages.java
@@ -38,6 +38,10 @@ public class Messages extends NLS {
     public static String UploaderDialog_LanguageChannel_label;
     public static String UploaderDialog_Privacy_text;
     public static String UploaderDialog_Download_text;
+    public static String UploaderDialog_NullTitle_error;
+
+    public static String UploaderDialog_NullTitle_warning;
+
     public static String UploaderDialog_Privacy_link;
 
     public static String UploaderDialog_OKPressedError_Text;

diff --git a/bundles/net.xmind.share/src/net/xmind/share/dialog/GeneralUploaderPage.java b/bundles/net.xmind.share/src/net/xmind/share/dialog/GeneralUploaderPage.java
@@ -14,10 +14,6 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
-import net.xmind.share.Info;
-import net.xmind.share.Messages;
-import net.xmind.share.XmindSharePlugin;
-
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -35,12 +31,16 @@
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.xmind.ui.resources.FontUtils;
 
-public class GeneralUploaderPage extends UploaderPage implements
-        PropertyChangeListener {
+import net.xmind.share.Info;
+import net.xmind.share.Messages;
+import net.xmind.share.XmindSharePlugin;
+
+public class GeneralUploaderPage extends UploaderPage
+        implements PropertyChangeListener {
 
     private static final String LANGUAGE_CHANNEL = "net.xmind.share.dialog.defaultLanguageChannel"; //$NON-NLS-1$
 
-    private TitleInfoField titleField;
+    private InfoField titleField;
 
     private InfoField descriptionField;
 
@@ -61,28 +61,20 @@ public void createControl(Composite parent) {
         GridLayout layout = new GridLayout();
         layout.verticalSpacing = 10;
         composite.setLayout(layout);
-        composite.setLayoutData(new GridData(SWT.BEGINNING, SWT.FILL, true,
-                false));
+        composite.setLayoutData(
+                new GridData(SWT.BEGINNING, SWT.FILL, true, false));
 
-        titleField = new TitleInfoField(false, true, true);
+        titleField = new InfoField(false, true, true);
         titleField.fill(composite);
         titleField.setName(Messages.UploaderDialog_Title_text);
         titleField.setText(getInfo().getString(Info.TITLE));
 
-        titleField.getCanvas().addListener(SWT.Resize, new Listener() {
-
-            public void handleEvent(Event event) {
-                titleField.getTitleLabel().setPrefWidth(
-                        titleField.getCanvas().getSize().x);
-            }
-        });
-
         descriptionField = new InfoField(true, false, false);
         descriptionField.fill(composite);
         descriptionField.setName(Messages.UploaderDialog_Description_text);
         descriptionField.setText(getInfo().getString(Info.DESCRIPTION));
-        descriptionField.getTextWidget().addModifyListener(
-                new ModifyListener() {
+        descriptionField.getTextWidget()
+                .addModifyListener(new ModifyListener() {
                     public void modifyText(ModifyEvent e) {
                         getInfo().setProperty(Info.DESCRIPTION,
                                 descriptionField.getText());
@@ -126,14 +118,16 @@ private void createLanguageSection(Composite parent) {
         composite.setLayout(gridLayout);
 
         Label label = new Label(composite, SWT.NONE);
-        label.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, true));
+        label.setLayoutData(
+                new GridData(SWT.BEGINNING, SWT.CENTER, false, true));
         label.setText(Messages.UploaderDialog_LanguageChannel_label);
 
         final Combo combo = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
-        combo.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, true));
+        combo.setLayoutData(
+                new GridData(SWT.BEGINNING, SWT.CENTER, false, true));
         ((GridData) combo.getLayoutData()).widthHint = 280;
         combo.setItems(new String[] { //
-        "English", //$NON-NLS-1$
+                "English", //$NON-NLS-1$
                 "Chinese - \u4e2d\u6587", //$NON-NLS-1$
                 "French - fran\u00e7ais", //$NON-NLS-1$
                 "German - Deutsch", //$NON-NLS-1$
@@ -260,4 +254,8 @@ private void goToPrivacyPage() {
         getContainer().showPage("org.xmind.ui.uploader.privacy"); //$NON-NLS-1$
     }
 
+    public InfoField getTitleField() {
+        return titleField;
+    }
+
 }
diff --git a/bundles/net.xmind.share/src/net/xmind/share/dialog/UploaderDialog.java b/bundles/net.xmind.share/src/net/xmind/share/dialog/UploaderDialog.java
@@ -14,14 +14,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import net.xmind.share.Info;
-import net.xmind.share.Messages;
-import net.xmind.share.XmindSharePlugin;
-import net.xmind.signin.IAccountInfo;
-import net.xmind.signin.XMindNet;
-
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -38,8 +33,14 @@
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
 
-public class UploaderDialog extends TitleAreaDialog implements
-        IUploaderPageContainer {
+import net.xmind.share.Info;
+import net.xmind.share.Messages;
+import net.xmind.share.XmindSharePlugin;
+import net.xmind.signin.IAccountInfo;
+import net.xmind.signin.XMindNet;
+
+public class UploaderDialog extends TitleAreaDialog
+        implements IUploaderPageContainer {
 
     private static final String SECTION_NAME = "net.xmind.share.UploadDialog"; //$NON-NLS-1$
 
@@ -51,6 +52,8 @@ public class UploaderDialog extends TitleAreaDialog implements
 
     private List<String> pageIds;
 
+    private GeneralUploaderPage generalPage;
+
     public UploaderDialog(Shell parentShell) {
         super(parentShell);
         setBlockOnOpen(true);
@@ -86,8 +89,7 @@ protected void createButtonsForButtonBar(Composite parent) {
         ((GridLayout) parent.getLayout()).makeColumnsEqualWidth = false;
 
         Label informLable = new Label(parent, SWT.WRAP | SWT.LEFT);
-        informLable
-                .setText(Messages.UploaderDialog_containUnupload_text);
+        informLable.setText(Messages.UploaderDialog_containUnupload_text);
         informLable.setVisible(false);
         if (getInfo().getBoolean(Info.TRIMMED)) {
             informLable.setVisible(true);
@@ -147,7 +149,8 @@ protected void addPage(String pageId, IUploaderPage page) {
     }
 
     protected void addPages() {
-        addPage("org.xmind.ui.uploader.general", new GeneralUploaderPage()); //$NON-NLS-1$
+        generalPage = new GeneralUploaderPage();
+        addPage("org.xmind.ui.uploader.general", generalPage); //$NON-NLS-1$
         addPage("org.xmind.ui.uploader.privacy", new PrivacyUploaderPage()); //$NON-NLS-1$
         addPage("org.xmind.ui.uploader.thumbnail", new ThumbnailUploaderPage()); //$NON-NLS-1$
     }
@@ -187,8 +190,6 @@ protected Control createDialogArea(Composite parent) {
             item.setControl(control);
         }
 
-        setFocus();
-
         tabFolder.addSelectionListener(new SelectionListener() {
             public void widgetSelected(SelectionEvent e) {
                 setFocus();
@@ -202,13 +203,25 @@ public void widgetDefaultSelected(SelectionEvent e) {
         setMessage(Messages.UploaderDialog_message);
         if ((Boolean) getInfo().getProperty(Info.MULTISHEETS))
             setMessage(Messages.UploaderDialog_uploadOneSheet_message);
+
+        setFocus();
+
         return composite;
     }
 
     private void setFocus() {
-        IUploaderPage page = getActivePage();
-        if (page != null) {
-            page.setFocus();
+        String title = (String) getInfo().getProperty(Info.TITLE);
+        if (title == null || title.trim().equals("")) { //$NON-NLS-1$
+            setMessage(Messages.UploaderDialog_NullTitle_warning,
+                    IMessageProvider.WARNING);
+            InfoField titleField = generalPage.getTitleField();
+            titleField.getTextWidget().setEditable(true);
+            titleField.setFocus();
+        } else {
+            IUploaderPage page = getActivePage();
+            if (page != null) {
+                page.setFocus();
+            }
         }
     }
 
@@ -257,6 +270,23 @@ public void showPage(String pageId) {
     }
 
     protected void okPressed() {
+        InfoField titleField = generalPage.getTitleField();
+        if (titleField.getTextWidget().getEditable()) {
+            String title = titleField.getText();
+            if (title != null && !title.trim().equals("")) { //$NON-NLS-1$
+                getInfo().setProperty(Info.TITLE, title);
+            }
+        }
+
+        String title = (String) getInfo().getProperty(Info.TITLE);
+        if (title == null || title.trim().equals("")) { //$NON-NLS-1$
+            setErrorMessage(Messages.UploaderDialog_NullTitle_error);
+            showPage("org.xmind.ui.uploader.general"); //$NON-NLS-1$
+            titleField.getTextWidget().setEditable(true);
+            titleField.getTextWidget().setFocus();
+            return;
+        }
+
         getDialogSettings().put(Info.PRIVACY,
                 getInfo().getString(Info.PRIVACY, Info.PRIVACY_PUBLIC));
         getDialogSettings().put(Info.DOWNLOADABLE,

diff --git a/bundles/net.xmind.share/src/net/xmind/share/messages.properties b/bundles/net.xmind.share/src/net/xmind/share/messages.properties
@@ -19,6 +19,8 @@ UploaderDialog_Privacy_text=Privacy:
 UploaderDialog_Download_text={0}Download: 
 UploaderDialog_Privacy_link=Change
 UploaderDialog_LanguageChannel_label=Language Channel:
+UploaderDialog_NullTitle_error=Title must be not null\! Please input one and retry.
+UploaderDialog_NullTitle_warning=Please input a title.
 UploaderDialog_OKPressedError_Text=All attachments, audio notes and hyperlinks pointing to any local file or any topic in another sheet will be deleted. Do you want to continue?
 
 UploaderDialog_Privacy_Public_title=Public

diff --git a/bundles/net.xmind.signin/META-INF/MANIFEST.MF b/bundles/net.xmind.signin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: net.xmind.signin;singleton:=true
-Bundle-Version: 3.6.0.qualifier
+Bundle-Version: 3.6.1.qualifier
 Bundle-Activator: net.xmind.signin.internal.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,

diff --git a/bundles/net.xmind.signin/pom.xml b/bundles/net.xmind.signin/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>net.xmind.signin</artifactId>
-    <version>3.6.0-SNAPSHOT</version>
+    <version>3.6.1-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.1-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/net.xmind.workbench/META-INF/MANIFEST.MF b/bundles/net.xmind.workbench/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: net.xmind.workbench;singleton:=true
-Bundle-Version: 3.6.0.qualifier
+Bundle-Version: 3.6.1.qualifier
 Bundle-Activator: net.xmind.workbench.internal.XMindNetWorkbench
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,

diff --git a/bundles/net.xmind.workbench/pom.xml b/bundles/net.xmind.workbench/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>net.xmind.workbench</artifactId>
-    <version>3.6.0-SNAPSHOT</version>
+    <version>3.6.1-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.1-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
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.6.0.qualifier
+Bundle-Version: 3.6.1.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.6.0-SNAPSHOT</version>
+    <version>3.6.1-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.1-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.6.0.qualifier
+Bundle-Version: 3.6.1.qualifier
 Bundle-Vendor: %providerName
 Fragment-Host: org.xmind.cathy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

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.6.0-SNAPSHOT</version>
+    <version>3.6.1-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.6.1-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,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.cathy;singleton:=true
-Bundle-Version: 3.6.0.qualifier
+Bundle-Version: 3.6.1.qualifier
 Bundle-Activator: org.xmind.cathy.internal.CathyPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -33,7 +33,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.osgi.services,
  org.eclipse.e4.core.di.extensions,
  org.eclipse.core.expressions,
- org.eclipse.e4.core.commands
+ org.eclipse.e4.core.commands,
+ org.xmind.ui.dashboard
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.0.0";resolution:=optional,

diff --git a/bundles/org.xmind.cathy/dashboard/dashboard.xml b/bundles/org.xmind.cathy/dashboard/dashboard.xml
@@ -14,6 +14,13 @@
 		iconURI="platform:/plugin/org.xmind.cathy/dashboard/new.png"
 		contributionURI="bundleclass://org.xmind.cathy/org.xmind.cathy.internal.dashboard.NewFileDashboardPage">
 </page>
+
+<page
+		id="org.xmind.ui.part.dashboard.cloud"
+		label="%cloud"
+		iconURI="platform:/plugin/org.xmind.cathy/dashboard/cloud.png"
+		contributionURI="bundleclass://org.xmind.ui.seawind/org.xmind.ui.internal.seawind.dashboard.CloudDashboardPage">
+</page>
 
 <page
 		id="org.xmind.ui.part.dashboard.recent"