remove debug print statements and make bg grey

Merge branch 'master' of https://git.radivan.net/ivan/chordsheet

.gitignore

@@ -51,4 +51,7 @@ docs/_build/
 
 # Mac stuff
 .DS_Store
-.vscode/
+.vscode/
+
+# Syncthing conflicts
+*.sync-conflict-*

chordsheet/document.py

@@ -7,7 +7,6 @@ from reportlab.lib.pagesizes import A4
 
 defaultTimeSignature = 4
 
-
 class Style:
     def __init__(self, **kwargs):
         # set up the style using sane defaults
@@ -143,17 +142,8 @@ class Document:
             'timesignature') is not None else defaultTimeSignature)
         self.tempo = (root.find('tempo').text if root.find(
             'tempo') is not None else None)
-
-    @classmethod
-    def newFromXML(cls, filepath):
-        """
-        Create a new Document object directly from an XML file.
-        """
-        doc = cls()
-        doc.loadXML(filepath)
-        return doc
-
-    def saveXML(self, filepath):
+      
+    def toXML(self):
         """
         Write the contents of the Document object to an XML file.
         """
@@ -200,7 +190,16 @@ class Document:
                     ET.SubElement(blockElement, "notes").text = b.notes
 
         tree = ET.ElementTree(root)
+        return tree
+
+    def saveXML(self, filepath):
+        tree = self.toXML()
         tree.write(filepath)
+        return hash(ET.tostring(tree.getroot()))
+        
+    def getHash(self):
+        tree = self.toXML()
+        return hash(ET.tostring(tree.getroot()))
         
     def loadCSMacro(self, filepath):
         """
@@ -289,4 +288,4 @@ class Document:
                 # Simply ignore comments
                 pass
             else:
-                raise ValueError(f"Command {cmd} not understood.")
+                raise ValueError(f"Command {cmd} not understood.")

chordsheet/parsers.py

@@ -7,14 +7,13 @@ def parseFingering(fingering, instrument):
     """
     if instrument == 'guitar':
         numStrings = 6
-        if len(fingering) == numStrings:  # if the fingering is entered in concise format e.g. xx4455
+        if "," not in fingering and len(fingering) == numStrings:  # if the fingering is entered in concise format e.g. xx4455
             output = list(fingering)
         else:  # if entered in long format e.g. x,x,10,10,11,11
             output = [f.strip() for f in fingering.split(",")]
-        if len(output) == numStrings:
-            return output
-        else:
-            raise Exception("Voicing <{}> is malformed.".format(fingering))
+        if len(output) != numStrings:
+            print("Voicing <{}> is malformed.".format(fingering))
+        return output
     elif instrument == 'piano':
         return [parseName(note).upper().strip() for note in fingering.split(",")]
     else:
@@ -31,4 +30,4 @@ def parseName(chordName):
     parsedName = chordName
     for i, j in nameReplacements.items():
         parsedName = parsedName.replace(i, j)
-    return parsedName
+    return parsedName

chordsheet/render.py

@@ -12,6 +12,7 @@ from reportlab.platypus import BaseDocTemplate, Spacer, Paragraph, Flowable, Fra
 from chordsheet.document import Block
 from chordsheet.rlStylesheet import getStyleSheet
 
