提交一个WeSketch新形象

weixin · Oct 26, 2017 · a4ad4a3 · a4ad4a3
1 parent f2abb00
commit a4ad4a3
Show file tree

Hide file tree

Showing 46 changed files with 130 additions and 88 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/WeSketch.sketchplugin/Contents/Resources/icon.png b/WeSketch.sketchplugin/Contents/Resources/icon.png
diff --git a/WeSketch.sketchplugin/Contents/Resources/minicon.png b/WeSketch.sketchplugin/Contents/Resources/minicon.png
diff --git a/WeSketch.sketchplugin/Contents/Sketch/checkForUpdate.js b/WeSketch.sketchplugin/Contents/Sketch/checkForUpdate.js
@@ -18,7 +18,7 @@ function checkForUpdate(context, auto) {
  if (auto && updateAvailable == false) {
  return false;
  }
- var updateAlert = COSAlertWindow.new();
+ var updateAlert = dialog(context);
 
  updateAlert.setMessageText(updateAvailable ? i18.m2 : i18.m3);
  if (updateAvailable) {

diff --git a/WeSketch.sketchplugin/Contents/Sketch/codeSetting.js b/WeSketch.sketchplugin/Contents/Sketch/codeSetting.js
@@ -5,7 +5,7 @@ var codeKey = "com.sketchplugins.wechat.codetype";
 var onRun = function (context) {
  var i18 = _(context).codeSetting;
 
- var settingsWindow = COSAlertWindow.new();
+ var settingsWindow = dialog(context);
  settingsWindow.addButtonWithTitle(i18.m1);
  settingsWindow.addButtonWithTitle(i18.m2);
  settingsWindow.setMessageText(i18.m3);

diff --git a/WeSketch.sketchplugin/Contents/Sketch/colorReplace.js b/WeSketch.sketchplugin/Contents/Sketch/colorReplace.js
@@ -170,7 +170,7 @@ function colorReplace(context) {
  }
 
  function createUserInterface(colorToFind) {
- userInterface = COSAlertWindow.new(); // 创建弹框
+ userInterface = dialog(context); // 创建弹框
 
  userInterface.setMessageText(i18.m1);
 

diff --git a/WeSketch.sketchplugin/Contents/Sketch/common.js b/WeSketch.sketchplugin/Contents/Sketch/common.js
@@ -37,6 +37,27 @@ var _ = function (context) {
  return i18Content;
 };
 
+function dialog(context) {
+ var iconImage = NSImage.alloc().initByReferencingFile(context.plugin.urlForResourceNamed("icon.png").path());
+ var alert = COSAlertWindow.new();
+ if (iconImage) {
+ alert.setIcon(iconImage);
+ }
+ return alert;
+}
+
+function errorDialog(context,content) {
+ var iconImage = NSImage.alloc().initByReferencingFile(context.plugin.urlForResourceNamed("icon.png").path());
+ var alert = COSAlertWindow.new();
+ if (iconImage) {
+ alert.setIcon(iconImage);
+ }
+ alert.addButtonWithTitle(_(context).checkForUpdate.m9);
+
+ alert.setMessageText(_(context).checkForUpdate.m10);
+ alert.setInformativeText(content);
+ return alert.runModal();
+}
 
 function initDefaults(pluginDomain, initialValues) {
  kPluginDomain = pluginDomain;
@@ -142,7 +163,7 @@ function get(args) {
  if (jsonData.status == 200) {
  return jsonData;
  } else {
- NSApp.displayDialog(jsonData.msg);
+ errorDialog(context,jsonData.msg);
  return jsonData;
  }
 }
@@ -155,7 +176,7 @@ function post(args) {
  if (jsonData.status == 200) {
  return jsonData;
  } else {
- NSApp.displayDialog(jsonData.msg);
+ errorDialog(context,jsonData.msg);
  return jsonData;
  }
 }

diff --git a/WeSketch.sketchplugin/Contents/Sketch/commonPreview.js b/WeSketch.sketchplugin/Contents/Sketch/commonPreview.js
@@ -209,11 +209,11 @@ var buildPreview = function (context) {
 var setIndex = function (context) {
  var i18 = _(context).commonPreview;
  if (context.selection.length == 0) {
- return NSApp.displayDialog(i18.m1);
+ return errorDialog(context,i18.m1);
  } else {
  var selection = context.selection[0];
  if (selection.className() != 'MSArtboardGroup') {
- return NSApp.displayDialog(i18.m1);
+ return errorDialog(context,i18.m1);
  }
  var linkLayersPredicate = NSPredicate.predicateWithFormat("userInfo != nil && function(userInfo, 'valueForKeyPath:', %@).indexMain != nil", previewKey);
  var indexObject = context.document.currentPage().children().filteredArrayUsingPredicate(linkLayersPredicate);
@@ -230,7 +230,7 @@ var setDialog = function (context) {
  var fx = 0;
 
  function chooseDialog() {
- var settingsWindow = COSAlertWindow.new();
+ var settingsWindow = dialog(context);
  settingsWindow.addButtonWithTitle(i18.m2);
  settingsWindow.addButtonWithTitle(i18.m3);
 
@@ -243,11 +243,11 @@ var setDialog = function (context) {
  return settingsWindow.runModal();
  }
  if (context.selection.length == 0) {
- return NSApp.displayDialog(i18.m1);
+ return errorDialog(context,i18.m1);
  } else {
  var selection = context.selection[0];
  if (selection.className() != 'MSArtboardGroup') {
- return NSApp.displayDialog(i18.m1);
+ return errorDialog(context,i18.m1);
  }
  if (chooseDialog() != '1000') {
  return;
@@ -277,7 +277,7 @@ var setFixed = function (context) {
  var fx = 0;
 
  function chooseDialog2() {
- var settingsWindow = COSAlertWindow.new();
+ var settingsWindow = dialog(context);
  settingsWindow.addButtonWithTitle(i18.m2);
  settingsWindow.addButtonWithTitle(i18.m3);
 
@@ -291,7 +291,7 @@ var setFixed = function (context) {
  }
 
  function chooseDialog(n) {
- var settingsWindow = COSAlertWindow.new();
+ var settingsWindow = dialog(context);
  settingsWindow.addButtonWithTitle(i18.m2);
  settingsWindow.addButtonWithTitle(i18.m3);
  settingsWindow.setMessageText(i18.m14 + n + i18.m15);
@@ -303,11 +303,11 @@ var setFixed = function (context) {
  context.command.setValue_forKey_onLayer_forPluginIdentifier(direction, "direction", selection, previewKey);
  }
  if (context.selection.length == 0) {
- return NSApp.displayDialog(i18.m13);
+ return errorDialog(context,i18.m13);
  } else {
  var selection = context.selection[0];
  if (selection.className() == 'MSArtboardGroup') {
- return NSApp.displayDialog(i18.m13);
+ return errorDialog(context,i18.m13);
  }
  if (!chooseDialog2()) {
  return;
@@ -351,18 +351,18 @@ var setBacks = function (context) {
  var fx = 0;
 
  function chooseDialog(n) {
- var settingsWindow = COSAlertWindow.new();
+ var settingsWindow = dialog(context);
  settingsWindow.addButtonWithTitle(i18.m2);
  settingsWindow.addButtonWithTitle(i18.m3);
  settingsWindow.setMessageText(i18.m14 + n + i18.m15);
  return settingsWindow.runModal();
  }
  if (context.selection.length == 0) {
- return NSApp.displayDialog(i18.m10);
+ return errorDialog(context,i18.m10);
  } else {
  var selection = context.selection[0];
  if (selection.className() == 'MSArtboardGroup') {
- return NSApp.displayDialog(i18.m10);
+ return errorDialog(context,i18.m10);
  }
  var lengthD = 0;
  var saveDom = [];
@@ -391,18 +391,18 @@ var setNoBuild = function (context) {
  var fx = 0;
 
  function chooseDialog(n) {
- var settingsWindow = COSAlertWindow.new();
+ var settingsWindow = dialog(context);
  settingsWindow.addButtonWithTitle(i18.m2);
  settingsWindow.addButtonWithTitle(i18.m3);
  settingsWindow.setMessageText(i18.m14 + n + i18.m15);
  return settingsWindow.runModal();
  }
  if (context.selection.length == 0) {
- return NSApp.displayDialog(i18.m10);
+ return errorDialog(context,i18.m10);
  } else {
  var selection = context.selection[0];
  if (selection.className() == 'MSArtboardGroup') {
- return NSApp.displayDialog(i18.m10);
+ return errorDialog(context,i18.m10);
  }
  var lengthD = 0;
  var saveDom = [];
@@ -427,7 +427,7 @@ var clearPreview = function (context) {
  var i18 = _(context).commonPreview;
  var domKey = ['backMain', 'fixedMain', 'dialogMain', 'indexMain', 'noBuildMain'];
  if (context.selection.length == 0) {
- return NSApp.displayDialog(i18.m16);
+ return errorDialog(context,i18.m16);
  }
  for (var i = 0; i < context.selection.length; i++) {
  for (var k = 0; k < domKey.length; k++) {

diff --git a/WeSketch.sketchplugin/Contents/Sketch/commonPreviewJson.js b/WeSketch.sketchplugin/Contents/Sketch/commonPreviewJson.js
@@ -189,7 +189,7 @@ var commonPreviewJson = function (context, filePath, show) {
  var fxlocal = '0';
 
  function chooseDialog() {
- var settingsWindow = COSAlertWindow.new();
+ var settingsWindow = dialog(context);
  settingsWindow.addButtonWithTitle(i18.m2);
  settingsWindow.addButtonWithTitle(i18.m3);
 
@@ -406,7 +406,7 @@ var commonPreviewJson = function (context, filePath, show) {
  }
  }
  if (!flag) {
- NSApp.displayDialog(i18.m18);
+ errorDialog(context,i18.m18);
  return false;
  }
 

diff --git a/WeSketch.sketchplugin/Contents/Sketch/exportColor.js b/WeSketch.sketchplugin/Contents/Sketch/exportColor.js
@@ -43,6 +43,6 @@ var onRun = function (context) {
  }
 
  } else {
- NSApp.displayDialog(i18.m2);
+ errorDialog(context,i18.m2);
  }
 }
diff --git a/WeSketch.sketchplugin/Contents/Sketch/exportSlice.js b/WeSketch.sketchplugin/Contents/Sketch/exportSlice.js
@@ -14,7 +14,7 @@ function exportSlice(context) {
 
  var selection = context.selection;
  if (selection.count() == 0) {
- return NSApp.displayDialog(i18.m1);
+ return errorDialog(context,i18.m1);
  }
  var scale = 0;
  var parent = selection[0].parentArtboard();
@@ -34,7 +34,7 @@ function exportSlice(context) {
 
  var imagetype = 'png';
  var addressname = [];
- var settingsWindow = COSAlertWindow.new();
+ var settingsWindow = dialog(context);
  settingsWindow.addButtonWithTitle(i18.m2);
  settingsWindow.addButtonWithTitle(i18.m3);
  settingsWindow.setMessageText(i18.m4);

diff --git a/WeSketch.sketchplugin/Contents/Sketch/flag.js b/WeSketch.sketchplugin/Contents/Sketch/flag.js
@@ -19,7 +19,7 @@ function getFlag(context, refrush) {
  var colorLineB = rgb(colorLine)[2];
 
  function deleteDialog(context) {
- var settingsWindow = COSAlertWindow.new();
+ var settingsWindow = dialog(context);
  settingsWindow.addButtonWithTitle(i18.m1);
  settingsWindow.addButtonWithTitle(i18.m2);
 
@@ -293,7 +293,7 @@ function getFlag(context, refrush) {
  if (context.selection.count() != 1 || refrush) {
  flags = drawFunction(doc, null);
  if (!refrush) {
- NSApp.displayDialog(i18.m6);
+ errorDialog(context,i18.m6);
  }
  } else {
  flags = drawFunction(doc, context.selection[0]);

diff --git a/WeSketch.sketchplugin/Contents/Sketch/fontCharacters.js b/WeSketch.sketchplugin/Contents/Sketch/fontCharacters.js
@@ -36,7 +36,7 @@ var fontCharacters = function (context) {
  if (data.action == 'insert') {
  var nowcontext = uploadContext(context);
  if (nowcontext.selection.length == 0) {
- return NSApp.displayDialog(i18.m1);
+ return errorDialog(context,i18.m1);
  }
  var fontfamily = [NSFont fontWithName: data.fontFamily size: 14.0];
  var layer = nowcontext.selection[0];
@@ -69,7 +69,7 @@ var fontCharacters = function (context) {
  layer.setStringValue(obj.ustr);
  }
  } else {
- NSApp.displayDialog(i18.m1);
+ errorDialog(context,i18.m1);
  }
 
  windowObject.evaluateWebScript("window.location.hash = '';");

diff --git a/WeSketch.sketchplugin/Contents/Sketch/fontReplace.js b/WeSketch.sketchplugin/Contents/Sketch/fontReplace.js
@@ -38,7 +38,7 @@ function fontReplace(context) {
  doc.showMessage(i18.m1);
  return false;
  } else {
- userInterface = COSAlertWindow.new();
+ userInterface = dialog(context);
  userInterface.setMessageText(i18.m2);
  userInterface.addTextLabelWithValue(i18.m3 + "：");
 

diff --git a/WeSketch.sketchplugin/Contents/Sketch/i18n/enUS.json b/WeSketch.sketchplugin/Contents/Sketch/i18n/enUS.json
@@ -8,7 +8,8 @@
  "m6":", download new version automaticly？",
  "m7":"Upgrade",
  "m8":"Not Now",
- "m9":"OK"
+ "m9":"OK",
+ "m10":"Warning" 
  },
  "codeColor":{
  "m1":"Color Copied",

diff --git a/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-enUS.json b/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-enUS.json
@@ -1,7 +1,7 @@
 {
  "name": "WeSketch",
  "author": "Tencent WeChat",
- "version": "1.3.2",
+ "version": "1.4.0",
  "identifier": "cn.wechat",
  "description": "A set of plugins for Sketch include drawing links & marks, UI Kit & Color sync, font & text replacing",
  "icon": "minicon.png",

diff --git a/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-jaJP.json b/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-jaJP.json
@@ -1,7 +1,7 @@
 {
  "name": "WeSketch",
  "author": "Tencent WeChat",
- "version": "1.3.2",
+ "version": "1.4.0",
  "identifier": "cn.wechat",
  "description": "A set of plugins for Sketch include drawing links & marks, UI Kit & Color sync, font & text replacing",
  "icon": "minicon.png",

diff --git a/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-zhCN.json b/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-zhCN.json
@@ -1,7 +1,7 @@
 {
  "name": "WeSketch",
  "author": "Tencent WeChat",
- "version": "1.3.2",
+ "version": "1.4.0",
  "identifier": "cn.wechat",
  "description": "A set of plugins for Sketch include drawing links & marks, UI Kit & Color sync, font & text replacing",
  "icon": "minicon.png",

diff --git a/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-zhTW.json b/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-zhTW.json
@@ -1,7 +1,7 @@
 {
  "name": "WeSketch",
  "author": "Tencent WeChat",
- "version": "1.3.2",
+ "version": "1.4.0",
  "identifier": "cn.wechat",
  "description": "A set of plugins for Sketch include drawing links & marks, UI Kit & Color sync, font & text replacing",
  "icon": "minicon.png",

diff --git a/WeSketch.sketchplugin/Contents/Sketch/i18n/zhCN.json b/WeSketch.sketchplugin/Contents/Sketch/i18n/zhCN.json
@@ -8,7 +8,8 @@
  "m6":"，是否自动下载更新？",
  "m7":"升级",
  "m8":"暂不",
- "m9":"确定"
+ "m9":"确定",
+ "m10":"警告"
  },
  "codeColor":{
  "m1":"颜色已复制到剪贴板",

diff --git a/WeSketch.sketchplugin/Contents/Sketch/i18n/zhTW.json b/WeSketch.sketchplugin/Contents/Sketch/i18n/zhTW.json
@@ -8,7 +8,8 @@
  "m6":"，是否自動下載更新？",
  "m7":"升級",
  "m8":"暫不",
- "m9":"確定"
+ "m9":"確定",
+ "m10":"警告" 
  },
  "codeColor":{
  "m1":"顏色已復制到剪貼板",