Release 3.5.2.201504270119

juliuskunze · Jun 26, 2015 · 88e57a4 · 88e57a4
1 parent b2bf415
commit 88e57a4
Show file tree

Hide file tree

Showing 202 changed files with 24,345 additions and 371 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.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
 Bundle-Activator: net.xmind.share.XmindSharePlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,

diff --git a/bundles/net.xmind.share/src/net/xmind/share/Messages.java b/bundles/net.xmind.share/src/net/xmind/share/Messages.java
@@ -35,8 +35,10 @@ public class Messages extends NLS {
     public static String UploaderDialog_Public_label;
     public static String UploaderDialog_PublicView_label;
     public static String UploaderDialog_Private_label;
-    public static String UploaderDialog_Privacy_prompt;
     public static String UploaderDialog_LanguageChannel_label;
+    public static String UploaderDialog_Privacy_text;
+    public static String UploaderDialog_Download_text;
+    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
@@ -30,9 +30,10 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
+import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.FormText;
+import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.xmind.ui.resources.FontUtils;
 
 public class GeneralUploaderPage extends UploaderPage implements
         PropertyChangeListener {
@@ -43,7 +44,11 @@ public class GeneralUploaderPage extends UploaderPage implements
 
     private InfoField descriptionField;
 
-    private FormText privacyText;
+    private Composite privacyText;
+
+    private Label accessibility;
+
+    private Label allowed;
 
     public GeneralUploaderPage() {
         setTitle(Messages.UploaderDialog_GeneralPage_title);
@@ -56,16 +61,13 @@ 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));
 
         titleField = new TitleInfoField(false, true, true);
         titleField.fill(composite);
         titleField.setName(Messages.UploaderDialog_Title_text);
         titleField.setText(getInfo().getString(Info.TITLE));
-//        titleField.getTextWidget().addModifyListener(new ModifyListener() {
-//            public void modifyText(ModifyEvent e) {
-//                getInfo().setProperty(Info.TITLE, titleField.getText());
-//            }
-//        });
 
         titleField.getCanvas().addListener(SWT.Resize, new Listener() {
 
@@ -97,25 +99,20 @@ public void modifyText(ModifyEvent e) {
     }
 
     private void createPrivacySection(Composite parent) {
-        privacyText = new FormText(parent, SWT.NO_FOCUS);
+        privacyText = new Composite(parent, SWT.NONE);
+
+        GridLayout layout = new GridLayout(7, false);
+        layout.marginHeight = 0;
+        layout.marginLeft = 0;
+        layout.marginRight = 100;
+        layout.verticalSpacing = 0;
+        layout.horizontalSpacing = 0;
+        privacyText.setLayout(layout);
+
         privacyText
                 .setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
         privacyText.setBackground(parent.getBackground());
-        privacyText.addHyperlinkListener(new IHyperlinkListener() {
-
-            public void linkExited(HyperlinkEvent e) {
-            }
-
-            public void linkEntered(HyperlinkEvent e) {
-            }
-
-            public void linkActivated(HyperlinkEvent e) {
-                if ("privacy".equals(e.getHref())) { //$NON-NLS-1$
-                    goToPrivacyPage();
-                }
-            }
-        });
-        updatePrivacyLabel();
+        createtePrivacyLabel();
     }
 
     private void createLanguageSection(Composite parent) {
@@ -189,13 +186,57 @@ public void propertyChange(PropertyChangeEvent evt) {
         }
     }
 
-    private void updatePrivacyLabel() {
+    private void createtePrivacyLabel() {
         if (privacyText == null || privacyText.isDisposed())
             return;
-        privacyText.setText(
-                NLS.bind(Messages.UploaderDialog_Privacy_prompt, new String[] {
-                        getAccessibilityText(), getDownloadableText(),
-                        "privacy" }), true, false); //$NON-NLS-1$
+
+        createPrivacyLabel(privacyText, Messages.UploaderDialog_Privacy_text,
+                false);
+        accessibility = createPrivacyLabel(privacyText, getAccessibilityText(),
+                true);
+        createPrivacyLabel(privacyText,
+                NLS.bind(Messages.UploaderDialog_Download_text, ". "), //$NON-NLS-1$
+                false);
+        allowed = createPrivacyLabel(privacyText, getDownloadableText(), true);
+        createPrivacyLabel(privacyText, ". (", false); //$NON-NLS-1$
+        createPrivacyLink(privacyText);
+        createPrivacyLabel(privacyText, ")", false); //$NON-NLS-1$
+    }
+
+    private void updatePrivacyLabel() {
+        if (accessibility != null && !accessibility.isDisposed()) {
+            accessibility.setText(getAccessibilityText());
+        }
+
+        if (allowed != null && !allowed.isDisposed()) {
+            allowed.setText(getDownloadableText());
+        }
+
+        privacyText.layout(true, true);
+    }
+
+    private Label createPrivacyLabel(Composite parent, String text,
+            boolean isBold) {
+        Label label = new Label(parent, SWT.NONE);
+
+        if (isBold)
+            label.setFont(FontUtils.getBold(label.getFont()));
+
+        label.setText(text);
+        return label;
+    }
+
+    private void createPrivacyLink(Composite parent) {
+        Hyperlink link = new Hyperlink(parent, SWT.NONE);
+
+        link.setForeground(link.getDisplay().getSystemColor(SWT.COLOR_BLUE));
+        link.setUnderlined(true);
+        link.setText(Messages.UploaderDialog_Privacy_link);
+        link.addHyperlinkListener(new HyperlinkAdapter() {
+            public void linkActivated(HyperlinkEvent e) {
+                goToPrivacyPage();
+            }
+        });
     }
 
     private String getAccessibilityText() {

diff --git a/bundles/net.xmind.share/src/net/xmind/share/dialog/PrivacyUploaderPage.java b/bundles/net.xmind.share/src/net/xmind/share/dialog/PrivacyUploaderPage.java
@@ -14,8 +14,8 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.forms.widgets.FormText;
 import org.xmind.ui.resources.FontUtils;
 
 public class PrivacyUploaderPage extends UploaderPage {
@@ -101,13 +101,13 @@ private void createDescription(Composite parent, String description) {
         layout.marginLeft = 20;
         composite.setLayout(layout);
 
-        FormText label = new FormText(composite, SWT.NO_FOCUS);
+        Label label = new Label(composite, SWT.NONE);
         label.setBackground(composite.getBackground());
         label.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
         if (!SmallFonts)
             label.setFont(FontUtils.getRelativeHeight(
                     JFaceResources.DEFAULT_FONT, -1));
-        label.setText(description, true, true);
+        label.setText(description);
     }
 
     private void createDownloadCheck(Composite parent) {

diff --git a/bundles/net.xmind.share/src/net/xmind/share/messages.properties b/bundles/net.xmind.share/src/net/xmind/share/messages.properties
@@ -15,16 +15,18 @@ UploaderDialog_PublicView_label=Public
 UploaderDialog_Private_label=Private
 UploaderDialog_ThumbnailPage_title=Thumbnail
 UploaderDialog_Thumbnail_description=The following thumbnail is a part of your map used to represent the map in search results and other displays. You can drag on the viewer and/or zoom it to choose a more specific part of the map as you wish.
-UploaderDialog_Privacy_prompt=<form><p>Privacy: <b>{0}</b>. Download: <b>{1}</b>.  (<a href="{2}">Change</a>)</p></form>
+UploaderDialog_Privacy_text=Privacy: 
+UploaderDialog_Download_text={0}Download: 
+UploaderDialog_Privacy_link=Change
 UploaderDialog_LanguageChannel_label=Language Channel:
 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
-UploaderDialog_Privacy_Public_description=<form><p>Anyone can search for and view your map. (Recommended!)</p></form>
+UploaderDialog_Privacy_Public_description=Anyone can search for and view your map. (Recommended!)
 UploaderDialog_Privacy_Unlisted_title=Unlisted
-UploaderDialog_Privacy_Unlisted_description=<form><p>Anyone with the link can view your map (not listed in search results or categories on XMind.net).</p></form>
+UploaderDialog_Privacy_Unlisted_description=Anyone with the link can view your map (not listed in search results or categories on XMind.net).
 UploaderDialog_Privacy_Private_title=Private
-UploaderDialog_Privacy_Private_description=<form><p>Only specific XMind users can view your map.</p></form>
+UploaderDialog_Privacy_Private_description=Only specific XMind users can view your map.
 UploaderDialog_Privacy_AllowDownload_text=Allow download
 UploaderDialog_Privacy_DownloadAllowed=Allowed
 UploaderDialog_Privacy_DownloadForbidden=Forbidden

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.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
 Bundle-Activator: net.xmind.signin.internal.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,

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.5.1.qualifier
+Bundle-Version: 3.5.2.qualifier
 Bundle-Activator: net.xmind.workbench.internal.XMindNetWorkbench
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,

diff --git a/bundles/net.xmind.workbench/resource/Welcome to XMind.xmind b/bundles/net.xmind.workbench/resource/Welcome to XMind.xmind
diff --git a/bundles/org.freehep.graphicsio/.classpath b/bundles/org.freehep.graphicsio/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.freehep.graphicsio/.gitignore b/bundles/org.freehep.graphicsio/.gitignore
@@ -0,0 +1,12 @@
+.metadata
+bin
+tmp
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
diff --git a/bundles/org.freehep.graphicsio/.project b/bundles/org.freehep.graphicsio/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.freehep.graphicsio</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.freehep.graphicsio/.settings/org.eclipse.jdt.core.prefs b/bundles/org.freehep.graphicsio/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.freehep.graphicsio/META-INF/MANIFEST.MF b/bundles/org.freehep.graphicsio/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.freehep.graphicsio
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.freehep.graphics2d,
+ org.freehep.graphicsio,
+ org.freehep.graphicsio.pdf
diff --git a/bundles/org.freehep.graphicsio/build.properties b/bundles/org.freehep.graphicsio/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .