81 |
81 |
82 if act is not None: |
82 if act is not None: |
83 v = act.data() |
83 v = act.data() |
84 |
84 |
85 if act.menu() is None: |
85 if act.menu() is None: |
86 menuAction = menu.addAction( |
86 menu.addAction( |
87 self.tr("&Open"), self.__openBookmark) |
87 self.tr("Open"), |
88 menuAction.setData(v) |
88 self.__openBookmark).setData(v) |
89 menuAction = menu.addAction( |
89 menu.addAction( |
90 self.tr("Open in New &Tab\tCtrl+LMB"), |
90 self.tr("Open in New Tab\tCtrl+LMB"), |
91 self.__openBookmarkInNewTab) |
91 self.__openBookmarkInNewTab).setData(v) |
92 menuAction.setData(v) |
92 menu.addAction( |
93 # TODO: Bookmarks: add open in new window |
93 self.tr("Open in New Window"), |
94 # TODO: Bookmarks: add open in private window |
94 self.__openBookmarkInNewWindow).setData(v) |
|
95 menu.addAction( |
|
96 self.tr("Open in New Private Window"), |
|
97 self.__openBookmarkInPrivateWindow).setData(v) |
95 menu.addSeparator() |
98 menu.addSeparator() |
96 |
99 |
97 menuAction = menu.addAction( |
100 menu.addAction( |
98 self.tr("&Remove"), self.__removeBookmark) |
101 self.tr("Remove"), |
99 menuAction.setData(v) |
102 self.__removeBookmark).setData(v) |
100 menu.addSeparator() |
103 menu.addSeparator() |
101 |
104 |
102 menuAction = menu.addAction( |
105 menu.addAction( |
103 self.tr("&Properties..."), self.__edit) |
106 self.tr("Properties..."), |
104 menuAction.setData(v) |
107 self.__edit).setData(v) |
105 menu.addSeparator() |
108 menu.addSeparator() |
106 |
109 |
107 menu.addAction(self.tr("Add &Bookmark..."), self.__newBookmark) |
110 menu.addAction(self.tr("Add Bookmark..."), self.__newBookmark) |
108 menu.addAction(self.tr("Add &Folder..."), self.__newFolder) |
111 menu.addAction(self.tr("Add Folder..."), self.__newFolder) |
109 |
112 |
110 menu.exec_(QCursor.pos()) |
113 menu.exec_(QCursor.pos()) |
111 |
114 |
112 def __bookmarkActivated(self, idx): |
115 def __bookmarkActivated(self, idx): |
113 """ |
116 """ |
165 |
168 |
166 self.newUrl.emit( |
169 self.newUrl.emit( |
167 idx.data(BookmarksModel.UrlRole), |
170 idx.data(BookmarksModel.UrlRole), |
168 idx.data(Qt.DisplayRole)) |
171 idx.data(Qt.DisplayRole)) |
169 |
172 |
|
173 def __openBookmarkInNewWindow(self): |
|
174 """ |
|
175 Private slot to open a bookmark in a new window. |
|
176 """ |
|
177 idx = self.index(self.sender()) |
|
178 url = idx.data(BookmarksModel.UrlRole) |
|
179 |
|
180 from WebBrowser.WebBrowserWindow import WebBrowserWindow |
|
181 WebBrowserWindow.mainWindow().newWindow(url) |
|
182 |
|
183 def __openBookmarkInPrivateWindow(self): |
|
184 """ |
|
185 Private slot to open a bookmark in a new private window. |
|
186 """ |
|
187 idx = self.index(self.sender()) |
|
188 url = idx.data(BookmarksModel.UrlRole) |
|
189 |
|
190 from WebBrowser.WebBrowserWindow import WebBrowserWindow |
|
191 WebBrowserWindow.mainWindow().newPrivateWindow(url) |
|
192 |
170 def __removeBookmark(self): |
193 def __removeBookmark(self): |
171 """ |
194 """ |
172 Private slot to remove a bookmark. |
195 Private slot to remove a bookmark. |
173 """ |
196 """ |
174 idx = self.index(self.sender()) |
197 idx = self.index(self.sender()) |