Skip to content

Commit e2e876c

Browse files
author
Tino Reichardt
committed
minor fixes, and version bump to 1.0 (windows apps are starting with 1.0)
1 parent 041f0f3 commit e2e876c

File tree

5 files changed

+5259
-29
lines changed

5 files changed

+5259
-29
lines changed

DS-Layout/DS-Layout.au3

+23-18
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,23 @@
44
#AutoIt3Wrapper_Compression=4
55
#AutoIt3Wrapper_Compile_Both=y
66
#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
1212
#AutoIt3Wrapper_Res_Language=1031
1313
#AutoIt3Wrapper_Res_Field=Productname|DS-Layout
1414
#AutoIt3Wrapper_Res_Field=CompanyName|Tino Reichardt
1515
#AutoIt3Wrapper_Res_Field=Compile Date|%date% %time%
1616
#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
2117
#AutoIt3Wrapper_Run_Tidy=y
2218
#AutoIt3Wrapper_Tidy_Stop_OnError=n
2319
#AutoIt3Wrapper_Run_Au3Stripper=y
2420
#EndRegion ;**** Directives created by AutoIt3Wrapper_GUI ****
2521

2622
#cs
27-
Copyright © 2015 - 2016 Tino Reichardt
23+
Copyright © 2015 - 2017 Tino Reichardt
2824
2925
This program is free software; you can redistribute it and/or modify
3026
it under the terms of the GNU General Public License Version 2, as
@@ -37,7 +33,7 @@
3733
#ce
3834

3935
; ctime: /TR 2015-08-14
40-
; mtime: /TR 2016-03-17
36+
; mtime: /TR 2017-01-06
4137

4238
#include <Array.au3>
4339
#include <AutoItConstants.au3>
@@ -61,7 +57,6 @@
6157
#include <WinAPIShPath.au3>
6258
#include <GDIPlus.au3>
6359

64-
#include "BinaryCall.au3"
6560
#include "DS-Layout_Icons.au3"
6661
#include "DS-Layout_Tools.au3"
6762

@@ -73,7 +68,7 @@ Opt("WinTitleMatchMode", 2)
7368

7469
; Titel, Name und so weiter definieren...
7570
Global Const $sTitle = " " & "Layout Designer"
76-
Global Const $sVersion = "0.3"
71+
Global Const $sVersion = "1.0"
7772
Global Const $sAppName = "DS-Layout"
7873
Global Const $sAppPath = @AppDataDir & "\" & $sAppName & "\"
7974
Global Const $sIniFile = @AppDataDir & "\" & $sAppName & "\" & $sAppName & ".ini"
@@ -89,10 +84,13 @@ Global $sMyState = ""
8984
16:10 -> 800 x 500 (1.6)
9085
4:3 -> 800 x 600 (1.333)
9186
#ce
92-
Global Const $aResolution[3][3] = [ _
87+
Global Const $aResolution[6][3] = [ _
9388
["800x450 (16:9)", 800, 450], _
9489
["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]]
9694
;_ArrayDisplay($aResolution)
9795

9896
; ToolBox
@@ -115,7 +113,7 @@ Global Enum $eTB_New = 2000, $eTB_Open, $eTB_Save
115113
; $eL_File Datei des Layouts
116114
; $eL_Path Pfad zur Layout Datei
117115
; $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
119117
Global $aLayouts[1][5] = [[0, 0, 0, 0, 0]]
120118
Global Enum $eL_Handle = 0, $eL_Path, $eL_File, $eL_State, $eL_Resolution
121119
Global $hLastLayout = 0
@@ -621,7 +619,7 @@ Func Layout_Create_Control($hLayout, $sType, $pName = -1, $pLeft = -1, $pTop = -
621619
If $iHeight = -1 Then $iHeight = 187
622620
$iColor = 0x99ccdd
623621
Case "Ticker"
624-
If $iWidth = -1 Then $iWidth = 784
622+
If $iWidth = -1 Then $iWidth = 384
625623
If $iHeight = -1 Then $iHeight = 40
626624
$iColor = 0xff99cc
627625
Case "Wetter"
@@ -1177,6 +1175,12 @@ Func Control_CheckUpdate($sUpdateTyp, $iPropCtrl, $iCtrl, $hLayout)
11771175
$iRes = 1
11781176
Case $aResolution[2][0]
11791177
$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
11801184
EndSwitch
11811185
$aLayouts[$iLayout][$eL_Resolution] = $iRes
11821186
Local $iX = $aResolution[$iRes][1]
@@ -1382,7 +1386,8 @@ Func Layout_Properties($hWnd)
13821386
Local $idComboBox, $sRes
13831387
GUICtrlCreateLabel("Auflösung:", 8, 11, 54, 17)
13841388
$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]
13861391
GUICtrlSetData($idComboBox, $sRes, $aResolution[0][0])
13871392

13881393
; 0 = Funktion (X, Y, W, H, Name)

0 commit comments

Comments
 (0)