1.4 RELEASE

Added Compare Frame Changed Delete Icon Fixed Language Problems in Filenameparser Updated .gitignore to include libraries
Mikescher · Apr 2, 2013 · 3fa3624 · 3fa3624
1 parent 08ffb9e
commit 3fa3624
Show file tree

Hide file tree

Showing 31 changed files with 363 additions and 219 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,9 +46,14 @@ ClipCornDB/
 ClipCornDB*/
 data/
 jClipCorn_backup/
+build/
+javadoc/
+jClipCorn_backup/
+
+DerbManager*.jar
 
 *.bat
-*.jar
+
 *.log
 *jClipCorn.properties
 *.lnk

diff --git a/lib/DdlUtils-1.0.jar b/lib/DdlUtils-1.0.jar
diff --git a/lib/Fast-MD5.jar b/lib/Fast-MD5.jar
diff --git a/lib/commons-beanutils-1.8.3.jar b/lib/commons-beanutils-1.8.3.jar
diff --git a/lib/commons-betwixt-0.8.jar b/lib/commons-betwixt-0.8.jar
diff --git a/lib/commons-collections-3.2.1.jar b/lib/commons-collections-3.2.1.jar
diff --git a/lib/commons-digester-2.1.jar b/lib/commons-digester-2.1.jar
diff --git a/lib/commons-lang-2.6.jar b/lib/commons-lang-2.6.jar
diff --git a/lib/commons-logging-1.1.1.jar b/lib/commons-logging-1.1.1.jar
diff --git a/lib/derby-10.9.1.0.jar b/lib/derby-10.9.1.0.jar
diff --git a/lib/forms-1.3.jar b/lib/forms-1.3.jar
diff --git a/lib/jdom-2.0.4.jar b/lib/jdom-2.0.4.jar
diff --git a/lib/json.jar b/lib/json.jar
diff --git a/lib/laf-plugin-7.2.1.jar b/lib/laf-plugin-7.2.1.jar
diff --git a/lib/laf-widget-7.2.1.jar b/lib/laf-widget-7.2.1.jar
diff --git a/lib/substance-7.2.1.jar b/lib/substance-7.2.1.jar
diff --git a/lib/trident-7.2.1.jar b/lib/trident-7.2.1.jar
diff --git a/res/icons/toolbar/balance_unbalance.png b/res/icons/toolbar/balance_unbalance.png
diff --git a/res/icons/toolbar/recycle.png b/res/icons/toolbar/recycle.png
diff --git a/src/de/jClipCorn/Main.java b/src/de/jClipCorn/Main.java
@@ -13,7 +13,7 @@
 
 public class Main {
 	public final static String TITLE = "jClipCorn"; //$NON-NLS-1$
-	public final static String VERSION = "1.3";	//$NON-NLS-1$
+	public final static String VERSION = "1.4";	//$NON-NLS-1$
 	public final static String DBVERSION = "1.5"; 	//$NON-NLS-1$
 
 	private final static String PROPERTIES_PATH = "jClipcorn.properties"; //$NON-NLS-1$
@@ -75,4 +75,6 @@ private static void init() {
 
 //TODO Parsd die Lang hieraus net: "Last Samurai [Eng] (Part 1).avi"
 
-//TODO Title von Fenster mit Grossbuchstaben anfangen (addMov, getCover)
+//TODO Title von Fenster mit Grossbuchstaben anfangen (addMov, getCover)
+
+//TODO Apache Commons hacken und duplicate entry removen
diff --git a/src/de/jClipCorn/gui/Resources.java b/src/de/jClipCorn/gui/Resources.java
@@ -42,7 +42,7 @@ public class Resources {
 	public final static String ICN_MENUBAR_MOVESERIES		= registerICN("/icons/toolbar/move_to_folder.png");
 	public final static String ICN_MENUBAR_FILENAMERULES	= registerICN("/icons/toolbar/books.png");
 	public final static String ICN_MENUBAR_CREATE_JXMLBKP	= registerICN("/icons/toolbar/source_code.png");
-
+	public final static String ICN_MENUBAR_COMPARE			= registerICN("/icons/toolbar/balance_unbalance.png");
 	// #############################################  </MENUBAR>  ############################################
 
 

diff --git a/src/de/jClipCorn/gui/actionTree/CCActionTree.java b/src/de/jClipCorn/gui/actionTree/CCActionTree.java
@@ -225,7 +225,7 @@ public void actionPerformed(ActionEvent e) {
 			}
 		});
 
-		temp = extras.addChild(new CCActionElement("CompareDBs", "", null));
+		temp = extras.addChild(new CCActionElement("CompareDBs", "ClipMenuBar.Extras.CompareDBs", Resources.ICN_MENUBAR_COMPARE));
 		temp.addListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {