From d0ff9a607ee446697cfb36780ab7c5a20c622ffc Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Mon, 17 Aug 2020 17:42:21 +0200
Subject: [PATCH] backlog

---
 build.gradle                                                 | 5 ++++-
 src/main/java/pro/litvinovg/w2phtml/LogMapAppender.java      | 2 +-
 .../java/pro/litvinovg/w2phtml/gui/ConversionExecutor.java   | 1 +
 src/main/java/pro/litvinovg/w2phtml/gui/ResultsDialog.java   | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 81be627..1a033cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java'
 repositories{
   mavenCentral()
 }
-def releaseVersion = "0.7.4"
+def releaseVersion = "0.8.4"
 def propertyFile = file "src/main/java/w2phtml/project.properties"
 Properties properties = new Properties()
 propertyFile.withReader { properties.load(it) }
@@ -131,6 +131,9 @@ task xhtml2(type: Jar) {
         from sourceSets.main.output
         include 'org/**/*'
         include 'net/**/*'
+        include 'logback.xml'
+        include 'ch/*'
+        include '**/*.properties'
 }
 
 
diff --git a/src/main/java/pro/litvinovg/w2phtml/LogMapAppender.java b/src/main/java/pro/litvinovg/w2phtml/LogMapAppender.java
index b335aaf..25becd6 100644
--- a/src/main/java/pro/litvinovg/w2phtml/LogMapAppender.java
+++ b/src/main/java/pro/litvinovg/w2phtml/LogMapAppender.java
@@ -12,7 +12,7 @@ public class LogMapAppender extends AppenderBase<LoggingEvent>{
 	@Override
 	protected void append(LoggingEvent logEvent) {
 		Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-		logArray.addEvent(timestamp + "  :  " + logEvent.getMessage());
+		logArray.addEvent(timestamp + " " + logEvent.getMessage());
 	}
 
 }
diff --git a/src/main/java/pro/litvinovg/w2phtml/gui/ConversionExecutor.java b/src/main/java/pro/litvinovg/w2phtml/gui/ConversionExecutor.java
index 978c783..0deaf57 100644
--- a/src/main/java/pro/litvinovg/w2phtml/gui/ConversionExecutor.java
+++ b/src/main/java/pro/litvinovg/w2phtml/gui/ConversionExecutor.java
@@ -190,6 +190,7 @@ public class ConversionExecutor {
 
 	private void showResultsDialog() {
 		ResultsDialog results = new ResultsDialog();
+		results.setModal(true);
 		results.setVisible(true);
 	}
 
diff --git a/src/main/java/pro/litvinovg/w2phtml/gui/ResultsDialog.java b/src/main/java/pro/litvinovg/w2phtml/gui/ResultsDialog.java
index 2d9f2a0..01e4ed2 100644
--- a/src/main/java/pro/litvinovg/w2phtml/gui/ResultsDialog.java
+++ b/src/main/java/pro/litvinovg/w2phtml/gui/ResultsDialog.java
@@ -52,7 +52,7 @@ public class ResultsDialog extends JDialog {
 			dialog.dispose();	
 		}
 		dialog = this;
-		setBounds(100, 100, 812, 268);
+		setBounds(100, 100, 1011, 272);
 		getContentPane().setLayout(new BorderLayout());
 		contentPanel.setBackground(Color.WHITE);
 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));