Merge pull request #110 from rememberber/develop

Develop
rememberber · Apr 25, 2019 · ac60195 · ac60195
2 parents a948754 + ea88f7f
commit ac60195
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 52 deletions.
diff --git a/readme.md b/readme.md
@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://github.com/rememberber/WePush">
-   <img alt="WePush-Logo" src="https://github.com/rememberber/WePush/blob/master/src/main/resources/icon/logo-md.png?raw=true">
+   <img alt="WePush-Logo" src="https://raw.githubusercontent.com/rememberber/WePush/master/src/main/resources/icon/logo-md.png">
   </a>
 </p>
 
@@ -17,65 +17,65 @@
 
 ### 截图速览
 <p align="center">
-  <a href="https://github.com/rememberber/WePush">
-   <img alt="WePush" src="https://github.com/rememberber/WePush/blob/master/screen_shoot/%E5%9B%BE%E5%83%8F%20198.png?raw=true">
+  <a href="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20198.png">
+   <img alt="WePush" src="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20198.png">
   </a>
 </p>  
 <p align="center">
-  <a href="https://github.com/rememberber/WePush">
-   <img alt="WePush" src="https://github.com/rememberber/WePush/blob/master/screen_shoot/%E5%9B%BE%E5%83%8F%20199.png?raw=true">
+  <a href="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20199.png">
+   <img alt="WePush" src="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20199.png">
   </a>
 </p>
 <p align="center">
-  <a href="https://github.com/rememberber/WePush">
-   <img alt="WePush" src="https://github.com/rememberber/WePush/blob/master/screen_shoot/%E5%9B%BE%E5%83%8F%20200.png?raw=true">
+  <a href="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20200.png">
+   <img alt="WePush" src="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20200.png">
   </a>
 </p>
 <p align="center">
-  <a href="https://github.com/rememberber/WePush">
-   <img alt="WePush" src="https://github.com/rememberber/WePush/blob/master/screen_shoot/%E5%9B%BE%E5%83%8F%20202.png?raw=true">
+  <a href="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20202.png">
+   <img alt="WePush" src="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20202.png">
   </a>
 </p>
 <p align="center">
-  <a href="https://github.com/rememberber/WePush">
-   <img alt="WePush" src="https://github.com/rememberber/WePush/blob/master/screen_shoot/%E5%9B%BE%E5%83%8F%20204.png?raw=true">
+  <a href="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20204.png">
+   <img alt="WePush" src="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20204.png">
   </a>
 </p>
 <p align="center">
-  <a href="https://github.com/rememberber/WePush">
-   <img alt="WePush" src="https://github.com/rememberber/WePush/blob/master/screen_shoot/%E5%9B%BE%E5%83%8F%20205.png?raw=true">
+  <a href="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20205.png">
+   <img alt="WePush" src="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20205.png">
   </a>
 </p>
 <p align="center">
-  <a href="https://github.com/rememberber/WePush">
-   <img alt="WePush" src="https://github.com/rememberber/WePush/blob/master/screen_shoot/%E5%9B%BE%E5%83%8F%20206.png?raw=true">
+  <a href="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20206.png">
+   <img alt="WePush" src="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20206.png">
   </a>
 </p>
 <p align="center">
-  <a href="https://github.com/rememberber/WePush">
-   <img alt="WePush" src="https://github.com/rememberber/WePush/blob/master/screen_shoot/%E5%9B%BE%E5%83%8F%20207.png?raw=true">
+  <a href="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20207.png">
+   <img alt="WePush" src="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/%E5%9B%BE%E5%83%8F%20207.png">
   </a>
 </p>
 
 ### 更多皮肤
 <p align="center">
-  <a href="https://github.com/rememberber/WePush">
-   <img alt="WePush" src="https://github.com/rememberber/WePush/blob/master/screen_shoot/Image001.png?raw=true">
+  <a href="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/Image001.png">
+   <img alt="WePush" src="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/Image001.png">
   </a>
 </p> 
 <p align="center">
-  <a href="https://github.com/rememberber/WePush">
-   <img alt="WePush" src="https://github.com/rememberber/WePush/blob/master/screen_shoot/Image002.png?raw=true">
+  <a href="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/Image002.png">
+   <img alt="WePush" src="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/Image002.png">
   </a>
 </p> 
 <p align="center">