+defaultSpacing = 1.15
 
 def writeText(canvas, style, string, size, vpos, width, **kwargs):
     """
@@ -122,7 +123,7 @@ class GuitarChart(Flowable):
 
             for i in range(self.nStrings+1):  # i is the string line currently being drawn
                 writeText(canvas, self.style, ['e', 'B', 'G', 'D', 'A', 'E', 'Name'][i], fontsize, v_origin-(
-                    i*self.stringHeight), self.width, hpos=chartmargin, align='right')
+                    i*self.stringHeight), self.width, hpos=chartmargin, align='right', spacing=defaultSpacing)
 
                 # j is which chord (0 is first chord, 1 is 2nd etc)
                 for j in range(len(stringList[-1])):
@@ -152,7 +153,7 @@ class GuitarChart(Flowable):
                         canvas.line(x, y, x+l, y)
 
                     writeText(canvas, self.style, stringList[i][j], fontsize, v_origin-(
-                        i*self.stringHeight), self.width, hpos=chartmargin+self.stringHzSp*(j+0.5))
+                        i*self.stringHeight), self.width, hpos=chartmargin+self.stringHzSp*(j+0.5), spacing=defaultSpacing)
 
                     lastWidth = currentWidth
 
@@ -458,7 +459,7 @@ class ChordProgression(Flowable):
             if u == maxWidth:  # Avoid writing beat number after the final line
                 break
             writeText(canvas, self.style, str((u % self.timeSignature)+1), self.style.beatsFontSize,
-                      v_origin+self.beatsHeight, self.width, hpos=x+unitWidth/2)
+                      v_origin+self.beatsHeight, self.width, hpos=x+unitWidth/2, spacing=defaultSpacing)
 
         parsedBlockList = self.wrapBlocks(self.blockList, maxWidth)
 
@@ -470,12 +471,12 @@ class ChordProgression(Flowable):
                         b.length*unitWidth, self.unitHeight)
             if b.notes is not None:
                 writeText(canvas, self.style, b.notes, self.style.notesFontSize, v_origin-((v_loc+1)*self.unitHeight)+(
-                    1.3*self.style.notesFontSize), self.width, hpos=h_offset+((h_loc+b.length/2)*unitWidth))
+                    1.3*self.style.notesFontSize), self.width, hpos=h_offset+((h_loc+b.length/2)*unitWidth), spacing=defaultSpacing)
             v_offset = ((v_loc*self.unitHeight) +
                         self.unitHeight/2)-self.style.chordNameFontSize/2
             if b.chord is not None:
                 writeText(canvas, self.style, b.chord.name, self.style.chordNameFontSize,
-                          v_origin-v_offset, self.width, hpos=h_offset+((h_loc+b.length/2)*unitWidth))
+                          v_origin-v_offset, self.width, hpos=h_offset+((h_loc+b.length/2)*unitWidth), spacing=defaultSpacing)
             h_loc += b.length
 
 

cli.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import time
+
+from reportlab.lib.units import mm, cm, inch, pica
+from reportlab.lib.pagesizes import A4, A5, LETTER, LEGAL
+from reportlab.pdfbase import pdfmetrics
+from reportlab.pdfbase.ttfonts import TTFont
+
+from chordsheet.common import scriptDir
+from chordsheet.document import Document, Style, Chord, Block, Section
+from chordsheet.render import Renderer
+from chordsheet.parsers import parseFingering, parseName
+
+import _version
+
+pdfmetrics.registerFont(
+    TTFont('FreeSans', os.path.join(scriptDir, 'fonts', 'FreeSans.ttf')))
+if sys.platform == "darwin":
+    pdfmetrics.registerFont(
+        TTFont('HelveticaNeue', 'HelveticaNeue.ttc', subfontIndex=0))
+
+if len(sys.argv) == 2:
+    inputFilePath = sys.argv[1]
+else:
+    print("Please provide a .cml, .xml, or .cma file to process.")
+    sys.exit()
+    
+doc = Document()
+if inputFilePath[-4:] == ".cma":
+    doc.loadCSMacro(inputFilePath)
+else:
+    doc.loadXML(inputFilePath)
+
+style = Style()
+
+renderer = Renderer(doc, style)
+
+outputFilePath = ".".join(inputFilePath.split(".")[:-1]) + ".pdf"
+renderer.savePDF(outputFilePath)

chordsheet/dialogs.py → csgui/dialogs.py

@@ -25,17 +25,31 @@ class GuitarDialog(QDialog):
         self.dialog = uic.loadUi(ui_file)
         ui_file.close()
 
-    def getVoicing(self):
+    def getVoicing(self, existingVoicing):
         """
         Show the dialogue and return the voicing that has been entered.
         """
+        lineEditsList = [
+            self.dialog.ELineEdit,
+            self.dialog.ALineEdit,
+            self.dialog.DLineEdit,
+            self.dialog.GLineEdit,
+            self.dialog.BLineEdit,
+            self.dialog.eLineEdit
+        ]
+
+        # Read the present voicing
+        if type(existingVoicing) == list:
+            for count in range(len(existingVoicing)):
+                lineEditsList[count].setText(existingVoicing[count])
+
         if self.dialog.exec_() == QDialog.Accepted:
-            result = [self.dialog.ELineEdit.text(),
-                      self.dialog.ALineEdit.text(),
-                      self.dialog.DLineEdit.text(),
-                      self.dialog.GLineEdit.text(),
-                      self.dialog.BLineEdit.text(),
-                      self.dialog.eLineEdit.text()]
+            result = [self.dialog.ELineEdit.text() or 'x',
+                      self.dialog.ALineEdit.text() or 'x',
+                      self.dialog.DLineEdit.text() or 'x',
+                      self.dialog.GLineEdit.text() or 'x',
+                      self.dialog.BLineEdit.text() or 'x',
+                      self.dialog.eLineEdit.text() or 'x']
             resultJoined = ",".join(result)
             return resultJoined
         else:
@@ -64,4 +78,4 @@ class AboutDialog(QDialog):
         ui_file.open(QFile.ReadOnly)
 
         self.dialog = uic.loadUi(ui_file)
-        ui_file.close()
+        ui_file.close()

chordsheet/messageBox.py → csgui/messageBox.py

@@ -1,32 +1,38 @@
-from PyQt5.QtWidgets import QApplication, QAction, QLabel, QDialogButtonBox, QDialog, QFileDialog, QMessageBox, QPushButton, QLineEdit, QCheckBox, QSpinBox, QDoubleSpinBox, QTableWidgetItem, QTabWidget, QComboBox, QWidget, QScrollArea, QMainWindow, QShortcut
+from PyQt5.QtWidgets import QApplication, QAction, QLabel, QDialogButtonBox, QDialog, QFileDialog, QMessageBox, QPushButton, QLineEdit, QCheckBox, QSpinBox, QDoubleSpinBox, QTableWidgetItem, QTabWidget, QComboBox, QWidget, QScrollArea, QMainWindow, QShortcut, QDialogButtonBox
+import sys
 
 class UnsavedMessageBox(QMessageBox):
     """
     Message box to alert the user of unsaved changes and allow them to choose how to act.
     """
 
-    def __init__(self):
+    def __init__(self, fileName):
         super().__init__()
 
-        self.setIcon(QMessageBox.Question)
+        self.setIcon(QMessageBox.Information)
         self.setWindowTitle("Unsaved changes")
-        self.setText("The document has been modified.")
+        self.setText(f"The document \"{fileName}\" has been modified.")
         self.setInformativeText("Do you want to save your changes?")
         self.setStandardButtons(
             QMessageBox.Save | QMessageBox.Discard | QMessageBox.Cancel)
         self.setDefaultButton(QMessageBox.Save)
-
+        
+        # If we are running on Haiku, use the MacOS button style to fit in more
+        # with native applications
+        if sys.platform.startswith("haiku"):
+            buttonBox = self.findChild(QDialogButtonBox)
+            buttonBox.setStyleSheet("* { button-layout: 1}")
 
 class UnreadableMessageBox(QMessageBox):
     """
     Message box to warn the user that the chosen file cannot be opened.
     """
 
-    def __init__(self):
+    def __init__(self, fileName):
         super().__init__()
 
-        self.setIcon(QMessageBox.Warning)
-        self.setWindowTitle("File cannot be opened")
+        self.setIcon(QMessageBox.Information)
+        self.setWindowTitle(f"File \"{fileName}\" cannot be opened")
         self.setText("The file you have selected cannot be opened.")
         self.setInformativeText("Please make sure it is in the right format.")
         self.setStandardButtons(QMessageBox.Ok)
@@ -41,7 +47,7 @@ class ChordNameWarningMessageBox(QMessageBox):
     def __init__(self):
         super().__init__()
 
-        self.setIcon(QMessageBox.Warning)
+        self.setIcon(QMessageBox.Information)
         self.setWindowTitle("Unnamed chord")
         self.setText("Chords must have a name.")
         self.setInformativeText("Please give your chord a name and try again.")
@@ -57,7 +63,7 @@ class SectionNameWarningMessageBox(QMessageBox):
     def __init__(self):
         super().__init__()
 
-        self.setIcon(QMessageBox.Warning)
+        self.setIcon(QMessageBox.Information)
         self.setWindowTitle("Unnamed section")
         self.setText("Sections must have a unique name.")
         self.setInformativeText(
@@ -74,7 +80,7 @@ class BlockMustHaveSectionWarningMessageBox(QMessageBox):
     def __init__(self):
         super().__init__()
 
-        self.setIcon(QMessageBox.Warning)
+        self.setIcon(QMessageBox.Information)
         self.setWindowTitle("No sections found")
         self.setText("Each block must belong to a section, but no sections have yet been created.")
         self.setInformativeText(
@@ -91,7 +97,7 @@ class VoicingWarningMessageBox(QMessageBox):
     def __init__(self):
         super().__init__()
 
-        self.setIcon(QMessageBox.Warning)
+        self.setIcon(QMessageBox.Information)
         self.setWindowTitle("Malformed voicing")
         self.setText(
             "The voicing you entered was not understood and has not been applied.")
@@ -109,7 +115,7 @@ class LengthWarningMessageBox(QMessageBox):
     def __init__(self):
         super().__init__()
 
-        self.setIcon(QMessageBox.Warning)
+        self.setIcon(QMessageBox.Information)
         self.setWindowTitle("Block without valid length")
         self.setText("Blocks must have a length.")
         self.setInformativeText(

chordsheet/panels.py → csgui/panels.py

@@ -1,10 +1,11 @@
 import os
-from PyQt5.QtWidgets import QApplication, QAction, QLabel, QDialogButtonBox, QDialog, QFileDialog, QMessageBox, QPushButton, QLineEdit, QCheckBox, QSpinBox, QDoubleSpinBox, QTableWidgetItem, QTabWidget, QComboBox, QWidget, QScrollArea, QMainWindow, QShortcut, QDockWidget
+from PyQt5.QtWidgets import QApplication, QAction, QLabel, QDialogButtonBox, QDialog, QFileDialog, QMessageBox, QPushButton, QLineEdit, QCheckBox, QSpinBox, QDoubleSpinBox, QTableWidgetItem, QTabWidget, QComboBox, QWidget, QScrollArea, QMainWindow, QShortcut, QDockWidget, QLineEdit, QTableView
 from PyQt5.QtCore import QFile, QObject, Qt
 from PyQt5.QtGui import QImage, QPixmap
 from PyQt5 import uic
 
 from chordsheet.common import scriptDir
+from csgui.tableView import MTableView
 
 class UIFileDockWidget(QDockWidget):
     def __init__(self):
@@ -17,6 +18,15 @@ class UIFileDockWidget(QDockWidget):
         self.setWidget(uic.loadUi(ui_file))
         ui_file.close()
 
+    def clear(self):
+        # Clear all the fields
+        for lineEdit in self.findChildren(QLineEdit):
+            lineEdit.clear()
+        for comboBox in self.findChildren(QComboBox):
+            comboBox.clear()
+        for tableView in self.findChildren(MTableView):
+            tableView.clear()
+
 class DocInfoDockWidget(UIFileDockWidget):
     def __init__(self):
         super().__init__()
@@ -51,4 +61,4 @@ class PreviewDockWidget(UIFileDockWidget):
     def __init__(self):
         super().__init__()
         self.UIFileLoader('preview.ui')
-        self.setWindowTitle("Preview")
+        self.setWindowTitle("Preview")

chordsheet/pdfViewer.py → csgui/pdfViewer.py

@@ -14,9 +14,24 @@ class PDFLabel(QLabel):
         self.adjustSize()
         if self.pixmap() is not None:
             painter = QPainter(self)
-            painter.setRenderHint(QPainter.Antialiasing)
-            idealWidth = self.parent.width()-45
+            # painter.setRenderHint(QPainter.Antialiasing)
+            
+            parentLayoutMargins = self.parent.scrollAreaLayout.getContentsMargins()
+            parentMargins = self.parent.getContentsMargins()
+            
+            if self.parent.verticalScrollBar().isVisible():
+                scrollBarWidth = self.parent.verticalScrollBar().sizeHint().width()
+            else:
+                scrollBarWidth = 0
+            
+            totalMargin = parentLayoutMargins[0] + parentLayoutMargins[2] + \
+                            parentMargins[0]*2 + scrollBarWidth
+                
+            idealWidth = self.parent.width() - totalMargin
+            # print(idealWidth)
             pixSize = self.pixmap().size()
+            # print(pixSize)
+            # print((self.parent.scrollAreaContents.size()))
             
             pixSize.scale(idealWidth, 1000000, Qt.KeepAspectRatio)
             
@@ -32,9 +47,14 @@ class PDFViewer(QScrollArea):
 
         self.setWidget(self.scrollAreaContents)
         self.setWidgetResizable(True)
+        self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+        # set a fixed background colour
+        # on some OSes (Mac, Haiku) it is grey automatically but not on KDE
+        self.setStyleSheet('PDFViewer {background-color: #D8D8D8}')
 
         self.scrollAreaContents.setLayout(self.scrollAreaLayout)
         self.pixmapList = []      
+        self.lastVScrollPosition = None
     
     def update_pdf(self, pdf):
         self.render(pdf)
@@ -48,11 +68,12 @@ class PDFViewer(QScrollArea):
 
         self.pixmapList = []
         pdfView = fitz.Document(stream=pdf, filetype='pdf')
-        # render at 8x resolution and scale
         for page in pdfView:
-            self.pixmapList.append(page.getPixmap(matrix=fitz.Matrix(8, 8), alpha=False))
+            # needs to be high enough for big monitors. 300 should do it...
+            self.pixmapList.append(page.get_pixmap(dpi=300, alpha=False))
                     
     def clear(self):
+        self.lastVScrollPosition = self.verticalScrollBar().value()
         while self.scrollAreaLayout.count():
             item = self.scrollAreaLayout.takeAt(0)
             w = item.widget()
@@ -64,11 +85,12 @@ class PDFViewer(QScrollArea):
             label = PDFLabel(parent=self)
             label.setAlignment(Qt.AlignHCenter)
             qtimg = QImage(p.samples, p.width, p.height, p.stride, QImage.Format_RGB888)
-            # -45 because of various margins... value obtained by trial and error.
             label.setPixmap(QPixmap.fromImage(qtimg))
             self.scrollAreaLayout.addWidget(label)
         
         self.scrollAreaLayout.addStretch(1)
         
-        # necessary on Mojave with PyInstaller (or previous contents will be shown)
-        self.repaint()
+        # Somewhat of a hack. Should really replace pixmaps in place
+        # rather than removing labels elsewhere in code.
+        if self.lastVScrollPosition:
+            self.verticalScrollBar().setValue(self.lastVScrollPosition)

chordsheet/tableView.py → csgui/tableView.py

@@ -1,16 +1,35 @@
 from PyQt5 import QtWidgets, QtGui
-
+from PyQt5.QtCore import pyqtSignal, Qt, QModelIndex
 
 class MItemModel(QtGui.QStandardItemModel):
     """
     Special item model to ensure whole row is moved.
     """
+    itemsDropped = pyqtSignal()
+    
+    def __init__(self):
+        super().__init__()
+        self.pendingRemoveRows = False
 
     def dropMimeData(self, data, action, row, col, parent):
         """
         Always move the entire row, and don't allow column "shifting"
         """
-        return super().dropMimeData(data, action, row, 0, parent)
+        ret = super().dropMimeData(data, Qt.MoveAction, row, 0, parent)
+        if ret:
+            self.pendingRemoveRows = True
+        return ret
+        
+    def removeRows(self, row, count, index=QModelIndex()):
+        """
+        Emit a signal after rows have been moved
+        """
+        ret = super().removeRows(row, count, index)
+        if self.pendingRemoveRows:
+            self.itemsDropped.emit()
+            self.pendingRemoveRows = False
+            
+        return ret
 
 
 class MProxyStyle(QtWidgets.QProxyStyle):
@@ -50,11 +69,13 @@ class MTableView(QtWidgets.QTableView):
 
         self.setShowGrid(False)
         # self.setDragDropMode(self.InternalMove)
-        # self.setDragDropOverwriteMode(False)
+        self.setDragDropOverwriteMode(False)
 
         # Set our custom style - this draws the drop indicator across the whole row
         self.setStyle(MProxyStyle())
-
+    
+    def clear(self):
+        self.model.removeRows(0, self.model.rowCount())
 
 class ChordTableView(MTableView):
     """

linux.spec

@@ -12,7 +12,7 @@ a = Analysis(['gui.py'],
                 ('fonts', 'fonts'),
                 ('ui', 'ui')
 	     ],
-             hiddenimports=[],
+             hiddenimports=['PyQt5.sip'],
              hookspath=[],
              runtime_hooks=[],
              excludes=[],

requirements.txt

@@ -1,3 +1,4 @@
 reportlab>=3.5.67
 PyMuPDF>=1.18.13
 PyQt5>=5.15.4
+PyQt5.Sip

ui/aboutdialog.ui

@@ -14,7 +14,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -25,10 +25,25 @@
     <height>200</height>
    </size>
   </property>
+  <property name="maximumSize">
+   <size>
+    <width>436</width>
+    <height>200</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>About Chordsheet</string>
   </property>
+  <property name="sizeGripEnabled">
+   <bool>false</bool>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetFixedSize</enum>
+   </property>
    <item>
     <layout class="QVBoxLayout" name="leftPane">
      <item>

ui/blocks.ui

@@ -270,12 +270,12 @@
   <customwidget>
    <class>BlockTableView</class>
    <extends>QTableView</extends>
-   <header>chordsheet/tableView.h</header>
+   <header>csgui/tableView.h</header>
   </customwidget>
   <customwidget>
    <class>MComboBox</class>
    <extends>QComboBox</extends>
