From cd690fb058e147f149696e38563afe3ef0621904 Mon Sep 17 00:00:00 2001 From: dipoo <120826531@qq.com> Date: Thu, 21 May 2015 20:01:43 +0800 Subject: [PATCH] version 0.65 --- README.md | 5 ++--- src/org/arong/egdownloader/model/Setting.java | 2 +- .../arong/egdownloader/ui/ComponentConst.java | 2 +- .../arong/egdownloader/ui/IconManager.java | 20 +++++++++---------- .../arong/egdownloader/ui/swing/AJButton.java | 6 +++--- .../ui/table/SearchTasksTable.java | 16 ++++++++++++++- .../ui/window/AboutMenuWindow.java | 4 ++-- .../egdownloader/ui/window/InitWindow.java | 2 +- .../arong/egdownloader/version/Version.java | 4 ++-- 9 files changed, 37 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 7d10950..87fe642 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ egdownloader ============ -适合里站，表站未知（访问不了~囧）。 +适合里站，表站未知; -百度网盘：[egdownloader0.60.exe](http://pan.baidu.com/s/1i3ioXmt) 下载。 +百度网盘：[egdownloader0.65.exe](http://pan.baidu.com/s/1hqGjq5I) 下载。 -![结构](./ui.png) diff --git a/src/org/arong/egdownloader/model/Setting.java b/src/org/arong/egdownloader/model/Setting.java index 1142d5f..ae26eae 100644 --- a/src/org/arong/egdownloader/model/Setting.java +++ b/src/org/arong/egdownloader/model/Setting.java @@ -55,7 +55,7 @@ public class Setting { private String showPicSuffix = "\"";//浏览漫画的地址后缀 private String realUrlPrefix = "作       者：" + + " 一周年版作       者：" + Version.AUTHOR + "
版       本：" + Version.VERSION +"              检查新版本
更新时间：" + Version.MODIFLIED + "
项目地址：https://github.com/dipoo/egdownloader" + diff --git a/src/org/arong/egdownloader/ui/IconManager.java b/src/org/arong/egdownloader/ui/IconManager.java index 5197a2f..2d31ba1 100644 --- a/src/org/arong/egdownloader/ui/IconManager.java +++ b/src/org/arong/egdownloader/ui/IconManager.java @@ -46,52 +46,52 @@ public static ImageIcon getIcon(String name){ return loadingImage; }else if("artistcg".equals(name)){ if(artistcgImage == null){ - artistcgImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "ARTISTCG.png")); + artistcgImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "artistcg.png")); } return artistcgImage; }else if("asianporn".equals(name)){ if(asianpornImage == null){ - asianpornImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "ASIANPORN.png")); + asianpornImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "asianporn.png")); } return asianpornImage; }else if("cosplay".equals(name)){ if(cosplayImage == null){ - cosplayImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "COSPLAY.png")); + cosplayImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "cosplay.png")); } return cosplayImage; }else if("doujinshi".equals(name)){ if(doujinshiImage == null){ - doujinshiImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "DOUJINSHI.png")); + doujinshiImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "doujinshi.png")); } return doujinshiImage; }else if("gamecg".equals(name)){ if(gamecgImage == null){ - gamecgImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "GAMECG.png")); + gamecgImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "gamecg.png")); } return gamecgImage; }else if("imageset".equals(name)){ if(imagesetImage == null){ - imagesetImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "IMAGESET.png")); + imagesetImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "imageset.png")); } return imagesetImage; }else if("manga".equals(name)){ if(mangaImage == null){ - mangaImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "MANGA.png")); + mangaImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "manga.png")); } return mangaImage; }else if("misc".equals(name)){ if(miscImage == null){ - miscImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "MISC.png")); + miscImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "misc.png")); } return miscImage; }else if("non-h".equals(name)){ if(non_hImage == null){ - non_hImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "NON-H.png")); + non_hImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "non-h.png")); } return non_hImage; }else if("western".equals(name)){ if(westernImage == null){ - westernImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "WESTERN.png")); + westernImage = new ImageIcon(IconManager.class.getResource(ComponentConst.ICON_PATH + "western.png")); } return westernImage; } diff --git a/src/org/arong/egdownloader/ui/swing/AJButton.java b/src/org/arong/egdownloader/ui/swing/AJButton.java index e17f38b..a97f288 100644 --- a/src/org/arong/egdownloader/ui/swing/AJButton.java +++ b/src/org/arong/egdownloader/ui/swing/AJButton.java @@ -72,7 +72,7 @@ public void mouseEntered(MouseEvent e) { public AJButton(String text, String name, String icon, ActionListener actionListener, int x, int y, int width, int height) { this(text, name, actionListener, x, y, width, height); - if(icon != null){ + if(icon != null && !"".equals(icon)){ try{ this.setIcon(new ImageIcon(getClass().getResource(ComponentConst.ICON_PATH + icon))); }catch(Exception e){ @@ -85,7 +85,7 @@ public AJButton(String text, String name, String icon, MouseListener mouseListen this(text, name, null, x, y, width, height); if(mouseListener != null) this.addMouseListener(mouseListener); - if(icon != null){ + if(icon != null && !"".equals(icon)){ try{ this.setIcon(new ImageIcon(getClass().getResource(ComponentConst.ICON_PATH + icon))); }catch(Exception e){ @@ -128,7 +128,7 @@ public void mouseEntered(MouseEvent e) { public AJButton(String text, String icon){ this(text); - if(icon != null){ + if(icon != null && !"".equals(icon)){ try{ this.setIcon(new ImageIcon(getClass().getResource(ComponentConst.ICON_PATH + icon))); }catch(Exception e){ diff --git a/src/org/arong/egdownloader/ui/table/SearchTasksTable.java b/src/org/arong/egdownloader/ui/table/SearchTasksTable.java index c696ed7..3ecaeea 100644 --- a/src/org/arong/egdownloader/ui/table/SearchTasksTable.java +++ b/src/org/arong/egdownloader/ui/table/SearchTasksTable.java @@ -233,7 +233,21 @@ public void doWork(Window window, ActionEvent e) { comicWindow.searchBtn.doClick(); } })); - table.popupMenu = new AJPopupMenu(downItem, openPageItem, openBtPageItem, searchTitleItem); + JMenuItem searchAuthorItem = new AJMenuItem("搜索作者", Color.BLACK, "", + new MenuItemActonListener(comicWindow.mainWindow, new IMenuListenerTask() { + public void doWork(Window window, ActionEvent e) { + final SearchTask task = table.getTasks().get(table.getSelectedRow()); + String name = task.getName(); + if(name != null){ + if(name.indexOf("[") != -1 && name.indexOf("]") != -1 && name.indexOf("[") < name.indexOf("]")){ + name = name.substring(name.indexOf("[") + 1, name.indexOf("]")); + comicWindow.keyField.setText(name); + comicWindow.searchBtn.doClick(); + } + } + } + })); + table.popupMenu = new AJPopupMenu(downItem, openPageItem, openBtPageItem, searchTitleItem, searchAuthorItem); } table.popupMenu.show(table, e.getPoint().x, e.getPoint().y); } diff --git a/src/org/arong/egdownloader/ui/window/AboutMenuWindow.java b/src/org/arong/egdownloader/ui/window/AboutMenuWindow.java index 70aaaea..827ffe8 100644 --- a/src/org/arong/egdownloader/ui/window/AboutMenuWindow.java +++ b/src/org/arong/egdownloader/ui/window/AboutMenuWindow.java @@ -45,7 +45,7 @@ public AboutMenuWindow(final JFrame mainWindow) { // 设置主窗口 this.setSize(340, 250); this.setIconImage(new ImageIcon(getClass().getResource(ComponentConst.ICON_PATH + ComponentConst.SKIN_NUM + ComponentConst.SKIN_ICON.get("user"))).getImage()); - this.setTitle("about"); + this.setTitle("关于"); this.setVisible(true); this.setResizable(false); this.setLocationRelativeTo(mainWindow); @@ -79,7 +79,7 @@ public void hyperlinkUpdate(HyperlinkEvent e) { String egVersion = WebClient.getRequestUseJava(ComponentConst.EG_VERSION_URL, null); Map version = JsonUtil.json2Map(egVersion); if(! Version.VERSION.equals(version.get("version"))){ - int r = JOptionPane.showConfirmDialog(this_, "最新版本号为：" + version.get("version") + ",是否前往下载？"); + int r = JOptionPane.showConfirmDialog(this_, "最新版本号为：" + version.get("version") + "，是否前往下载？"); if(r == JOptionPane.OK_OPTION){ try { Desktop.getDesktop().browse(new URI(version.get("url"))); diff --git a/src/org/arong/egdownloader/ui/window/InitWindow.java b/src/org/arong/egdownloader/ui/window/InitWindow.java index 8d570d7..5575586 100644 --- a/src/org/arong/egdownloader/ui/window/InitWindow.java +++ b/src/org/arong/egdownloader/ui/window/InitWindow.java @@ -71,7 +71,7 @@ protected void paintComponent(Graphics g) { }; backPanel.setLayout(null); backPanel.setBounds(0, 0, icon.getIconWidth(), icon.getIconHeight()); - JLabel v = new AJLabel(Version.NAME + "v" + Version.VERSION, Color.WHITE, 0, 10, icon.getIconWidth(), 30); + JLabel v = new AJLabel(Version.NAME + "v" + Version.VERSION + "周年版", Color.WHITE, 0, 10, icon.getIconWidth(), 30); v.setHorizontalAlignment(JLabel.CENTER); textLabel = new AJLabel("程序初始化",Color.WHITE,0,100,icon.getIconWidth(),30); textLabel.setHorizontalAlignment(JLabel.CENTER); diff --git a/src/org/arong/egdownloader/version/Version.java b/src/org/arong/egdownloader/version/Version.java index 3a88620..ed33b9c 100644 --- a/src/org/arong/egdownloader/version/Version.java +++ b/src/org/arong/egdownloader/version/Version.java @@ -8,10 +8,10 @@ public final class Version { // 程序名 public final static String NAME = "EG下载器"; // 程序版本号 - public final static String VERSION = "0.60"; + public final static String VERSION = "0.65"; // 程序作者 public final static String AUTHOR = "dipoo"; // 程序最后修改时间 - public final static String MODIFLIED = "2015-03-25"; + public final static String MODIFLIED = "2015-05-21"; }