← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/arora/oneiric

~ubuntu-branches/ubuntu/oneiric/arora/oneiric

« back to all changes in this revision

Viewing changes to src/bookmarks/bookmarkstoolbar.cpp

Committer: Bazaar Package Importer
Author(s): Roderick B. Greening
Date: 2009-09-10 15:24:04 UTC
mfrom: (1.1.10 upstream)
Revision ID: james.westby@ubuntu.com-20090910152404-668k22ux3mfap6g0

Tags: 0.9.0-0ubuntu1

* New upstream release
* Update patches:
  - kubuntu_02_default_bookmarks.diff
* Remove patches:
  - kubuntu_04_startpage_spacing.diff (fixed upstream)
  - kubuntu_05_manpages.diff (fixed upstream)
  - kubuntu_07_adblock.diff (unstable/unsuitable)

files added:
autotests/opensearchengine/opensearchengine.qrc

autotests/opensearchengine/suggestions.txt

debian-upstream/arora.menu

debian-upstream/arora.postinst

debian-upstream/arora.prerm

debian-upstream/watch

src/autosaver.cpp

src/autosaver.h

src/network

src/network/cookiejar

src/network/cookiejar/cookiedialog.cpp

src/network/cookiejar/cookiedialog.h

src/network/cookiejar/cookieexceptionsdialog.cpp

src/network/cookiejar/cookieexceptionsdialog.h

src/network/cookiejar/cookieexceptionsmodel.cpp

src/network/cookiejar/cookieexceptionsmodel.h

src/network/cookiejar/cookiejar.cpp

src/network/cookiejar/cookiejar.h

src/network/cookiejar/cookiejar.pri

src/network/cookiejar/cookiemodel.cpp

src/network/cookiejar/cookiemodel.h

src/network/cookiejar/cookies.ui

src/network/cookiejar/cookiesexceptions.ui

src/network/cookiejar/networkcookiejar

src/network/cookiejar/networkcookiejar/MOZILLA_LICENSE.txt

src/network/cookiejar/networkcookiejar/networkcookiejar.cpp

src/network/cookiejar/networkcookiejar/networkcookiejar.h

src/network/cookiejar/networkcookiejar/networkcookiejar.pri

src/network/cookiejar/networkcookiejar/networkcookiejar_p.h

src/network/cookiejar/networkcookiejar/trie_p.h

src/network/cookiejar/networkcookiejar/twoleveldomains_p.h

src/network/fileaccesshandler.cpp

src/network/fileaccesshandler.h

src/network/network.pri

src/network/networkaccessmanager.cpp

src/network/networkaccessmanager.h

src/network/networkdiskcache.cpp

src/network/networkdiskcache.h

src/network/networkproxyfactory.cpp

src/network/networkproxyfactory.h

src/network/passworddialog.ui

src/network/proxy.ui

src/network/schemeaccesshandler.cpp

src/network/schemeaccesshandler.h

src/opensearch/opensearchenginedelegate.cpp

src/opensearch/opensearchenginedelegate.h

src/utils/explorerstyle.cpp

src/utils/explorerstyle.h

src/utils/languagemanager.cpp

src/utils/languagemanager.h

files removed:
debian/patches/diff

debian/patches/kubuntu_04_startpage_spacing.diff

debian/patches/kubuntu_05_manpages.diff

debian/patches/kubuntu_07_adblock.diff

src/cookiejar

src/cookiejar/cookiedialog.cpp

src/cookiejar/cookiedialog.h

src/cookiejar/cookieexceptionsdialog.cpp

src/cookiejar/cookieexceptionsdialog.h

src/cookiejar/cookieexceptionsmodel.cpp

src/cookiejar/cookieexceptionsmodel.h

src/cookiejar/cookiejar.cpp

src/cookiejar/cookiejar.h

src/cookiejar/cookiejar.pri

src/cookiejar/cookiemodel.cpp

src/cookiejar/cookiemodel.h

src/cookiejar/cookies.ui

src/cookiejar/cookiesexceptions.ui

src/cookiejar/networkcookiejar

src/cookiejar/networkcookiejar/MOZILLA_LICENSE.txt

src/cookiejar/networkcookiejar/networkcookiejar.cpp

src/cookiejar/networkcookiejar/networkcookiejar.h

src/cookiejar/networkcookiejar/networkcookiejar.pri

src/cookiejar/networkcookiejar/networkcookiejar_p.h

src/cookiejar/networkcookiejar/trie_p.h

src/cookiejar/networkcookiejar/twoleveldomains_p.h

src/explorerstyle.cpp

src/explorerstyle.h

src/explorerstyle.pri

src/languagemanager.cpp

src/languagemanager.h

src/networkaccessmanager.cpp

src/networkaccessmanager.h

src/passworddialog.ui

src/proxy.ui

src/schemeaccesshandler.cpp

src/schemeaccesshandler.h

src/utils/autosaver.cpp

src/utils/autosaver.h

src/utils/proxystyle.h

files modified:
AUTHORS

ChangeLog

autotests/historymanager/tst_historymanager.cpp

autotests/languagemanager/languagemanager.pro

