4
4
#AutoIt3Wrapper_Compression= 4
5
5
#AutoIt3Wrapper_Compile_Both= y
6
6
#AutoIt3Wrapper_UseX64= y
7
- #AutoIt3Wrapper_Res_Comment= Homepage: http :// www.mcmilk.de / projects / DS - Layout /
8
- #AutoIt3Wrapper_Res_Description= Layout Designer for Digital Signage Background Daemon
9
- #AutoIt3Wrapper_Res_Fileversion= 0.3 .0.0
10
- #AutoIt3Wrapper_Res_ProductVersion= 0.3 .0.0
11
- #AutoIt3Wrapper_Res_LegalCopyright= © 2015 - 2016 Tino Reichardt
7
+ #AutoIt3Wrapper_Res_Comment= Homepage: https :// www.open - digital - signage.org /
8
+ #AutoIt3Wrapper_Res_Description= Digital Signage - Layout Designer
9
+ #AutoIt3Wrapper_Res_Fileversion= 1.0 .0.0
10
+ #AutoIt3Wrapper_Res_ProductVersion= 1.0 .0.0
11
+ #AutoIt3Wrapper_Res_LegalCopyright= © 2015 - 2017 Tino Reichardt
12
12
#AutoIt3Wrapper_Res_Language= 1031
13
13
#AutoIt3Wrapper_Res_Field= Productname|DS- Layout
14
14
#AutoIt3Wrapper_Res_Field= CompanyName|Tino Reichardt
15
15
#AutoIt3Wrapper_Res_Field= Compile Date|%date% %time%
16
16
#AutoIt3Wrapper_Run_After= echo %fileversion% > prog.txt
17
- #AutoIt3Wrapper_Run_After= mpress - q - r - s DS- Layout.exe
18
- #AutoIt3Wrapper_Run_After= mpress - q - r - s DS- Layout_x64.exe
19
- #AutoIt3Wrapper_Run_After= signtool sign / v / tr http:// time.certum.pl/ / f DS- Layout.p12 / p pass DS- Layout.exe
20
- #AutoIt3Wrapper_Run_After= signtool sign / v / tr http:// time.certum.pl/ / f DS- Layout.p12 / p pass DS- Layout_x64.exe
21
17
#AutoIt3Wrapper_Run_Tidy= y
22
18
#AutoIt3Wrapper_Tidy_Stop_OnError= n
23
19
#AutoIt3Wrapper_Run_Au3Stripper= y
24
20
#EndRegion ;**** Directives created by AutoIt3Wrapper_GUI ****
25
21
26
22
#cs
27
- Copyright © 2015 - 2016 Tino Reichardt
23
+ Copyright © 2015 - 2017 Tino Reichardt
28
24
29
25
This program is free software; you can redistribute it and/or modify
30
26
it under the terms of the GNU General Public License Version 2, as
37
33
#ce
38
34
39
35
; ctime: /TR 2015-08-14
40
- ; mtime: /TR 2016-03-17
36
+ ; mtime: /TR 2017-01-06
41
37
42
38
#include < Array.au3>
43
39
#include < AutoItConstants.au3>
61
57
#include < WinAPIShPath.au3>
62
58
#include < GDIPlus.au3>
63
59
64
- #include " BinaryCall.au3"
65
60
#include " DS-Layout_Icons.au3"
66
61
#include " DS-Layout_Tools.au3"
67
62
@@ -73,7 +68,7 @@ Opt("WinTitleMatchMode", 2)
73
68
74
69
; Titel, Name und so weiter definieren...
75
70
Global Const $sTitle = " " & " Layout Designer"
76
- Global Const $sVersion = " 0.3 "
71
+ Global Const $sVersion = " 1.0 "
77
72
Global Const $sAppName = " DS-Layout"
78
73
Global Const $sAppPath = @AppDataDir & " \" & $sAppName & " \"
79
74
Global Const $sIniFile = @AppDataDir & " \" & $sAppName & " \" & $sAppName & " .ini"
@@ -89,10 +84,13 @@ Global $sMyState = ""
89
84
16:10 -> 800 x 500 (1.6)
90
85
4:3 -> 800 x 600 (1.333)
91
86
#ce
92
- Global Const $aResolution [3 ][3 ] = [ _
87
+ Global Const $aResolution [6 ][3 ] = [ _
93
88
[" 800x450 (16:9)" , 800 , 450 ], _
94
89
[" 800x500 (16:10)" , 800 , 500 ], _
95
- [" 800x600 (4:3)" , 800 , 600 ]]
90
+ [" 800x600 (4:3)" , 800 , 600 ], _
91
+ [" 450x800 (9:16)" , 450 , 800 ], _
92
+ [" 500x800 (10:16)" , 500 , 800 ], _
93
+ [" 600x800 (3:4)" , 600 , 800 ]]
96
94
; _ArrayDisplay($aResolution)
97
95
98
96
; ToolBox
@@ -115,7 +113,7 @@ Global Enum $eTB_New = 2000, $eTB_Open, $eTB_Save
115
113
; $eL_File Datei des Layouts
116
114
; $eL_Path Pfad zur Layout Datei
117
115
; $eL_State M = Modified, U = Unchanged
118
- ; $eL_Resolution 0(19:9) 1(16:10) 2(4:3) -> wie im Array $aResolution definiert
116
+ ; $eL_Resolution 0(19:9) 1(16:10) 2(4:3) 3(9:16) 4(10:16) 5(3:4) -> wie im Array $aResolution definiert
119
117
Global $aLayouts [1 ][5 ] = [[0 , 0 , 0 , 0 , 0 ]]
120
118
Global Enum $eL_Handle = 0 , $eL_Path , $eL_File , $eL_State , $eL_Resolution
121
119
Global $hLastLayout = 0
@@ -621,7 +619,7 @@ Func Layout_Create_Control($hLayout, $sType, $pName = -1, $pLeft = -1, $pTop = -
621
619
If $iHeight = - 1 Then $iHeight = 187
622
620
$iColor = 0x99ccdd
623
621
Case " Ticker"
624
- If $iWidth = - 1 Then $iWidth = 784
622
+ If $iWidth = - 1 Then $iWidth = 384
625
623
If $iHeight = - 1 Then $iHeight = 40
626
624
$iColor = 0xff99cc
627
625
Case " Wetter"
@@ -1177,6 +1175,12 @@ Func Control_CheckUpdate($sUpdateTyp, $iPropCtrl, $iCtrl, $hLayout)
1177
1175
$iRes = 1
1178
1176
Case $aResolution [2 ][0 ]
1179
1177
$iRes = 2
1178
+ Case $aResolution [3 ][0 ]
1179
+ $iRes = 3
1180
+ Case $aResolution [4 ][0 ]
1181
+ $iRes = 4
1182
+ Case $aResolution [5 ][0 ]
1183
+ $iRes = 5
1180
1184
EndSwitch
1181
1185
$aLayouts [$iLayout ][$eL_Resolution ] = $iRes
1182
1186
Local $iX = $aResolution [$iRes ][1 ]
@@ -1382,7 +1386,8 @@ Func Layout_Properties($hWnd)
1382
1386
Local $idComboBox , $sRes
1383
1387
GUICtrlCreateLabel (" Auflösung:" , 8 , 11 , 54 , 17 )
1384
1388
$idComboBox = GUICtrlCreateCombo (" " , 64 , 8 , 220 , 25 , BitOR ($CBS_DROPDOWN , $CBS_AUTOHSCROLL ))
1385
- $sRes = $aResolution [0 ][0 ] & " |" & $aResolution [1 ][0 ] & " |" & $aResolution [2 ][0 ]
1389
+ $sRes = $aResolution [0 ][0 ] & " |" & $aResolution [1 ][0 ] & " |" & $aResolution [2 ][0 ] & " |"
1390
+ $sRes &= $aResolution [3 ][0 ] & " |" & $aResolution [4 ][0 ] & " |" & $aResolution [5 ][0 ]
1386
1391
GUICtrlSetData ($idComboBox , $sRes , $aResolution [0 ][0 ])
1387
1392
1388
1393
; 0 = Funktion (X, Y, W, H, Name)
0 commit comments