-   <header>chordsheet/comboBox.h</header>
+   <header>csgui/comboBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>

ui/chords.ui

@@ -220,7 +220,7 @@
   <customwidget>
    <class>ChordTableView</class>
    <extends>QTableView</extends>
-   <header>chordsheet/tableView.h</header>
+   <header>csgui/tableView.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>

ui/document.ui

@@ -36,7 +36,7 @@
      </property>
      <property name="minimumSize">
       <size>
-       <width>400</width>
+       <width>200</width>
        <height>300</height>
       </size>
      </property>
@@ -48,7 +48,7 @@
   <customwidget>
    <class>PDFViewer</class>
    <extends>QWidget</extends>
-   <header>chordsheet/pdfViewer.h</header>
+   <header>csgui/pdfViewer.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

ui/new.ui

@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1061</width>
-    <height>639</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Chordsheet</string>
-  </property>
-  <property name="documentMode">
-   <bool>false</bool>
-  </property>
-  <property name="tabShape">
-   <enum>QTabWidget::Rounded</enum>
-  </property>
-  <widget class="QWidget" name="centralWidget">
-   <layout class="QHBoxLayout" name="horizontalLayout">
-    <property name="leftMargin">
-     <number>0</number>
-    </property>
-    <property name="topMargin">
-     <number>0</number>
-    </property>
-    <property name="rightMargin">
-     <number>0</number>
-    </property>
-    <property name="bottomMargin">
-     <number>0</number>
-    </property>
-    <item>
-     <widget class="QMdiArea" name="mdiArea">
-      <property name="enabled">
-       <bool>true</bool>
-      </property>
-      <property name="documentMode">
-       <bool>true</bool>
-      </property>
-      <property name="tabsClosable">
-       <bool>true</bool>
-      </property>
-      <property name="tabsMovable">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menuBar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>1061</width>
-     <height>22</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuFile">
-    <property name="title">
-     <string>File</string>
-    </property>
-    <addaction name="actionNew"/>
-    <addaction name="actionOpen"/>
-    <addaction name="separator"/>
-    <addaction name="actionSave"/>
-    <addaction name="actionSave_as"/>
-    <addaction name="actionSave_PDF"/>
-    <addaction name="separator"/>
-    <addaction name="actionPrint"/>
-    <addaction name="separator"/>
-    <addaction name="actionClose"/>
-   </widget>
-   <widget class="QMenu" name="menuEdit">
-    <property name="title">
-     <string>Edit</string>
-    </property>
-    <addaction name="actionUndo"/>
-    <addaction name="actionRedo"/>
-    <addaction name="separator"/>
-    <addaction name="actionCut"/>
-    <addaction name="actionCopy"/>
-    <addaction name="actionPaste"/>
-    <addaction name="separator"/>
-    <addaction name="actionAbout"/>
-   </widget>
-   <widget class="QMenu" name="menuWindow">
-    <property name="title">
-     <string>Window</string>
-    </property>
-    <addaction name="actionDocument_information"/>
-    <addaction name="actionPage_setup"/>
-    <addaction name="actionChords"/>
-    <addaction name="actionSections"/>
-    <addaction name="actionBlocks"/>
-    <addaction name="separator"/>
-    <addaction name="actionPreview"/>
-   </widget>
-   <addaction name="menuFile"/>
-   <addaction name="menuEdit"/>
-   <addaction name="menuWindow"/>
-  </widget>
-  <action name="actionNew">
-   <property name="text">
-    <string>New...</string>
-   </property>
-  </action>
-  <action name="actionOpen">
-   <property name="text">
-    <string>Open...</string>
-   </property>
-  </action>
-  <action name="actionSave">
-   <property name="text">
-    <string>Save</string>
-   </property>
-  </action>
-  <action name="actionSave_PDF">
-   <property name="text">
-    <string>Save PDF...</string>
-   </property>
-  </action>
-  <action name="actionPrint">
-   <property name="text">
-    <string>Print...</string>
-   </property>
-  </action>
-  <action name="actionClose">
-   <property name="text">
-    <string>Close</string>
-   </property>
-  </action>
-  <action name="actionSave_as">
-   <property name="text">
-    <string>Save as...</string>
-   </property>
-  </action>
-  <action name="actionQuit">
-   <property name="text">
-    <string>Quit</string>
-   </property>
-  </action>
-  <action name="actionUndo">
-   <property name="text">
-    <string>Undo</string>
-   </property>
-  </action>
-  <action name="actionRedo">
-   <property name="text">
-    <string>Redo</string>
-   </property>
-  </action>
-  <action name="actionCut">
-   <property name="text">
-    <string>Cut</string>
-   </property>
-  </action>
-  <action name="actionCopy">
-   <property name="text">
-    <string>Copy</string>
-   </property>
-  </action>
-  <action name="actionPaste">
-   <property name="text">
-    <string>Paste</string>
-   </property>
-  </action>
-  <action name="actionPreferences">
-   <property name="text">
-    <string>Preferences</string>
-   </property>
-  </action>
-  <action name="actionAbout">
-   <property name="text">
-    <string>About</string>
-   </property>
-  </action>
-  <action name="actionDocument_information">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Document information</string>
-   </property>
-  </action>
-  <action name="actionPage_setup">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Page setup</string>
-   </property>
-  </action>
-  <action name="actionChords">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Chords</string>
-   </property>
-  </action>
-  <action name="actionSections">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Sections</string>
-   </property>
-  </action>
-  <action name="actionBlocks">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Blocks</string>
-   </property>
-  </action>
-  <action name="actionPreview">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Preview</string>
-   </property>
-  </action>
- </widget>
- <resources/>
- <connections/>
-</ui>

