瀏覽代碼

added DefaultUIFile library to buildpackage

LH 10 年之前
父節點
當前提交
786879a39e

+ 0 - 3
.gitignore

@@ -53,7 +53,4 @@ IZSetup/distPackagerBase/64b/dist/iZsetup_setup.jar
 !*/lib/*
 #petzende files
 *.log
-.log
-IZSetup/iZs.log
-IZSetup/iZs-e.log
 !gradle/wrapper/*

+ 14 - 0
DefaultUiFile/build.gradle

@@ -0,0 +1,14 @@
+defaultTasks 'distZip'
+
+apply plugin: 'java'
+
+
+task distZip(dependsOn: 'jar') {
+	//NO-OPtask als redirect
+}
+
+distZip.inputs.file file(tasks.jar.archivePath)
+distZip.outputs.file file(tasks.jar.archivePath)
+repositories{
+	jcenter()
+}

+ 18 - 0
DefaultUiFile/src/main/java/de/nplusc/izc/tools/UIToolz/rsrc/UIFile.java

@@ -0,0 +1,18 @@
+package de.nplusc.izc.tools.UIToolz.rsrc;
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ *
+ * @author LH
+ */
+public class UIFile
+{
+    private UIFile()
+    {
+        //used to get it as a library
+    }
+}

+ 50 - 0
DefaultUiFile/src/main/java/de/nplusc/izc/tools/UIToolz/rsrc/UIFile.yml

@@ -0,0 +1,50 @@
+FontColor: 
+  R: I|170
+  G: I|220
+  B: I|240
+  A: I|200
+Font:
+  FontName: S|Lucida Console
+  Bold: B|Yes
+  Size: I|15
+tabBar:
+  Gfx: U|rsrc/GUI-FIle_TabWritten.png
+  BarBasePoint: P|0|0
+  BarWidth: I|1000
+  BarHeight: I|20
+  TabWidth: I|200
+  TabHeight: I|20
+  TabBasePoint: P|50|0
+MainCfg:
+  WindowBasePoint: P|200|120
+  LinesBasePoint: P|5|25
+  LineWidth: I|930
+  LineHeight: I|14
+  LineCount: I|25
+  ScrollBarHeight: Remark|Determined by LineCount*LineSize
+  ScrollBarWidth: I|15
+  ScrollBarBasePoint: P|935|25
+  InputLineHeight: I|17
+  InputLineWidth: I|860 
+  InputLineBasePoint: P|54|412
+  ICO: U|rsrc/icon.png
+  GFX: U|rsrc/GUI-File-CMD-IP-Main.png
+  FullTrans: U|rsrc/GUI-File-FullTrans.png
+  WindowSizeX: I|960
+  WindowSizeY: I|480
+okButton:
+  BP1: P|27|16
+  BP2: P|73|16
+  BP3: P|85|1
+  BP4: P|152|1
+  BP5: P|155|8
+  BP6: P|209|7
+  BP7: P|229|27
+  BP8: P|168|47
+  BP9: P|12|47
+  BP10: P|6|36
+  ButtonGlowGFX: U|rsrc/GUI-File-CMD-IP-BTN-Red.png
+  ButtonDfltGFX: U|rsrc/GUI-File-CMD-IP-BTN-Blue.png
+  ButtonAreaHeight: I|48
+  ButtonAreaWidth: I|233
+  ButtonAreaBasePoint: P|630|432

+ 47 - 0
DefaultUiFile/src/main/resources/UIFile.yml

