← Back to branch summary

~ubuntu-branches/ubuntu/quantal/arora/quantal

~ubuntu-branches/ubuntu/quantal/arora/quantal

« back to all changes in this revision

Viewing changes to src/aboutdialog.cpp

Committer: Bazaar Package Importer
Author(s): Roderick B. Greening
Date: 2009-10-01 16:08:58 UTC
mfrom: (1.1.11 upstream)
Revision ID: james.westby@ubuntu.com-20091001160858-h1wnt3ddyzl07nih

Tags: 0.10.0-0ubuntu1

* New upstream release
* Remove patches
- kubuntu_01_google_lucky.diff - Open Search now used upstream
- kubuntu_02_default_bookmarks.diff - bookmarks fixed upstream

files added:
autotests/adblock

autotests/adblock/adblock.pro

autotests/adblock/adblockmanager

autotests/adblock/adblockmanager/adblockmanager.pro

autotests/adblock/adblockmanager/tst_adblockmanager.cpp

autotests/adblock/adblocknetwork

autotests/adblock/adblocknetwork/adblocknetwork.pro

autotests/adblock/adblocknetwork/tst_adblocknetwork.cpp

autotests/adblock/adblockpage

autotests/adblock/adblockpage/adblockpage.pro

autotests/adblock/adblockpage/test.html

autotests/adblock/adblockpage/tst_adblockpage.cpp

autotests/adblock/adblockrule

autotests/adblock/adblockrule/adblockrule.pro

autotests/adblock/adblockrule/tst_adblockrule.cpp

autotests/adblock/adblocksubscription

autotests/adblock/adblocksubscription/adblocksubscription.pro

autotests/adblock/adblocksubscription/rules.txt

autotests/adblock/adblocksubscription/tst_adblocksubscription.cpp

autotests/modeltoolbar

autotests/modeltoolbar/modeltoolbar.pro

autotests/modeltoolbar/tst_modeltoolbar.cpp

autotests/utils

autotests/utils/editlistview

autotests/utils/editlistview/editlistview.pro

autotests/utils/editlistview/tst_editlistview.cpp

autotests/utils/edittreeview

autotests/utils/edittreeview/edittreeview.pro

autotests/utils/edittreeview/tst_edittreeview.cpp

autotests/utils/languagemanager

autotests/utils/languagemanager/languagemanager.pro

autotests/utils/languagemanager/tst_languagemanager.cpp

autotests/utils/lineedit

autotests/utils/lineedit/lineedit.pro

autotests/utils/lineedit/tst_lineedit.cpp

autotests/utils/networkaccessmanagerproxy

autotests/utils/networkaccessmanagerproxy/networkaccessmanagerproxy.pro

autotests/utils/networkaccessmanagerproxy/tst_networkaccessmanagerproxy.cpp

autotests/utils/utils.pro

autotests/utils/webpageproxy

autotests/utils/webpageproxy/tst_webpageproxy.cpp

autotests/utils/webpageproxy/webpageproxy.pro

git_hooks/pre-commit_copyrightyear

manualtests/adblock

manualtests/adblock/adblock.pro

manualtests/adblock/adblockdialog

manualtests/adblock/adblockdialog/adblockdialog.pro

manualtests/adblock/adblockdialog/main_adblockdialog.cpp

manualtests/adblock/adblockmodel

manualtests/adblock/adblockmodel/adblockmodel.pro

manualtests/adblock/adblockmodel/main_adblockmodel.cpp

manualtests/utils

manualtests/utils/editview

manualtests/utils/editview/editview.pro

manualtests/utils/editview/editview.ui

manualtests/utils/editview/main_editview.cpp

manualtests/utils/lineedit

manualtests/utils/lineedit/bookmark.png

manualtests/utils/lineedit/dialog.ui

manualtests/utils/lineedit/lineedit.pro

manualtests/utils/lineedit/main_lineedit.cpp

manualtests/utils/lineedit/rss.png

manualtests/utils/lineedit/siteicon.png

manualtests/utils/singleapplication

manualtests/utils/singleapplication/main_singleapplication.cpp

manualtests/utils/singleapplication/singleapplication.pro

manualtests/utils/squeezelabel

manualtests/utils/squeezelabel/main_squeezelabel.cpp

manualtests/utils/squeezelabel/squeezelabel.pro

manualtests/utils/treesortfilterproxymodel

manualtests/utils/treesortfilterproxymodel/main_treesortfilterproxymodel.cpp

manualtests/utils/treesortfilterproxymodel/treesortfilterproxymodel.pro

manualtests/utils/treesortfilterproxymodel/treesortfilterproxymodeldialog.ui

manualtests/utils/utils.pro

src/adblock

src/adblock/adblock.pri

src/adblock/adblockblockednetworkreply.cpp

src/adblock/adblockblockednetworkreply.h

src/adblock/adblockdialog.cpp

src/adblock/adblockdialog.h

src/adblock/adblockdialog.ui

src/adblock/adblockmanager.cpp

src/adblock/adblockmanager.h

src/adblock/adblockmodel.cpp

src/adblock/adblockmodel.h

src/adblock/adblocknetwork.cpp

src/adblock/adblocknetwork.h

src/adblock/adblockpage.cpp

src/adblock/adblockpage.h

src/adblock/adblockrule.cpp

src/adblock/adblockrule.h

src/adblock/adblockschemeaccesshandler.cpp

src/adblock/adblockschemeaccesshandler.h

src/adblock/adblocksubscription.cpp

src/adblock/adblocksubscription.h

src/autofilldialog.cpp

src/autofilldialog.h

src/autofilldialog.ui

src/autofillmanager.cpp

src/autofillmanager.h

src/data/128x128/run.license

src/data/128x128/run.png

src/data/parseForms.js