-  <a href="https://github.com/rememberber/WePush">
-   <img alt="WePush" src="https://github.com/rememberber/WePush/blob/master/screen_shoot/Image003.png?raw=true">
+  <a href="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/Image003.png">
+   <img alt="WePush" src="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/Image003.png">
   </a>
 </p> 
 <p align="center">
-  <a href="https://github.com/rememberber/WePush">
-   <img alt="WePush" src="https://github.com/rememberber/WePush/blob/master/screen_shoot/Image1.png?raw=true">
+  <a href="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/Image1.png">
+   <img alt="WePush" src="https://raw.githubusercontent.com/rememberber/WePush/master/screen_shoot/Image1.png">
   </a>
 </p> 
 

diff --git a/src/main/java/com/fangxuele/tool/push/App.java b/src/main/java/com/fangxuele/tool/push/App.java
@@ -22,7 +22,8 @@ public static void main(String[] args) {
         Init.initTheme();
         mainFrame = new MainFrame();
         mainFrame.init();
-        mainFrame.add(new LoadingForm().getLoadingPanel());
+        JPanel loadingPanel = new LoadingForm().getLoadingPanel();
+        mainFrame.add(loadingPanel);
         mainFrame.pack();
         mainFrame.setVisible(true);
 
@@ -33,6 +34,7 @@ public static void main(String[] args) {
             Init.initOthers();
             mainFrame.setContentPane(MainWindow.mainWindow.mainPanel);
             mainFrame.addListeners();
+            mainFrame.remove(loadingPanel);
         });
     }
 }
diff --git a/src/main/java/com/fangxuele/tool/push/ui/Init.java b/src/main/java/com/fangxuele/tool/push/ui/Init.java
@@ -18,16 +18,12 @@
 import com.intellij.uiDesigner.core.GridConstraints;
 import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.uiDesigner.core.Spacer;
-import com.sun.java.swing.plaf.motif.MotifLookAndFeel;
-import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
 import org.apache.commons.lang3.StringUtils;
 import org.jb2011.lnf.beautyeye.BeautyEyeLNFHelper;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
 import javax.swing.plaf.FontUIResource;
-import javax.swing.plaf.metal.MetalLookAndFeel;
-import javax.swing.plaf.nimbus.NimbusLookAndFeel;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.text.html.HTMLEditorKit;
@@ -130,18 +126,6 @@ public static void initTheme() {
                 case "系统默认":
                     UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
                     break;
-                case "Windows":
-                    UIManager.setLookAndFeel(WindowsLookAndFeel.class.getName());
-                    break;
-                case "Nimbus":
-                    UIManager.setLookAndFeel(NimbusLookAndFeel.class.getName());
-                    break;
-                case "Metal":
-                    UIManager.setLookAndFeel(MetalLookAndFeel.class.getName());
-                    break;
-                case "Motif":
-                    UIManager.setLookAndFeel(MotifLookAndFeel.class.getName());
-                    break;
                 case "Darcula(推荐)":
                 default:
                     UIManager.setLookAndFeel("com.bulenkov.darcula.DarculaLaf");

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/MainWindow.form b/src/main/java/com/fangxuele/tool/push/ui/form/MainWindow.form
@@ -1925,12 +1925,8 @@
                               <model>
                                 <item value="Darcula(推荐)"/>
                                 <item value="BeautyEye"/>
-                                <item value="weblaf"/>
                                 <item value="系统默认"/>
-                                <item value="Windows"/>
-                                <item value="Nimbus"/>
-                                <item value="Metal"/>
-                                <item value="Motif"/>
+                                <item value="weblaf"/>
                               </model>
                             </properties>
                           </component>

diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/MainWindow.java b/src/main/java/com/fangxuele/tool/push/ui/form/MainWindow.java
@@ -924,12 +924,8 @@ public class MainWindow {
         final DefaultComboBoxModel defaultComboBoxModel5 = new DefaultComboBoxModel();
         defaultComboBoxModel5.addElement("Darcula(推荐)");
         defaultComboBoxModel5.addElement("BeautyEye");
-        defaultComboBoxModel5.addElement("weblaf");
         defaultComboBoxModel5.addElement("系统默认");
-        defaultComboBoxModel5.addElement("Windows");
-        defaultComboBoxModel5.addElement("Nimbus");
-        defaultComboBoxModel5.addElement("Metal");
-        defaultComboBoxModel5.addElement("Motif");
+        defaultComboBoxModel5.addElement("weblaf");
         settingThemeComboBox.setModel(defaultComboBoxModel5);
         panel20.add(settingThemeComboBox, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final JLabel label30 = new JLabel();