Commit 0247dacd909fe9cccf21d8d3f85b5065c93d7d37

Jakub Wieczorek <faw217 @gm…l.com>
Wed Jun 17 19:45:49 CEST 2009

Tree SHA1: 92698a4
Parent SHA1: 792e62f (LineEditStyle, which is used against Qt 4.4, returns a rectangle that)
raw diff | raw patch

When displaying a context menu on the bookmarks toolbar, don't assume
that there is a bookmark or a folder under the cursor so that the
actions that are not context-dependant will be displayed on the entire
width of the toolbar.

Diff rendering mode:
inline
side by side


65	65	void BookmarksToolBar::contextMenuRequested(const QPoint &position)
66	66	{
67	67	QAction *action = actionAt(position);
68		if (!action)
69		return;
70		QVariant variant = action->data();
71		if (!variant.canConvert<QModelIndex>())
72		return;
73
74	68	QMenu menu;
75		QAction *menuAction = 0;
76	69
77		if (!action->menu()) {
78		menuAction = menu.addAction(tr("Open"), this, SLOT(openBookmarkInCurrentTab()));
79		menuAction->setData(variant);
	70	if (action) {
	71	QVariant variant = action->data();
	72	Q_ASSERT(variant.canConvert<QModelIndex>());
80	73
81		menuAction = menu.addAction(tr("Open in New &Tab"), this, SLOT(openBookmarkInNewTab()));
	74	QAction *menuAction = 0;
	75
	76	if (!action->menu()) {
	77	menuAction = menu.addAction(tr("Open"), this, SLOT(openBookmarkInCurrentTab()));
	78	menuAction->setData(variant);
	79
	80	menuAction = menu.addAction(tr("Open in New &Tab"), this, SLOT(openBookmarkInNewTab()));
	81	menuAction->setData(variant);
	82
	83	menu.addSeparator();
	84	}
	85
	86	menuAction = menu.addAction(tr("Remove"), this, SLOT(removeBookmark()));
82	87	menuAction->setData(variant);
83	88
84	89	menu.addSeparator();
85	90	}
86
87		menuAction = menu.addAction(tr("Remove"), this, SLOT(removeBookmark()));
88		menuAction->setData(variant);
89
90		menu.addSeparator();
91	91
92	92	menu.addAction(tr("Add Bookmark..."), this, SLOT(newBookmark()));
93	93	menu.addAction(tr("Add Folder..."), this, SLOT(newFolder()));

Commit 0247dacd909fe9cccf21d8d3f85b5065c93d7d37

Gitorious