src/modeltoolbar.cpp

src/modeltoolbar.h

src/utils/networkaccessmanagerproxy.cpp

src/utils/networkaccessmanagerproxy.h

src/utils/treesortfilterproxymodel.cpp

src/utils/treesortfilterproxymodel.h

src/utils/webpageproxy.cpp

src/utils/webpageproxy.h

files removed:
autotests/editlistview

autotests/editlistview/editlistview.pro

autotests/editlistview/tst_editlistview.cpp

autotests/edittreeview

autotests/edittreeview/edittreeview.pro

autotests/edittreeview/tst_edittreeview.cpp

autotests/languagemanager

autotests/languagemanager/languagemanager.pro

autotests/languagemanager/tst_languagemanager.cpp

autotests/lineedit

autotests/lineedit/lineedit.pro

autotests/lineedit/tst_lineedit.cpp

debian/patches/kubuntu_01_google_lucky.diff

debian/patches/kubuntu_02_default_bookmarks.diff

manualtests/editview

manualtests/editview/editview.pro

manualtests/editview/editview.ui

manualtests/editview/main_editview.cpp

manualtests/lineedit

manualtests/lineedit/bookmark.png

manualtests/lineedit/dialog.ui

manualtests/lineedit/lineedit.pro

manualtests/lineedit/main_lineedit.cpp

manualtests/lineedit/rss.png

manualtests/lineedit/siteicon.png

manualtests/singleapplication

manualtests/singleapplication/main_singleapplication.cpp

manualtests/singleapplication/singleapplication.pro

manualtests/squeezelabel

manualtests/squeezelabel/main_squeezelabel.cpp

manualtests/squeezelabel/squeezelabel.pro

src/bookmarks/bookmarktoolbutton.cpp

src/bookmarks/bookmarktoolbutton.h

files modified:
AUTHORS

ChangeLog

Doxyfile

README

arora.pro

autotests/autosaver/tst_autosaver.cpp

autotests/autotests.pro

autotests/cookiejar/tst_cookiejar.cpp

autotests/downloadmanager/tst_downloadmanager.cpp

autotests/historyfiltermodel/tst_historyfiltermodel.cpp

autotests/historymanager/tst_historymanager.cpp

autotests/modeltest/modeltest.cpp

autotests/qtry.h

autotests/tabbar/tst_tabbar.cpp

autotests/tabwidget/tst_tabwidget.cpp

autotests/webactionmapper/tst_webactionmapper.cpp

autotests/webpage/tst_webpage.cpp

autotests/xbel/tst_xbel.cpp

buildosx.sh

debian-upstream/changelog.in

debian/changelog

debian/patches/series

generateAuthors

generateReleaseContributors

git_hooks/findstyleerrors.sh

git_hooks/pre-commit_autotest

git_hooks/pre-commit_bashstylecheck

git_hooks/pre-commit_checkhour

git_hooks/pre-commit_checkstyle

git_hooks/pre-commit_manualtestbuild

manualtests/manualtests.pro

manualtests/searchlineedit/searchlineedit.pro

src/aboutdialog.cpp

src/aboutdialog.ui

src/arora.desktop

src/bookmarks/bookmarks.pri

src/bookmarks/bookmarksdialog.cpp

src/bookmarks/bookmarksdialog.h

src/bookmarks/bookmarksmodel.cpp

src/bookmarks/bookmarkstoolbar.cpp

src/bookmarks/bookmarkstoolbar.h

src/browserapplication.cpp

src/browserapplication.h

src/browsermainwindow.cpp

src/browsermainwindow.h

src/data/data.qrc

src/data/defaultbookmarks.xbel

src/downloadmanager.cpp

src/downloadmanager.h

src/history/history.cpp

src/history/history.h

src/history/historycompleter.cpp

src/history/historycompleter.h

src/history/historymanager.cpp

src/htmls/dirlist.html

src/htmls/startpage.html

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/locale.pri

src/locale/maintainers

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/modelmenu.cpp

src/modelmenu.h

src/network/cookiejar/cookiejar.cpp

src/network/cookiejar/cookiejar.h

src/network/cookiejar/networkcookiejar/trie_p.h

src/network/fileaccesshandler.cpp

src/network/networkaccessmanager.cpp

src/network/networkaccessmanager.h

src/opensearch/opensearchengine.h

src/opensearch/opensearchenginemodel.cpp

src/qwebplugins/clicktoflash/clicktoflash.cpp

src/settings.cpp

src/settings.h

src/settings.ui

src/src.pri

src/tabbar.cpp

src/tabwidget.cpp

src/tabwidget.h

src/toolbarsearch.cpp

src/toolbarsearch.h

src/utils/languagemanager.cpp

src/utils/languagemanager.h

src/utils/singleapplication.cpp

src/utils/singleapplication.h

src/utils/utils.pri

src/webpage.cpp

src/webpage.h

src/webview.cpp

src/webview.h

tools/placesimport/main_placesimport.cpp

tools/tools.pro

webkittrunk.pri

windowsinstaller.nsi

Show diffs side-by-side

added added

removed removed

src/aboutdialog.cpp

27

27

#include <qtextedit.h>

28

28

#include <qtextstream.h>

29

29

30

#if defined(WEBKIT_TRUNK)

30

#if QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK)

31

31

#include <qwebkitversion.h>

32

32

#endif

33

33

39

39

logo->setPixmap(qApp->windowIcon().pixmap(128, 128));

40

40

name->setText(qApp->applicationName());

41

41

version->setText(qApp->applicationVersion());

42

#if defined(WEBKIT_TRUNK)

42

#if QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK)

43

43

webkitVersion->setText(tr("WebKit version: %1").arg(qWebKitVersion()));

44

44

#else

45

45

webkitVersion->hide();

Older »