Browse Source

Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into release/9.0

master
kerry 7 years ago
parent
commit
85e6c4bb2d
  1. 10
      designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java
  2. 4
      designer_base/src/com/fr/design/gui/UIDefaultTheme.java
  3. BIN
      designer_base/src/com/fr/design/images/buttonicon/minus.png
  4. BIN
      designer_base/src/com/fr/design/images/buttonicon/plus.png

10
designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java

@ -1,6 +1,7 @@
package com.fr.design.mainframe.errorinfo; package com.fr.design.mainframe.errorinfo;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.base.FRCoreContext;
import com.fr.general.*; import com.fr.general.*;
import com.fr.general.http.HttpClient; import com.fr.general.http.HttpClient;
import com.fr.json.JSONException; import com.fr.json.JSONException;
@ -27,6 +28,7 @@ public class ErrorInfoUploader {
public static final String FOLDER_NAME = "errorInfo"; public static final String FOLDER_NAME = "errorInfo";
private static ErrorInfoUploader collector; private static ErrorInfoUploader collector;
private static boolean licSupport = true;
static { static {
GeneralContext.addEnvChangedListener(new EnvChangedListener() { GeneralContext.addEnvChangedListener(new EnvChangedListener() {
@ -35,6 +37,9 @@ public class ErrorInfoUploader {
FRLogger.getLogger().addLogAppender(new ErrorInfoLogAppender()); FRLogger.getLogger().addLogAppender(new ErrorInfoLogAppender());
} }
}); });
// 这个控制没啥意义, 主要在于宣传功能.
licSupport = VT4FR.isLicAvailable(FRCoreContext.getBytes()) && VT4FR.ALPHA_FINE.support();
} }
private ErrorInfoUploader() { private ErrorInfoUploader() {
@ -51,6 +56,11 @@ public class ErrorInfoUploader {
// 从云中心更新最新的解决方案文件 // 从云中心更新最新的解决方案文件
private void checkUpdateSolution(){ private void checkUpdateSolution(){
if (!licSupport) {
return;
}
Thread updateThread = new Thread(new Runnable() { Thread updateThread = new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {

4
designer_base/src/com/fr/design/gui/UIDefaultTheme.java

@ -170,8 +170,8 @@ public class UIDefaultTheme extends DefaultMetalTheme {
table.put("Tree.textForeground", ThemeUtils.NORMAL_FOREGROUND); table.put("Tree.textForeground", ThemeUtils.NORMAL_FOREGROUND);
table.put("Tree.selectionBackground", ThemeUtils.TEXT_SELECTED_BG_COLOR); table.put("Tree.selectionBackground", ThemeUtils.TEXT_SELECTED_BG_COLOR);
table.put("Tree.selectionForeground", ThemeUtils.TEXT_SELECTED_TEXT_COLOR); table.put("Tree.selectionForeground", ThemeUtils.TEXT_SELECTED_TEXT_COLOR);
table.put("Tree.hash", new ColorUIResource(208, 205, 190)); table.put("Tree.hash", new ColorUIResource(240, 240,243));
table.put("Tree.line", new ColorUIResource(208, 205, 190)); table.put("Tree.line", new ColorUIResource(240, 240,243));
} }

BIN
designer_base/src/com/fr/design/images/buttonicon/minus.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 B

After

Width:  |  Height:  |  Size: 177 B

BIN
designer_base/src/com/fr/design/images/buttonicon/plus.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 B

After

Width:  |  Height:  |  Size: 165 B

Loading…
Cancel
Save