diff --git a/nw/gui/doctree.py b/nw/gui/doctree.py index 2dcac2a0..51ee896a 100644 --- a/nw/gui/doctree.py +++ b/nw/gui/doctree.py @@ -76,6 +76,17 @@ class GuiDocTree(QTreeWidget): return + def moveTreeItem(self, tHandle, nStep): + tItem = self.theMap[tHandle] + pItem = tItem.parent() + tIndex = pItem.indexOfChild(tItem) + nChild = pItem.childCount() + nIndex = tIndex + nStep + if nIndex < 0 or nIndex >= nChild: return + cItem = pItem.takeChild(tIndex) + pItem.insertChild(nIndex, cItem) + return + def saveTreeOrder(self): theList = [] for i in range(self.topLevelItemCount()): diff --git a/nw/gui/winmain.py b/nw/gui/winmain.py index b17fcbc2..9eaea1af 100644 --- a/nw/gui/winmain.py +++ b/nw/gui/winmain.py @@ -220,9 +220,9 @@ class GuiMain(QMainWindow): elif selAction == nwItemAction.ADD_FILE: self.treeView.newTreeItem(selHandle, selType, selClass) elif selAction == nwItemAction.MOVE_UP: - pass + self.treeView.moveTreeItem(selHandle, -1) elif selAction == nwItemAction.MOVE_DOWN: - pass + self.treeView.moveTreeItem(selHandle, 1) elif selAction == nwItemAction.MOVE_TO: pass elif selAction == nwItemAction.MOVE_TRASH: @@ -302,7 +302,7 @@ class GuiMain(QMainWindow): for recentProject in self.mainConf.recentList: if recentProject == "": continue menuItem = QAction(QIcon.fromTheme("folder-open"), "%d: %s" % (itemCount,recentProject), fileMenu) - menuItem.triggered.connect(lambda: self.openRecentProject(itemCount)) + menuItem.triggered.connect(lambda: self.openRecentProject(0)) recentMenu.addAction(menuItem) itemCount += 1 diff --git a/sample/sampleNovel/data_9/6b68994dfa3d_main.nwd b/sample/sampleNovel/data_9/6b68994dfa3d_main.nwd index b738b4d3..2a191117 100644 --- a/sample/sampleNovel/data_9/6b68994dfa3d_main.nwd +++ b/sample/sampleNovel/data_9/6b68994dfa3d_main.nwd @@ -8,7 +8,7 @@ **Lorem** ipsum dolor sit amet, consectetur "adipiscing" elit. Proin vitae nisi augue. Sed elementum lacus risus, eu lobortis ipsum malesuada rutrum. Nam egestas elit id commodo porta. **Ut eget lacinia ipsum, non interdum mi.** Sed tincidunt commodo metus, at faucibus nisi finibus eget. In malesuada egestas nulla et tempor. _Nulla eu sem_ vel mi sollicitudin cursus. “Nullam ultricies ex eu dui ‘scelerisque’, ut venenatis turpis ultricies.” -Nunc in ex molestie, __efficitur__ diam ~~semper~~, pellentesque eros. Morbi vel lacus quis turpis sagittis iaculis. Sed rhoncus tortor et finibus lobortis. Suspendisse non ultrices odio, at venenatis mi. Sed congue congue tortor, et egestas neque malesuada ac. Nulla facilisi. Maecenas finibus elementum vestibulum. Nam id rhoncus mauris, vel “ullamcorper” «neque». +Nunc in ex molestie, __efficitur__ diam semper, pellentesque eros. Morbi vel lacus quis turpis sagittis iaculis. Sed rhoncus tortor et finibus lobortis. Suspendisse non ultrices odio, at venenatis mi. Sed congue congue tortor, et egestas neque malesuada ac. Nulla facilisi. Maecenas finibus elementum vestibulum. Nam id rhoncus mauris, vel “ullamcorper” «neque». Quisque mattis magna purus, vel ultricies sem feugiat pellentesque. Nam mi nisl, consectetur vel facilisis nec, condimentum at libero. Sed dolor lacus, fermentum vel nisi sed, auctor pretium urna. Nulla accumsan arcu ut ligula faucibus, non facilisis mi tempor. Nam consectetur dui dapibus lectus cursus, sed laoreet nisl maximus. Maecenas eleifend sapien eu porttitor placerat. Maecenas quis massa non tortor imperdiet porta. Nunc non tristique magna. Vivamus ornare quam convallis metus vestibulum, id molestie quam pretium. Maecenas tincidunt tincidunt tortor lobortis suscipit. Vivamus tempor dolor quis auctor sollicitudin. Integer imperdiet urna dui, at vehicula dui consequat vitae. Donec aliquet feugiat tellus sed dignissim. Nulla pretium libero ut elit porta sagittis. Praesent commodo vulputate lacinia. diff --git a/sample/sampleNovel/nwProject.nwx b/sample/sampleNovel/nwProject.nwx index d9b994ab..879e291b 100644 --- a/sample/sampleNovel/nwProject.nwx +++ b/sample/sampleNovel/nwProject.nwx @@ -78,7 +78,7 @@ World ROOT - NONE + WORLD 0 False False