Merge remote-tracking branch 'origin/develop' into master-local

Exslims · Apr 1, 2017 · a9eb048 · a9eb048
2 parents b647341 + 2fb8294
commit a9eb048
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java
@@ -47,7 +47,7 @@ private void initContainer() {
         tabbedPane.addTab("General",generalSettings);
         tabbedPane.addTab("Notification panel",cbSettings);
         tabbedPane.addTab("Task panel",taskBarSettings);
-        tabbedPane.addTab("Help",new HelpPanel());
+//        tabbedPane.addTab("Help",new HelpPanel());
         tabbedPane.addTab("Support",new SupportPanel());
         tabbedPane.addTab("About",new AboutPanel());
 

diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/TitledComponentFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/TitledComponentFrame.java
@@ -45,7 +45,7 @@ private void initHeaderPanel(){
             headerPanel.add(frameTitleLabel, BorderLayout.CENTER);
 
             miscPanel.setBackground(AppThemeColor.TRANSPARENT);
-            hideButton = componentsFactory.getIconButton("app/close.png", 14, AppThemeColor.FRAME_ALPHA, "Hide");
+            hideButton = componentsFactory.getIconButton("app/close.png", 14, AppThemeColor.FRAME_ALPHA, "");
             hideButton.setBorder(BorderFactory.createEmptyBorder(0,0,0,2));
             hideButton.addMouseListener(new MouseAdapter() {
                 @Override