ui/pdfarea.ui

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>PDF Viewer</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <item>
-    <widget class="PDFViewer" name="pdfArea" native="true"/>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>PDFViewer</class>
-   <extends>QWidget</extends>
-   <header>chordsheet/pdfViewer.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

ui/preview.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>248</width>
-    <height>40</height>
+    <width>202</width>
+    <height>72</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -18,31 +18,50 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>0</width>
-    <height>40</height>
+    <width>202</width>
+    <height>72</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>Preview</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>6</number>
    </property>
    <property name="leftMargin">
-    <number>0</number>
+    <number>6</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>6</number>
    </property>
    <property name="rightMargin">
-    <number>0</number>
+    <number>6</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>6</number>
    </property>
-   <item>
+   <item alignment="Qt::AlignHCenter">
+    <widget class="QCheckBox" name="autoUpdatePreviewCheckBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Automatically update preview</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item alignment="Qt::AlignHCenter">
     <widget class="QPushButton" name="updatePreviewButton">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -52,6 +71,9 @@
      <property name="text">
       <string>Update preview</string>
      </property>
+     <property name="checkable">
+      <bool>false</bool>
+     </property>
     </widget>
    </item>
   </layout>

ui/psetup.ui

@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>257</width>
-    <height>271</height>
+    <width>173</width>
+    <height>306</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -33,48 +33,68 @@
     <number>6</number>
    </property>
    <item>
