ivan
/
chordsheet
1
0
Fork 0
Code Issues Pull Requests Releases 11 Wiki Activity
Browse Source

merge remote changes 

Merge branch 'master' of https://git.radivan.net/ivan/chordsheet
master
Ivan Holmes 3 years ago
parent
44147406c8 41a67c5e55
commit
1d313f420e
3 changed files with 111 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .gitignore
  2. 15
      csgui/pdfViewer.py
  3. 173
      ui/psetup.ui

3
.gitignore
View File

@ -52,3 +52,6 @@ docs/_build/
# Mac stuff # Mac stuff
.DS_Store .DS_Store
.vscode/ .vscode/
# Syncthing conflicts
*.sync-conflict-*

15
csgui/pdfViewer.py
View File

@ -28,7 +28,10 @@ class PDFLabel(QLabel):
parentMargins[0]*2 + scrollBarWidth parentMargins[0]*2 + scrollBarWidth
idealWidth = self.parent.width() - totalMargin idealWidth = self.parent.width() - totalMargin
print(idealWidth)
pixSize = self.pixmap().size() pixSize = self.pixmap().size()
print(pixSize)
print((self.parent.scrollAreaContents.size()))
pixSize.scale(idealWidth, 1000000, Qt.KeepAspectRatio) pixSize.scale(idealWidth, 1000000, Qt.KeepAspectRatio)
@ -48,6 +51,7 @@ class PDFViewer(QScrollArea):
self.scrollAreaContents.setLayout(self.scrollAreaLayout) self.scrollAreaContents.setLayout(self.scrollAreaLayout)
self.pixmapList = [] self.pixmapList = []
self.lastVScrollPosition = None
def update_pdf(self, pdf): def update_pdf(self, pdf):
self.render(pdf) self.render(pdf)
@ -62,9 +66,11 @@ class PDFViewer(QScrollArea):
self.pixmapList = [] self.pixmapList = []
pdfView = fitz.Document(stream=pdf, filetype='pdf') pdfView = fitz.Document(stream=pdf, filetype='pdf')
for page in pdfView: for page in pdfView:
self.pixmapList.append(page.get_pixmap(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): def clear(self):
self.lastVScrollPosition = self.verticalScrollBar().value()
while self.scrollAreaLayout.count(): while self.scrollAreaLayout.count():
item = self.scrollAreaLayout.takeAt(0) item = self.scrollAreaLayout.takeAt(0)
w = item.widget() w = item.widget()
@ -79,4 +85,9 @@ class PDFViewer(QScrollArea):
label.setPixmap(QPixmap.fromImage(qtimg)) label.setPixmap(QPixmap.fromImage(qtimg))
self.scrollAreaLayout.addWidget(label) self.scrollAreaLayout.addWidget(label)
# self.scrollAreaLayout.addStretch(1)
self.scrollAreaLayout.addStretch(1)
# 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)

173
ui/psetup.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>257</width>
<height>271</height>
<width>210</width>
<height>334</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -37,8 +37,8 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="11" column="0">
<widget class="QLabel" name="lineSpacingLabel">
<item row="12" column="0">
<widget class="QLabel" name="beatWidthLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -46,7 +46,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Line spacing</string>
<string>Beat width</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -60,19 +60,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0">
<widget class="QLabel" name="fontLabel">
<property name="maximumSize">
<size>
<width>40</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Font</string>
</property>
</widget>
</item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QLineEdit" name="bottomMarginLineEdit"> <widget class="QLineEdit" name="bottomMarginLineEdit">
<property name="maximumSize"> <property name="maximumSize">
@ -83,39 +70,32 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1">
<widget class="QLineEdit" name="topMarginLineEdit">
<property name="maximumSize">
<item row="11" column="0">
<widget class="QLabel" name="lineSpacingLabel">
<property name="minimumSize">
<size> <size>
<width>60</width>
<height>16777215</height>
<width>0</width>
<height>0</height>
</size> </size>
</property> </property>
<property name="text">
<string>Line spacing</string>
</property>
</widget> </widget>
</item> </item>
<item row="11" column="1">
<widget class="QDoubleSpinBox" name="lineSpacingDoubleSpinBox">
<item row="10" column="1">
<widget class="QCheckBox" name="includedFontCheckBox">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>70</width>
<width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize">
<size>
<width>70</width>
<height>16777215</height>
</size>
<property name="text">
<string>FreeSans</string>
</property> </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="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -135,22 +115,33 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<widget class="QLabel" name="topMarginLabel">
<property name="minimumSize">
<item row="1" column="0">
<widget class="QLabel" name="documentUnitsLabel">
<property name="text">
<string>Units</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="topMarginLineEdit">
<property name="maximumSize">
<size> <size>
<width>0</width>
<height>0</height>
<width>60</width>
<height>16777215</height>
</size> </size>
</property> </property>
<property name="maximumSize">
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="bottomMarginLabel">
<property name="minimumSize">
<size> <size>
<width>16777215</width>
<height>16777194</height>
<width>0</width>
<height>0</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Top margin</string>
<string>Bottom margin</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -171,15 +162,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="documentUnitsLabel">
<property name="text">
<string>Units</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="bottomMarginLabel">
<item row="3" column="0">
<widget class="QLabel" name="rightMarginLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -187,25 +171,38 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Bottom margin</string>
<string>Right margin</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QLabel" name="leftMarginLabel">
<item row="3" column="1">
<widget class="QLineEdit" name="rightMarginLineEdit">
<property name="maximumSize">
<size>
<width>60</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QDoubleSpinBox" name="lineSpacingDoubleSpinBox">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width>
<width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="text">
<string>Left margin</string>
<property name="maximumSize">
<size>
<width>70</width>
<height>16777215</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1">
<widget class="QCheckBox" name="includedFontCheckBox">
<item row="2" column="0">
<widget class="QLabel" name="leftMarginLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -213,36 +210,39 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Use FreeSans</string>
</property>
<property name="checked">
<bool>true</bool>
<string>Left margin</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0">
<widget class="QLabel" name="beatWidthLabel">
<property name="minimumSize">
<item row="10" column="0">
<widget class="QLabel" name="fontLabel">
<property name="maximumSize">
<size> <size>
<width>0</width>
<height>0</height>
<width>40</width>
<height>16777215</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Beat width</string>
<string>Font</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0">
<widget class="QLabel" name="rightMarginLabel">
<item row="4" column="0">
<widget class="QLabel" name="topMarginLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777194</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Right margin</string>
<string>Top margin</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -267,12 +267,27 @@
</item> </item>
<item row="6" column="0" colspan="2"> <item row="6" column="0" colspan="2">
<widget class="QFontComboBox" name="fontComboBox"> <widget class="QFontComboBox" name="fontComboBox">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>26</height> <height>26</height>
</size> </size>
</property> </property>
<property name="maxVisibleItems">
<number>12</number>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
<property name="frame">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

Write Preview
Loading…
Cancel
Save