autotests/languagemanager/tst_languagemanager.cpp

autotests/opensearchengine/opensearchengine.pro

autotests/opensearchengine/tst_opensearchengine.cpp

autotests/opensearchmanager/tst_opensearchmanager.cpp

autotests/opensearchreader/opensearchreader.pro

autotests/opensearchreader/testfile1.xml

autotests/opensearchreader/testfile3.xml

autotests/opensearchreader/tst_opensearchreader.cpp

autotests/opensearchwriter/opensearchwriter.pro

autotests/opensearchwriter/testfile2.xml

autotests/opensearchwriter/testfile3.xml

autotests/opensearchwriter/tst_opensearchwriter.cpp

autotests/tabbar/tst_tabbar.cpp

autotests/webpage/tst_webpage.cpp

buildosx.sh

debian-upstream/changelog.in

debian-upstream/control

debian-upstream/copyright

debian/changelog

debian/patches/kubuntu_02_default_bookmarks.diff

debian/patches/series

generateReleaseContributors

git_hooks/findstyleerrors.sh

src/aboutdialog.cpp

src/aboutdialog.ui

src/arora.desktop

src/bookmarks/bookmarkstoolbar.cpp

src/browserapplication.cpp

src/browserapplication.h

src/browsermainwindow.cpp

src/browsermainwindow.h

src/clearprivatedata.cpp

src/data/defaultbookmarks.xbel

src/downloadmanager.cpp

src/downloadmanager.h

src/downloads.ui

src/history/historycompleter.cpp

src/htmls/startpage.css

src/locale/ast.ts

src/locale/ca.ts

src/locale/cs_CZ.ts

src/locale/da_DK.ts

src/locale/de_DE.ts

src/locale/el_GR.ts

src/locale/es.ts

src/locale/es_CR.ts

src/locale/et_EE.ts

src/locale/fi_FI.ts

src/locale/fr_CA.ts

src/locale/fr_FR.ts

src/locale/gl.ts

src/locale/he_IL.ts

src/locale/hu_HU.ts

src/locale/it_IT.ts

src/locale/ja_JP.ts

src/locale/ms.ts

src/locale/nb_NO.ts

src/locale/nl_NL.ts *

src/locale/pl_PL.ts

src/locale/pt_BR.ts

src/locale/ru_RU.ts

src/locale/sk_SK.ts

src/locale/sr_RS.ts

src/locale/sr_RS@latin.ts

src/locale/tr_TR.ts

src/locale/uk.ts

src/locale/zh_CN.ts

src/locale/zh_TW.ts

src/locationbar/locationbar.cpp

src/opensearch/opensearch.pri

src/opensearch/opensearchdialog.cpp

src/opensearch/opensearchdialog.ui

src/opensearch/opensearchengine.cpp

src/opensearch/opensearchengine.h

src/opensearch/opensearchengineaction.cpp

src/opensearch/opensearchenginemodel.cpp

src/opensearch/opensearchenginemodel.h

src/opensearch/opensearchmanager.cpp

src/opensearch/opensearchmanager.h

src/opensearch/opensearchreader.cpp

src/opensearch/opensearchreader.h

src/opensearch/opensearchwriter.cpp

src/opensearch/opensearchwriter.h

src/qwebplugins/arorawebplugin.cpp

src/qwebplugins/arorawebplugin.h

src/qwebplugins/clicktoflash/clicktoflashplugin.cpp

src/qwebplugins/clicktoflash/clicktoflashplugin.h

src/qwebplugins/webpluginfactory.cpp

src/settings.cpp

src/settings.h

src/settings.ui

src/sourceviewer.cpp

src/sourceviewer.h

src/src.pri

src/tabbar.cpp

src/tabbar.h

src/tabwidget.cpp

src/tabwidget.h

src/toolbarsearch.cpp

src/utils/README

src/utils/lineedit.cpp

src/utils/lineedit.h

src/utils/lineedit_p.h

src/utils/utils.pri

src/webpage.cpp

src/webview.cpp

src/webview.h

tools/cacheinfo/data/arora-cacheinfo.1

tools/htmlToXBel/data/htmlToXBel.1

tools/placesimport/data/arora-placesimport.1

tools/tools.pro

windowsinstaller.nsi

Show diffs side-by-side

added added

removed removed

src/bookmarks/bookmarkstoolbar.cpp

47

47

connect(m_bookmarksModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SLOT(build()));

48

48

connect(m_bookmarksModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(build()));

49

49

setAcceptDrops(true);

50

setHidden(true);

50

51

}

51

52

52

53

QModelIndex BookmarksToolBar::index(QAction *action)

175

176

QAction *action = actionAt(event->pos());

176

177

QModelIndex index = this->index(action);

177

178

178

if (action && action->menu() && index.isValid())

179

parentIndex = index;

179

if (action && action->menu()) {

180

if (action->menu()->isAncestorOf(event->source()))

181

return;

182

if (index.isValid())

183

parentIndex = index;

184

}

180

185

181

186

BookmarkNode *node = new BookmarkNode(BookmarkNode::Bookmark);

182

187

node->url = QString::fromUtf8(url.toEncoded());

Older »