tuning

Gruntfile.js

@@ -43,6 +43,9 @@ module.exports = function(grunt) {
 		exec: {
 			hta: {
 				cmd: 'copy /y /B "' + path.resolve(__dirname + '/icon.ico') + '" + "' + path.resolve(__dirname + '/test/index.html') + '" "' + path.resolve(__dirname + '/TimeTable2pdf.hta') + '"'
+			},
+			run: {
+				cmd: 'cmd /c start TimeTable2pdf.hta'
 			}
 		}
 	});

css/less_inc/folder.less

@@ -6,12 +6,13 @@
 		display: none;
 	}
 	#folderPathText {
-		width: 478px;
-		line-height: 1.6em;
+		width: 516px;
+		line-height: 25px;
 		overflow: hidden;
 		text-overflow: ellipsis;
-		font-size: .8em;
+		font-size: 14px;
 		border: 2px solid;
+		margin-right: 10px;
 		border-top-color: AppWorkspace;
 		border-left-color: AppWorkspace;
 		border-bottom-color: ButtonFace;

css/less_inc/footer.less

@@ -15,7 +15,7 @@
 		display: inline-block;
 		margin-top: 0;
 		margin-bottom: 0;
-		padding-bottom: .3em;
+		padding-bottom: 6px;
 		&.link {
 			padding-top: 5px;
 		}

css/less_inc/header.less

@@ -3,12 +3,15 @@
 	.help-icon {
 		position: absolute;
 		z-index: 1;
-		top: 1em;
-		right: 1em;
+		top: 10px;
+		right: 10px;
 		cursor: pointer;
 	}
 	h1 {
-		padding-left: 3em;
-		padding-right: 3em;
+		padding-left: 40px;
+		padding-right: 40px;
+		margin-top: 23px;
+		margin-bottom: 23px;
+		font-size: 25px;
 	}
 }

css/less_inc/init.less

@@ -12,7 +12,7 @@ html, body {
 	margin: 0;
 	background-color: @bg;
 	overflow: hidden;
-	font-size: .9em;
+	font-size: 16px;
 	line-height: 1.2;
 	height: 100%;
 }
@@ -21,7 +21,10 @@ input, button, label, .progress {
 }
 button, input[type=button] {
 	cursor: pointer;
-	font-size: .9em;
+	font-size: 16px;
+}
+input[type=text] {
+	font-size: 16px;
 }
 img {
 	display: inline-block;

css/less_inc/main.less

@@ -1,7 +1,7 @@
 
 .wrapper {
 	position: relative;
-	padding-bottom: 8.5em;
+	padding-bottom: 40px;
 	overflow: auto;
 	height: 100%;
 	overflow: hidden;
@@ -12,20 +12,28 @@
 		position: relative;
 		height: 100%;
 		.app {
-			width: 680px;
+			width: 690px;
 			margin-right: auto;
 			margin-left: auto;
 			position: relative;
-			padding: 2rem;
+			padding-top: 15px;
+			padding-bottom: 0;
+			padding-left: 15px;
+			padding-right: 15px;
 			font-family: Tahoma, sans-serif;
 			.button {
-				margin-top: 1.2em;
+				margin-top: 10px;
+				margin-bottom: 0;
 			}
 			#output {
-				line-height: 1.6em;
+				line-height: 16px;
 				overflow: hidden;
 				text-overflow: ellipsis;
-				font-size: .8em;
+				font-size: 12px;
+				margin-bottom: 3px;
+				margin-top: 5px;
+				font-style: italic;
+				color: #888888;
 			}
 		}
 	}

css/less_inc/type.less

@@ -1,8 +1,8 @@
 
 .type {
-	margin-bottom: 1.4em;
+	margin-bottom: 10px;
 	fieldset {
-		margin-top: .6em;
+		margin-top: 10px;
 		color: #333333;
 		&.first {
 			margin-top: 0;
@@ -37,19 +37,19 @@
 			}
 		}
 		p {
-			margin-bottom: .6em;
+			margin-bottom: 10px;
 		}
 	}
 	label {
 		display: block;
 		cursor: pointer;
-		margin-bottom: .6em;
+		margin-bottom: 10px;
 		&.last {
 			margin-bottom: unset;
 		}
 	}
 	input {
-		margin-right: .6em;
+		margin-right: 10px;
 		color: #000000;
 		&[type=text] {
 			width: 100%;

index.pug

@@ -13,7 +13,7 @@ html(lang="ru")
 			.main.clearfix
 				.app.clearfix
 					.type
-						fieldset(text="Наименование организации")
+						fieldset.first(text="Наименование организации")
 							legend
 								span Наименование организации
 							label.input-label

vbs/index.vbs

@@ -1,9 +1,13 @@
 Option Explicit
 
+Const GBOU_LINK = "https://komsomol.minobr63.ru/"
+Const GIT_LINK = "https://github.com/KSOSH/TimeTableWord2Pdf/"
+Const PROJECTSOFT_LINK = "https://projectsoft.ru/"
+
 Const PDF = 17
 Const cPrefixTitle = " КЛАССА НА "
-Const windowW = 1024
-Const windowH = 740
+Const windowW = 900
+Const windowH = 650
 
 Dim WShell: Set WShell = CreateObject("WScript.Shell")
 Dim objFSO: Set objFSO = CreateObject("Scripting.FileSystemObject")
@@ -239,15 +243,15 @@ Sub OU_OnChange()
 End Sub
 
 Sub GIT_OnClick()
-	WShell.Run "https://github.com/KSOSH/TimeTableWord2Pdf"
+	WShell.Run GIT_LINK
 End Sub
 
 Sub ProjectSoft_OnClick()
-	WShell.Run "https://projectsoft.ru/"
+	WShell.Run PROJECTSOFT_LINK
 End Sub
 
 Sub GBOU_OnClick()
-	WShell.Run "https://komsomol.minobr63.ru/"
+	WShell.Run GBOU_LINK
 End Sub
 
 Sub btnHelp_OnClick()
@@ -285,12 +289,18 @@ Sub btnConvert_OnClick()
 				regExc.Global = False
 				regExc.Pattern = "^~\$"
 				If Not regExc.Test(objFile.Name) Then
+					DoEvents(0)
+					fCount = fCount + 1
+					current = CStr(Round((fCount * 100) / (count))) & "%"
+					ProgressLine.style.width = current
+					ProgressVal.innerText = current
+					DoEvents(0)
 					tFName = objFile.Name
 					' Запускаем Word если он ещё не запущен
 					If objWord Is Nothing Then
 						Set objWord = CreateObject("Word.Application")
 					End If
-					output.innerText = tFName
+					output.innerText = "Конвертирование: " + tFName
 					' Пустой заголовок
 					docTitle = ""
 					' Открываем документ
@@ -332,12 +342,9 @@ Sub btnConvert_OnClick()
 					objDocument.Close
 					' Обнуляем переменную
 					' Set objDocument = Nothing
-					fCount = fCount + 1
-					current = CStr(Round((fCount * 100) / (count - 1))) & "%"
-					ProgressLine.style.width = current
-					ProgressVal.innerText = current
-					DoEvents(0)
 				End If
+			Else
+				count = count - 1
 			End If
 		Next
 		' Если Word запущен - закроем его