-    <layout class="QGridLayout" name="gridLayout" columnstretch="0,0">
+    <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,0,0,0" columnstretch="0,0">
      <property name="spacing">
       <number>6</number>
      </property>
-     <item row="11" column="0">
-      <widget class="QLabel" name="lineSpacingLabel">
+     <item row="6" column="0" colspan="2">
+      <widget class="QFontComboBox" name="fontComboBox">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
-         <width>0</width>
+         <width>150</width>
          <height>0</height>
         </size>
        </property>
-       <property name="text">
-        <string>Line spacing</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QLineEdit" name="leftMarginLineEdit">
        <property name="maximumSize">
         <size>
-         <width>60</width>
+         <width>16777215</width>
          <height>16777215</height>
         </size>
        </property>
+       <property name="editable">
+        <bool>false</bool>
+       </property>
+       <property name="maxVisibleItems">
+        <number>12</number>
+       </property>
+       <property name="sizeAdjustPolicy">
+        <enum>QComboBox::AdjustToContents</enum>
+       </property>
+       <property name="frame">
+        <bool>true</bool>
+       </property>
+       <property name="writingSystem">
+        <enum>QFontDatabase::Any</enum>
+       </property>
       </widget>
      </item>
-     <item row="10" column="0">
-      <widget class="QLabel" name="fontLabel">
-       <property name="maximumSize">
+     <item row="7" column="1">
+      <widget class="QCheckBox" name="includedFontCheckBox">
+       <property name="minimumSize">
         <size>