@@ -0,0 +1,47 @@
+FontColor: 
+  R: I|170
+  G: I|220
+  B: I|240
+  A: I|200
+Font:
+  FontName: S|Lucida Console
+  Bold: B|Yes
+  Size: I|15
+tabBar:
+  Gfx: U|rsrc/GUI-FIle_TabWritten.png
+  BarBasePoint: 'P|0|0'
+  BarWidth: I|1000
+  BarHeight: I|20
+  TabWidth: I|200
+  TabHeight: I|20
+  TabBasePoint: P|50|0
+MainCfg:
+  WindowBasePoint: P|200|120
+  LinesBasePoint: P|5|25
+  LineWidth: I|930
+  LineHeight: I|14
+  LineCount: I|25
+  ScrollBarHeight: Remark|Determined by LineCount*LineSize
+  ScrollBarWidth: I|15
+  ScrollBarBasePoint: P|935|25
+  InputLineHeight: I|17
+  InputLineWidth: I|860 
+  InputLineBasePoint: P|54|412#
+  ICO: U|rsrc/icon.png
+  GFX: U|rsrc/GUI-File-CMD-IP-Main.png
+okButton:
+  BP1: P|27|16
+  BP2: P|73|16
+  BP3: P|85|1
+  BP4: P|152|1
+  BP5: P|155|8
+  BP6: P|209|7
+  BP7: P|229|27
+  BP8: P|168|47
+  BP9: P|12|47
+  BP10: P|6|36
+  ButtonGlowGFX: U|rsrc/GUI-File-CMD-IP-BTN-Red.png,
+  ButtonDfltGFX: U|rsrc/GUI-File-CMD-IP-BTN-Blue.png
+  ButtonAreaHeight: I|48
+  ButtonAreaWidth: I|233
+  ButtonAreaPos: P|630|432

二進制
DefaultUiFile/src/main/resources/rsrc/FontPage1.png


二進制
DefaultUiFile/src/main/resources/rsrc/GUI-FIle_TabWritten.png


二進制
DefaultUiFile/src/main/resources/rsrc/GUI-File-CMD-IP-BTN-Blue.png


二進制
DefaultUiFile/src/main/resources/rsrc/GUI-File-CMD-IP-BTN-Red.png


二進制
DefaultUiFile/src/main/resources/rsrc/GUI-File-CMD-IP-Main.png


二進制
DefaultUiFile/src/main/resources/rsrc/GUI-File-CMD-IP-SLDR.png


二進制
DefaultUiFile/src/main/resources/rsrc/GUI-File-FullTrans.png


二進制
DefaultUiFile/src/main/resources/rsrc/GUI-File-OVL-TxA.png


二進制
DefaultUiFile/src/main/resources/rsrc/GUI-File-mainMEnue.png


二進制
DefaultUiFile/src/main/resources/rsrc/icon.png


+ 3 - 0
ToolKit/build.gradle

@@ -29,5 +29,8 @@ dependencies{
 	compile 'uk.co.caprica:vlcj:3.0.1' //HACK! bezüglich JNA
     compile	'org.xerial:sqlite-jdbc:3.8.7'
 	compile 'mysql:mysql-connector-java:5.1.6'
+		compile(project(':DefaultUIFile')) {
+        transitive = false
+    }
 
 }

二進制
ToolKit/lib/DefaultUiFile.jar


+ 13 - 1
iZpl/src/main/java/de/nplusc/izc/iZpl/Utils/VlcInterface.java

@@ -5,6 +5,7 @@
  */
 package de.nplusc.izc.iZpl.Utils;
 
+import de.nplusc.izc.tools.IOtools.NativeUtils;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -19,7 +20,12 @@ public class VlcInterface implements PlayerInterface
 {
     private VlcInterface instance;
     
-    private VlcInterface (String vlcpath)
+    private VlcInterface ()
+    {
+        
+    }
+    
+    private VlcInterface (String vlcpath,boolean bundledVersion)
     {
         
     }
@@ -45,6 +51,12 @@ public class VlcInterface implements PlayerInterface
     
     private class VlcJIterface
     {
+        public VlcJIterface(String vlcpath)
+        {
+            
+        }
+        
+        
         public int getLengthInSeconds()
         {
             return 0;

+ 1 - 1
settings.gradle

@@ -1 +1 @@
-include 'ToolKit','iZpl',  'izsetup','WPCMgr','UpidTK', 'izstreamer', 'LogBlockHeatMapper'
+include 'ToolKit','iZpl',  'izsetup','WPCMgr','UpidTK', 'izstreamer', 'LogBlockHeatMapper','DefaultUIFile'