diff -r 96232974dcdb -r 645c12de6b0c Helpviewer/Bookmarks/BookmarksDialog.py --- a/Helpviewer/Bookmarks/BookmarksDialog.py Sun Mar 30 22:00:14 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksDialog.py Thu Apr 03 23:05:31 2014 +0200 @@ -64,9 +64,9 @@ self.bookmarksTree.customContextMenuRequested.connect( self.__customContextMenuRequested) - self.removeButton.clicked[()].connect( + self.removeButton.clicked.connect( self.bookmarksTree.removeSelected) - self.addFolderButton.clicked[()].connect(self.__newFolder) + self.addFolderButton.clicked.connect(self.__newFolder) self.__expandNodes(self.__bookmarksManager.bookmarks()) @@ -142,20 +142,20 @@ node = self.__bookmarksModel.node(sourceIndex) if idx.isValid() and node.type() != BookmarkNode.Folder: menu.addAction( - self.trUtf8("&Open"), self.__openBookmarkInCurrentTab) + self.tr("&Open"), self.__openBookmarkInCurrentTab) menu.addAction( - self.trUtf8("Open in New &Tab"), self.__openBookmarkInNewTab) + self.tr("Open in New &Tab"), self.__openBookmarkInNewTab) menu.addSeparator() - act = menu.addAction(self.trUtf8("Edit &Name"), self.__editName) + act = menu.addAction(self.tr("Edit &Name"), self.__editName) act.setEnabled(idx.flags() & Qt.ItemIsEditable) if idx.isValid() and node.type() != BookmarkNode.Folder: - menu.addAction(self.trUtf8("Edit &Address"), self.__editAddress) + menu.addAction(self.tr("Edit &Address"), self.__editAddress) menu.addSeparator() act = menu.addAction( - self.trUtf8("&Delete"), self.bookmarksTree.removeSelected) + self.tr("&Delete"), self.bookmarksTree.removeSelected) act.setEnabled(idx.flags() & Qt.ItemIsDragEnabled) menu.addSeparator() - act = menu.addAction(self.trUtf8("&Properties..."), self.__edit) + act = menu.addAction(self.tr("&Properties..."), self.__edit) act.setEnabled(idx.flags() & Qt.ItemIsEditable) menu.exec_(QCursor.pos()) @@ -260,5 +260,5 @@ idx = self.__proxyModel.mapToSource(idx) parent = self.__bookmarksModel.node(idx) node = BookmarkNode(BookmarkNode.Folder) - node.title = self.trUtf8("New Folder") + node.title = self.tr("New Folder") self.__bookmarksManager.addBookmark(parent, node, row)