From 3dfbc13293d5bdd2fd3faa3cb6122825373da39f Mon Sep 17 00:00:00 2001 From: richie Date: Tue, 29 Mar 2016 14:38:53 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 7d5adb038..3b3ffdf69 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -568,6 +568,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); StringBuilder defaultTitleSB = new StringBuilder(); defaultTitleSB.append(ProductConstants.PRODUCT_NAME); + defaultTitleSB.append(" "); + defaultTitleSB.append(ProductConstants.BRANCH); // james：标识登录的用户和登录的ENV String envName = DesignerEnvManager.getEnvManager().getCurEnvName(); Env env = DesignerEnvManager.getEnvManager().getEnv(envName); From 573d9740f97e344e879c5c23b61a93d308f2f6b5 Mon Sep 17 00:00:00 2001 From: richie Date: Wed, 30 Mar 2016 09:21:26 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=97=B6=E9=97=B4=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 3b3ffdf69..876bf3922 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -574,7 +574,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta String envName = DesignerEnvManager.getEnvManager().getCurEnvName(); Env env = DesignerEnvManager.getEnvManager().getEnv(envName); if (env != null) { - defaultTitleSB.append('-').append(env.getUser()).append('@').append(envName).append('['); + defaultTitleSB.append(env.getUser()).append('@').append(envName).append('['); defaultTitleSB.append(env.getEnvDescription()); defaultTitleSB.append(']'); if (editingTemplate != null) { From 2ca8643344786f1582d127c8e2a3fbd0a3fe1f8e Mon Sep 17 00:00:00 2001 From: richie Date: Wed, 30 Mar 2016 09:25:08 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=88=A0=E9=99=A4master=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9E=84=E5=BB=BA=E6=97=B6=E9=97=B4=E6=A0=87?= =?UTF-8?q?=E8=AE=B0,=E4=BC=A0=E9=94=99=E7=89=88=E6=9C=AC=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 876bf3922..7d5adb038 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -568,13 +568,11 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); StringBuilder defaultTitleSB = new StringBuilder(); defaultTitleSB.append(ProductConstants.PRODUCT_NAME); - defaultTitleSB.append(" "); - defaultTitleSB.append(ProductConstants.BRANCH); // james：标识登录的用户和登录的ENV String envName = DesignerEnvManager.getEnvManager().getCurEnvName(); Env env = DesignerEnvManager.getEnvManager().getEnv(envName); if (env != null) { - defaultTitleSB.append(env.getUser()).append('@').append(envName).append('['); + defaultTitleSB.append('-').append(env.getUser()).append('@').append(envName).append('['); defaultTitleSB.append(env.getEnvDescription()); defaultTitleSB.append(']'); if (editingTemplate != null) { From d2cfe2f9789bb55c6c6f1b625e59dedd811061ed Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Wed, 30 Mar 2016 19:10:49 +0800 Subject: [PATCH 4/7] rt --- .../src/com/fr/design/extra/PluginFromStorePane.java | 5 +++-- designer_base/src/com/fr/design/extra/PluginUpdatePane.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginFromStorePane.java b/designer_base/src/com/fr/design/extra/PluginFromStorePane.java index 717cd1199..f59c2d166 100644 --- a/designer_base/src/com/fr/design/extra/PluginFromStorePane.java +++ b/designer_base/src/com/fr/design/extra/PluginFromStorePane.java @@ -184,6 +184,9 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane(){ @@ -229,8 +232,6 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane(){ @@ -205,8 +208,6 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane Date: Wed, 30 Mar 2016 19:13:56 +0800 Subject: [PATCH 5/7] rt --- .../src/com/fr/design/mainframe/bbs/BBSLoginDialog.java | 6 +++++- designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java b/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java index 60545d7b6..f809022ff 100644 --- a/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java +++ b/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java @@ -225,9 +225,13 @@ public class BBSLoginDialog extends UIDialog { setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Login-Failure-Tip")); } - public void tipForUsernameEmpty(){ + private void tipForUsernameEmpty(){ setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Username-Empty-Tip")); } + + public void tipForDownloadPluginWithoutLogin() { + setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Download-Unlogin-Tip")); + } private void tipForPasswordEmpty(){ setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Password-Empty-Tip")); diff --git a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java index 0f803d7f8..98a07bd12 100644 --- a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java +++ b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java @@ -81,7 +81,7 @@ public class UserInfoLabel extends UILabel{ bbsLoginDialog = new BBSLoginDialog(DesignerContext.getDesignerFrame(), UserInfoLabel.this); } bbsLoginDialog.clearLoginInformation(); - bbsLoginDialog.tipForUsernameEmpty(); + bbsLoginDialog.tipForDownloadPluginWithoutLogin(); bbsLoginDialog.setModal(true); bbsLoginDialog.showWindow(); } From 954ab356d668ea84ec5f75380373135ef8ef61e8 Mon Sep 17 00:00:00 2001 From: xiaxiang <1438003374@qq.com> Date: Wed, 30 Mar 2016 20:00:53 +0800 Subject: [PATCH 6/7] rt --- designer_base/src/com/fr/design/extra/PluginFromStorePane.java | 2 +- designer_base/src/com/fr/design/extra/PluginUpdatePane.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginFromStorePane.java b/designer_base/src/com/fr/design/extra/PluginFromStorePane.java index f59c2d166..e40f5a2bf 100644 --- a/designer_base/src/com/fr/design/extra/PluginFromStorePane.java +++ b/designer_base/src/com/fr/design/extra/PluginFromStorePane.java @@ -184,7 +184,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane Date: Wed, 30 Mar 2016 23:25:38 +0800 Subject: [PATCH 7/7] rt --- designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java | 2 +- designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java b/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java index f809022ff..702b878a6 100644 --- a/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java +++ b/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java @@ -229,7 +229,7 @@ public class BBSLoginDialog extends UIDialog { setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Username-Empty-Tip")); } - public void tipForDownloadPluginWithoutLogin() { + public void showTipForDownloadPluginWithoutLogin() { setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Download-Unlogin-Tip")); } diff --git a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java index 98a07bd12..319c3d92e 100644 --- a/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java +++ b/designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java @@ -81,7 +81,7 @@ public class UserInfoLabel extends UILabel{ bbsLoginDialog = new BBSLoginDialog(DesignerContext.getDesignerFrame(), UserInfoLabel.this); } bbsLoginDialog.clearLoginInformation(); - bbsLoginDialog.tipForDownloadPluginWithoutLogin(); + bbsLoginDialog.showTipForDownloadPluginWithoutLogin(); bbsLoginDialog.setModal(true); bbsLoginDialog.showWindow(); }