-         <width>40</width>
-         <height>16777215</height>
+         <width>0</width>
+         <height>0</height>
         </size>
        </property>
        <property name="text">
-        <string>Font</string>
+        <string>FreeSans</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
-      <widget class="QLineEdit" name="bottomMarginLineEdit">
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="rightMarginLineEdit">
        <property name="maximumSize">
         <size>
          <width>60</width>
@@ -83,8 +103,8 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
-      <widget class="QLineEdit" name="topMarginLineEdit">
+     <item row="5" column="1">
+      <widget class="QLineEdit" name="bottomMarginLineEdit">
        <property name="maximumSize">
         <size>
          <width>60</width>
@@ -93,29 +113,16 @@
        </property>
       </widget>
      </item>
-     <item row="11" column="1">
-      <widget class="QDoubleSpinBox" name="lineSpacingDoubleSpinBox">
-       <property name="minimumSize">
-        <size>
-         <width>70</width>
-         <height>0</height>
-        </size>
-       </property>
+     <item row="7" column="0">
+      <widget class="QLabel" name="fontLabel">
        <property name="maximumSize">
         <size>
-         <width>70</width>
+         <width>40</width>
          <height>16777215</height>
         </size>
        </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QLineEdit" name="rightMarginLineEdit">
-       <property name="maximumSize">
-        <size>
-         <width>60</width>
-         <height>16777215</height>
-        </size>
+       <property name="text">
+        <string>Font</string>
        </property>
       </widget>
      </item>
