Browse Source

Fix control order in UI and clarify error messages

master
Ivan Holmes 4 years ago
parent
commit
7a5a89644f
  1. 2
      _version.py
  2. 2
      gui.py
  3. 25
      ui/mainwindow.ui
  4. 8
      version.rc

2
_version.py

@ -1,4 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
appName = "Chordsheet" appName = "Chordsheet"
version = '0.4.3'
version = '0.4.4'

2
gui.py

@ -974,7 +974,7 @@ class LengthWarningMessageBox(QMessageBox):
self.setIcon(QMessageBox.Warning) self.setIcon(QMessageBox.Warning)
self.setWindowTitle("Block without valid length") self.setWindowTitle("Block without valid length")
self.setText("Blocks must have a whole number length.")
self.setText("Blocks must have a length.")
self.setInformativeText( self.setInformativeText(
"Please enter a valid length for your block and try again.") "Please enter a valid length for your block and try again.")
self.setStandardButtons(QMessageBox.Ok) self.setStandardButtons(QMessageBox.Ok)

25
ui/mainwindow.ui

@ -72,7 +72,7 @@
</size> </size>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>2</number>
<number>4</number>
</property> </property>
<widget class="QWidget" name="tabWidgetOverview"> <widget class="QWidget" name="tabWidgetOverview">
<attribute name="title"> <attribute name="title">
@ -1126,23 +1126,42 @@
<tabstop>generateButton</tabstop> <tabstop>generateButton</tabstop>
<tabstop>tabWidget</tabstop> <tabstop>tabWidget</tabstop>
<tabstop>titleLineEdit</tabstop> <tabstop>titleLineEdit</tabstop>
<tabstop>subtitleLineEdit</tabstop>
<tabstop>composerLineEdit</tabstop> <tabstop>composerLineEdit</tabstop>
<tabstop>arrangerLineEdit</tabstop> <tabstop>arrangerLineEdit</tabstop>
<tabstop>tempoLineEdit</tabstop>
<tabstop>timeSignatureSpinBox</tabstop>
<tabstop>pageSizeComboBox</tabstop> <tabstop>pageSizeComboBox</tabstop>
<tabstop>documentUnitsComboBox</tabstop> <tabstop>documentUnitsComboBox</tabstop>
<tabstop>leftMarginLineEdit</tabstop> <tabstop>leftMarginLineEdit</tabstop>
<tabstop>rightMarginLineEdit</tabstop>
<tabstop>topMarginLineEdit</tabstop> <tabstop>topMarginLineEdit</tabstop>
<tabstop>bottomMarginLineEdit</tabstop>
<tabstop>lineSpacingDoubleSpinBox</tabstop> <tabstop>lineSpacingDoubleSpinBox</tabstop>
<tabstop>fontComboBox</tabstop> <tabstop>fontComboBox</tabstop>
<tabstop>includedFontCheckBox</tabstop>
<tabstop>beatWidthLineEdit</tabstop>
<tabstop>chordTableView</tabstop> <tabstop>chordTableView</tabstop>
<tabstop>chordNameLineEdit</tabstop> <tabstop>chordNameLineEdit</tabstop>
<tabstop>guitarVoicingLineEdit</tabstop> <tabstop>guitarVoicingLineEdit</tabstop>
<tabstop>pianoVoicingLineEdit</tabstop>
<tabstop>guitarVoicingButton</tabstop> <tabstop>guitarVoicingButton</tabstop>
<tabstop>addChordButton</tabstop>
<tabstop>removeChordButton</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>blockTableView</tabstop>
<tabstop>addBlockButton</tabstop>
<tabstop>blockLengthLineEdit</tabstop>
<tabstop>blockChordComboBox</tabstop>
<tabstop>blockNotesLineEdit</tabstop>
<tabstop>removeBlockButton</tabstop> <tabstop>removeBlockButton</tabstop>
<tabstop>updateBlockButton</tabstop>
<tabstop>addBlockButton</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>

8
version.rc

@ -6,8 +6,8 @@ VSVersionInfo(
ffi=FixedFileInfo( ffi=FixedFileInfo(
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
# Set not needed items to zero 0. # 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 # Contains a bitmask that specifies the valid bits 'flags'r
mask=0x3f, mask=0x3f,
# Contains a bitmask that specifies the Boolean attributes of the file. # Contains a bitmask that specifies the Boolean attributes of the file.
@ -31,12 +31,12 @@ StringFileInfo(
u'040904B0', u'040904B0',
[StringStruct(u'CompanyName', u'Ivan Holmes'), [StringStruct(u'CompanyName', u'Ivan Holmes'),
StringStruct(u'FileDescription', u'Chordsheet'), 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'InternalName', u'Chordsheet'),
StringStruct(u'LegalCopyright', u'Copyright (c) Ivan Holmes, 2020. Some rights reserved.'), StringStruct(u'LegalCopyright', u'Copyright (c) Ivan Holmes, 2020. Some rights reserved.'),
StringStruct(u'OriginalFilename', u'chordsheet.exe'), StringStruct(u'OriginalFilename', u'chordsheet.exe'),
StringStruct(u'ProductName', u'Chordsheet'), 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])]) VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
] ]
Loading…
Cancel
Save