CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-04-26 09:12:05 +12:00
Code Issues Projects Releases Wiki Activity

Combined #777 with changes from #827

Browse source 
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
This commit is contained in:
TheJackiMonster 2021-04-10 14:46:03 +02:00
parent 653357d2e9
commit 173531ef2c
No known key found for this signature in database
GPG key ID: D850A5F772E880F9
3 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -14,6 +14,7 @@
.python-version .python-version
.settings/org.eclipse.core.resources.prefs .settings/org.eclipse.core.resources.prefs
.vscode .vscode
.vimrc
ExportTest ExportTest
Notes.t2t Notes.t2t
dist dist

17
manuskript/models/abstractModel.py
View file

@ -438,23 +438,10 @@ class abstractModel(QAbstractItemModel):
for item in items: for item in items:
if item.ID() in IDs: if item.ID() in IDs:
def makeNewID(item): item.getUniqueID(recursive=true)
k = 1
while True: # Python doesn't have "Do...While"
ks = str(k)
if ks not in IDs:
item.setData(Outline.ID,ks)
IDs.append(ks) #Keep track of new IDs allocated.
for c in item.children():
makeNewID(c)
break # Actual Loop Exit
else:
k = k+1 # Try the next candidate ID
makeNewID(item)
r = self.insertItems(items, beginRow, parent) r = self.insertItems(items, beginRow, parent)
return r return r
################# ADDING AND REMOVING ################# ################# ADDING AND REMOVING #################

6
manuskript/ui/mainWindow.py
View file

@ -2,9 +2,10 @@
# Form implementation generated from reading ui file 'manuskript/ui/mainWindow.ui' # Form implementation generated from reading ui file 'manuskript/ui/mainWindow.ui'
# #
# Created by: PyQt5 UI code generator 5.14.1 # Created by: PyQt5 UI code generator 5.15.4
# #
# WARNING! All changes made in this file will be lost! # WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
@ -1655,7 +1656,6 @@ class Ui_MainWindow(object):
self.actFormatBlockquote.setText(_translate("MainWindow", "B&lockquote")) self.actFormatBlockquote.setText(_translate("MainWindow", "B&lockquote"))
self.actSearch.setText(_translate("MainWindow", "Search")) self.actSearch.setText(_translate("MainWindow", "Search"))
self.actSearch.setShortcut(_translate("MainWindow", "Ctrl+F")) self.actSearch.setShortcut(_translate("MainWindow", "Ctrl+F"))
from manuskript.ui.cheatSheet import cheatSheet from manuskript.ui.cheatSheet import cheatSheet
from manuskript.ui.editors.mainEditor import mainEditor from manuskript.ui.editors.mainEditor import mainEditor
from manuskript.ui.search import search from manuskript.ui.search import search