@@ -135,6 +142,19 @@
        </property>
       </widget>
      </item>
+     <item row="9" column="0">
+      <widget class="QLabel" name="beatWidthLabel">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Beat width</string>
+       </property>
+      </widget>
+     </item>
      <item row="4" column="0">
       <widget class="QLabel" name="topMarginLabel">
        <property name="minimumSize">
@@ -146,7 +166,7 @@
        <property name="maximumSize">
         <size>
          <width>16777215</width>
-         <height>16777194</height>
+         <height>16777215</height>
         </size>
        </property>
        <property name="text">
@@ -154,8 +174,27 @@
        </property>
       </widget>
      </item>
-     <item row="12" column="1">
-      <widget class="QLineEdit" name="beatWidthLineEdit">
+     <item row="1" column="1">
+      <widget class="QComboBox" name="documentUnitsComboBox">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>70</width>
+         <height>26</height>
+        </size>
+       </property>
+       <property name="editable">
+        <bool>true</bool>
+       </property>
+       <property name="frame">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="leftMarginLineEdit">
        <property name="maximumSize">
         <size>
          <width>60</width>
@@ -164,31 +203,31 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="pageSizeLabel">
-       <property name="text">
-        <string>Page size</string>
+     <item row="4" column="1">
+      <widget class="QLineEdit" name="topMarginLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>60</width>
+         <height>16777215</height>
+        </size>
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="documentUnitsLabel">
+     <item row="0" column="0">
+      <widget class="QLabel" name="pageSizeLabel">
        <property name="text">
-        <string>Units</string>
+        <string>Page size</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="bottomMarginLabel">
-       <property name="minimumSize">
+     <item row="9" column="1">
+      <widget class="QLineEdit" name="beatWidthLineEdit">
+       <property name="maximumSize">
         <size>
-         <width>0</width>
-         <height>0</height>
+         <width>60</width>
+         <height>16777215</height>
         </size>
        </property>
-       <property name="text">
-        <string>Bottom margin</string>
-       </property>
       </widget>
      </item>
      <item row="2" column="0">
@@ -204,8 +243,8 @@
        </property>
       </widget>
      </item>
-     <item row="10" column="1">
-      <widget class="QCheckBox" name="includedFontCheckBox">
+     <item row="5" column="0">
+      <widget class="QLabel" name="bottomMarginLabel">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -213,15 +252,12 @@
         </size>
        </property>
        <property name="text">
-        <string>Use FreeSans</string>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
+        <string>Bottom margin</string>
        </property>
       </widget>
      </item>
-     <item row="12" column="0">
-      <widget class="QLabel" name="beatWidthLabel">
+     <item row="8" column="0">
+      <widget class="QLabel" name="lineSpacingLabel">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -229,7 +265,7 @@
         </size>
        </property>
        <property name="text">
-        <string>Beat width</string>
+        <string>Line spacing</string>
        </property>
       </widget>
      </item>
@@ -246,31 +282,25 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
-      <widget class="QComboBox" name="documentUnitsComboBox">
-       <property name="enabled">
-        <bool>true</bool>
+     <item row="1" column="0">
+      <widget class="QLabel" name="documentUnitsLabel">
+       <property name="text">
+        <string>Units</string>
        </property>
-       <property name="maximumSize">
+      </widget>
+     </item>
+     <item row="8" column="1">
+      <widget class="QDoubleSpinBox" name="lineSpacingDoubleSpinBox">
+       <property name="minimumSize">
         <size>
          <width>70</width>
-         <height>26</height>
+         <height>0</height>
         </size>
        </property>
-       <property name="editable">
-        <bool>true</bool>
-       </property>
-       <property name="frame">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="0" colspan="2">
-      <widget class="QFontComboBox" name="fontComboBox">
        <property name="maximumSize">
         <size>
-         <width>16777215</width>
-         <height>26</height>
+         <width>70</width>
+         <height>16777215</height>
         </size>
        </property>
       </widget>

ui/sections.ui

@@ -157,7 +157,7 @@
   <customwidget>
    <class>SectionTableView</class>
    <extends>QTableView</extends>
-   <header>chordsheet/tableView.h</header>
+   <header>csgui/tableView.h</header>
   </customwidget>
  </customwidgets>
  <resources/>