From 7a5a89644f3ea3681d7c1ab2181f1c4465897064 Mon Sep 17 00:00:00 2001
From: Ivan Holmes <ivan@ivanholmes.co.uk>
Date: Tue, 22 Sep 2020 18:00:16 +0100
Subject: [PATCH] Fix control order in UI and clarify error messages

---
 _version.py      |  2 +-
 gui.py           |  2 +-
 ui/mainwindow.ui | 25 ++++++++++++++++++++++---
 version.rc       |  8 ++++----
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/_version.py b/_version.py
index d4fab4c..6fb8667 100644
--- a/_version.py
+++ b/_version.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 
 appName = "Chordsheet"
-version = '0.4.3'
+version = '0.4.4'
diff --git a/gui.py b/gui.py
index a9a3840..6e0ef92 100755
--- a/gui.py
+++ b/gui.py
@@ -974,7 +974,7 @@ class LengthWarningMessageBox(QMessageBox):
 
         self.setIcon(QMessageBox.Warning)
         self.setWindowTitle("Block without valid length")
-        self.setText("Blocks must have a whole number length.")
+        self.setText("Blocks must have a length.")
         self.setInformativeText(
             "Please enter a valid length for your block and try again.")
         self.setStandardButtons(QMessageBox.Ok)
diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
index 8327c84..34c8f20 100644
--- a/ui/mainwindow.ui
+++ b/ui/mainwindow.ui
@@ -72,7 +72,7 @@
              </size>
             </property>
             <property name="currentIndex">
-             <number>2</number>
+             <number>4</number>
             </property>
             <widget class="QWidget" name="tabWidgetOverview">
              <attribute name="title">
@@ -1126,23 +1126,42 @@
   <tabstop>generateButton</tabstop>
   <tabstop>tabWidget</tabstop>
   <tabstop>titleLineEdit</tabstop>
+  <tabstop>subtitleLineEdit</tabstop>
   <tabstop>composerLineEdit</tabstop>
   <tabstop>arrangerLineEdit</tabstop>
+  <tabstop>tempoLineEdit</tabstop>
+  <tabstop>timeSignatureSpinBox</tabstop>
   <tabstop>pageSizeComboBox</tabstop>
   <tabstop>documentUnitsComboBox</tabstop>
   <tabstop>leftMarginLineEdit</tabstop>
+  <tabstop>rightMarginLineEdit</tabstop>
   <tabstop>topMarginLineEdit</tabstop>
+  <tabstop>bottomMarginLineEdit</tabstop>
   <tabstop>lineSpacingDoubleSpinBox</tabstop>
   <tabstop>fontComboBox</tabstop>
+  <tabstop>includedFontCheckBox</tabstop>
+  <tabstop>beatWidthLineEdit</tabstop>
   <tabstop>chordTableView</tabstop>
   <tabstop>chordNameLineEdit</tabstop>
   <tabstop>guitarVoicingLineEdit</tabstop>
+  <tabstop>pianoVoicingLineEdit</tabstop>
   <tabstop>guitarVoicingButton</tabstop>
-  <tabstop>addChordButton</tabstop>
   <tabstop>removeChordButton</tabstop>
+  <tabstop>updateChordButton</tabstop>
+  <tabstop>addChordButton</tabstop>
+  <tabstop>sectionTableView</tabstop>
+  <tabstop>sectionNameLineEdit</tabstop>
+  <tabstop>removeSectionButton</tabstop>
+  <tabstop>updateSectionButton</tabstop>
+  <tabstop>addSectionButton</tabstop>
+  <tabstop>blockSectionComboBox</tabstop>
   <tabstop>blockTableView</tabstop>
-  <tabstop>addBlockButton</tabstop>
+  <tabstop>blockLengthLineEdit</tabstop>
+  <tabstop>blockChordComboBox</tabstop>
+  <tabstop>blockNotesLineEdit</tabstop>
   <tabstop>removeBlockButton</tabstop>
+  <tabstop>updateBlockButton</tabstop>
+  <tabstop>addBlockButton</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/version.rc b/version.rc
index 0bf7dc7..aa230f7 100644
--- a/version.rc
+++ b/version.rc
@@ -6,8 +6,8 @@ VSVersionInfo(
   ffi=FixedFileInfo(
 # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
 # Set not needed items to zero 0.
-filevers=(0, 4, 3, 0),
-prodvers=(0, 4, 3, 0),
+filevers=(0, 4, 4, 0),
+prodvers=(0, 4, 4, 0),
 # Contains a bitmask that specifies the valid bits 'flags'r
 mask=0x3f,
 # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -31,12 +31,12 @@ StringFileInfo(
     u'040904B0',
     [StringStruct(u'CompanyName', u'Ivan Holmes'),
     StringStruct(u'FileDescription', u'Chordsheet'),
-    StringStruct(u'FileVersion', u'0.4.3'),
+    StringStruct(u'FileVersion', u'0.4.4'),
     StringStruct(u'InternalName', u'Chordsheet'),
     StringStruct(u'LegalCopyright', u'Copyright (c) Ivan Holmes, 2020. Some rights reserved.'),
     StringStruct(u'OriginalFilename', u'chordsheet.exe'),
     StringStruct(u'ProductName', u'Chordsheet'),
-    StringStruct(u'ProductVersion', u'0.4.3')])
+    StringStruct(u'ProductVersion', u'0.4.4')])
   ]), 
 VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]