Commit b78c1ef6 authored by Christian Kamm's avatar Christian Kamm
Browse files

Merge remote branch 'origin/2.1'

Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/classview/ClassView.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/breakhandler.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/imageviewer/ImageViewer.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/tasklist/TaskList.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
	tests/manual/fakevim/fakevim.pro
	tests/manual/ssh/errorhandling/main.cpp
parents 5f9b0576 4661e874
......@@ -5,24 +5,67 @@ within the logs of Qt Creator's sources. Simply check it out from the public git
repository e.g.,
git clone git://gitorious.org/qt-creator/qt-creator.git
git log --cherry-pick --pretty=oneline v2.0.0...v2.0.1
git log --cherry-pick --pretty=oneline origin/2.0.0...origin/2.0.1
General
General:
* Fix the suggested path in the new dialog in case of sub projects
* Search dialog now opens the completion box for the search term on cursor down
* Fix Mercurial plugin (QTCREATORBUG-1503)
* The .bin postfix was removed from the qtcreator executable
Editing
Editing:
* Fixed disabled "Open with" context menu in project tree
* CodePaster: Do not show popup about modified files on Windows
* FakeVim: Fix issues with non-letter keys on non-US keyboards
* FakeVim: Fix performance of find/replace
* Fixed disabled "Open with" context menu in project tree.
* Fakevim: Fix mark interpretion for d'a etc
* Fakevim: clear opcount and mvcount on escape
* Fakevim: fix Delete key in command mode
* Fakevim: fix backspace in the presence of physical tabs
* Fakevim: fix insert of Tabs and up/down movement in the presence of real tabs
* Fakevim: fix mark positions after <Delete>
* Fakevim: make Ctrl-V <Tab> and Ctrl-V <Return> work in Insert and Ex mode
* BinEditor: Add "jump to address" functionality
* BinEditor: Add a bit of value interpretation
* BinEditor: Fix cursor position label
* BinEditor: Fix file name not being displayed
* BinEditor: Implement "Jump to start/end of file" for lazy data
* QmlDesigner: Fix crash when typing keywords as Ids
* QmlDesigner: Fix import handling in rewriter
* QmlDesigner: Prevent freezing while doing drag&drop on some Windows systems
* QML snippet: property has a name and a value, not two names
* QmlJS: Avoid infinite recursion when encountering property loops
* QmlJS: Make variables in imported JS documents show up in completion
* QmlJS: Remove spurious spaces from default import path in qmlproject
* Qt Designer integration: Fix Help button in stylesheet editor
* QuickDesigner: Make metainfo system robust for different version numbers
* QuickDesigner: Reduce numbers of redraws / state switching in States Editor
C++ Support
C++ Support:
* Added C-style comment folding
* Fix crash while renaming symbol when a symbol is being renamed
Project support
VCS Support:
* Diff editors: Set readonly attributes correctly
* Mercurial: Working directory not set for asynchronous commands
* Subversion: Remove LANG=C setting
* git: Adapt to 1.7.0, handling of renamed files. Reviewed-by: con
Project support:
* Fix auto-scrolling in application and compile output
* Cmake: Don't delete run configurations on switching buildconfigurations
* Ask to save all editors before running qmake
* Allow the user to set the version number used for the build deb package
* Don't crash if the session node is the current node in context menu
* Fix DESTDIR=. case
* Don't reset build directory for clone cmake buildconfigurations
* Don't show the full file name in the reload prompt by default
* Fix crash for newly added project nodes
* Improve task parsing
* Fixes: New Project action didn't respect the default project location
Debugging
Debugging:
* Fix 2.0 regression: QObject property display
* Speed up cdb debugging helper initialization
* Fix display of certain structures within containers
* Fix display of typedefs of typedefs of simple types such as qulonglong
* Fix behaviour of 'step' and 'next' when a lower frame was selected
......@@ -30,17 +73,70 @@ Debugging
* Improve gdb version string parsing
* Fix that the newest version of compiled debugging helper was not used
if there was an older version still was around in a different search path
* Windows[gdb]: Fix Attach to running (gui) process
* Fix 2.0 regression: allow assignment to structure members
* Always switch to frame 0 before trying to leave frame
* Cache results of gdb.lookup_type to increase performance
* Finish "Launching" bar even if we don't hit a "^running"
* Fix 2.0 regression: 'jump to line' and 'run to line' with older versions of gdb
* Fix decoding of %04x encoded 16 bit big endian data
* Fix 2.0 regression: display of typedefs-of-typedefs, such as qulonglong
* Fix 2.0 regression: list of members in case gdb reports '_class_ SomeClass'
* Handle gdb 7.1.50's thread-group-started 'pid' field
* Fix python dumper for std::vector<bool>
* Improve robustness in the presence of outdated debug information
* Make ctrl-click to navigate between input and output pane (much) faster
* Switch off reverse debugging tool button if not useful
* Fix reporting of loaded libraries on Symbian devices
* Fix late crash when closing Creator while building debugging helper (QTCREATORBUG-1576)
QML/JS Support:
* New QmlDesigner
* Allows visual manipulation of .qml files
* Supports changing top-level states
* Integrates tighly with text editor, e.g. shared history, navigation facilities ..
Documentation:
* Add description of the Use debug versions of Frameworks option
* Add descriptions for new Maemo packaging options
* Add info about layouts to the example
* Add information about unlocking views in Debug mode
* Add qtquick to defines to display Qt Quick information
* Add tips and tricks
* Edit the introduction
Platform Specific
Translations:
* Update Japanese translation
* Update Russian translation
* Update Slovenian translation
* Update German translation
* Add Simplified Chinese translation
* Add French translation, done by the developpez.com team
Mac
Mac specific:
* Save maemo device configuration on MacOS
Linux (GNOME and KDE)
Linux specific:
Windows
Windows specific:
* Fixed that some menu items got disabled during keyboard navigation
* Fix wildcard expansion, etc. under windows
* Detect Microsoft Visual Studio 2010
* Fixed handling of usernames with Cyrillic characters (QTCREATORBUG-1643)
Additional credits go to:
Maemo specific:
* Fix Qemu start on Mac
* Fix building projects if MADDE is on a different drive then the project
* Fix access rights for remote .ssh directory
* Fix end-of-process detection
* Fix incorrect assumption about build directory
* Make device configuration id type consistent
* Make packaging step optional
Symbian specific:
* Symbian support is no longer experimental
* Symbian/trk: Don't try to dereference references
* Symbian/trk: Fix handling of partial frames
* Small improvements to the abld parser
* Use outputparsers when creating S60 packages
* Improve detection of simulator Qts
......@@ -5,11 +5,10 @@ within the logs of Qt Creator sources. Simply check it out from the public git
repository. For example:
git clone git://gitorious.org/qt-creator/qt-creator.git
git log --cherry-pick --pretty=oneline v2.0.0...v2.0.1
git log --cherry-pick --pretty=oneline v2.1.0...v2.0.1
General
*
*
* Made search result panel searchable
Editing
......@@ -17,21 +16,67 @@ C++ Support
* Added semantic highlighting of types, virtual methods, locals, statics and
member variables (only enabled when running against Qt 4.7.1 and up, for
performance reasons)
* Add new indenter along with a new option to control alignment indents
* Add new %FILENAME%, %CLASS% placeholders to license template
* Added searching for symbols that match a pattern to advanced find
* Made 'Follow symbol' for classes skip forward declarations
Project Support
* Add option for adding subprojects to projects in the New wizard
* Add context-menu command for removing subprojects in the Edit mode,
* Added option for adding subprojects to projects in the New wizard
* Added context-menu command for removing subprojects in the Edit mode,
Projects view
* Add a wizard for adding other than Qt libraries to project files
* Added a wizard for adding other than Qt libraries to project files
Debugging
* Fix console debugging with MinGW/gdb
* Symbian: Add basic thread support, improve logging
* Fixed splitter inconsistency of debugger tool bar
* Fixed console debugging with MinGW/gdb
* Symbian: Added basic thread support, improve logging
* New dumpers for QDate, QTime, QHostAddress, QRegion, boost::optional,
QSharedData and QSharedDataPointer
* Improved/fixed dumpers for QObject (include user defined properties), QList,
C-style arrays, QSize, QSizeF, QImage/QPixmap, std::vector<bool>,
QVariant(QString), qulonglong, std::size_t, std::ptrdiff_t,
QScopedPointer, QStandardItem
* Performance improvements due to use of dwarf index data to reduce gdb
startup time, use of new gdb.read_memory for QByteArray and QString display
* Debugger framework handles multiple debugging sessions in parallel
* Allow per item and/or type selection of display method in Locals&Watchers
* Implement data watchpoints
* Implement a debugger engine to debug Python scripts
* Direct remote debugging using -debug binary@host:port[@arch] on the command line
* Make alphabetic sorting of struct members optional
* New Add/Edit breakpoint dialog
* Show QThread object names in threads view
* Support for per-thread breakpoints
* Show dynamic type of objects for gdb versions newer than Aug 31, 2010
* [etc]
Help
QML/JS Support
* Added 'Find usages' action that works on ids, properties, functions and
variables
* Improved 'Follow symbol' to also work on file imports and JS functions
* Completion: Sort completion items by relevance
* Completion: Automatically complete trailing : or .
* Added new indenter
* Added code folding for multiline comments
* Improved performance of the code model significantly
* Added Qt Quick ToolBar
FakeVim:
* Fix indentation of first line after >iB and >ib, undo after cjaaa<Esc>, ~ etc
* Implement :mak, :nohlsearch, :only, :reg[isters], Ctrl-J, Ctrl-N, Ctrl-P,
* Implement [(, ]), [{, ]}, some of the :bn/bp commands
* Implement {}/[]/<>-block text objects
* Make :q after :sp more vim-ish, make <C-.> etc work in mappings
* Make Searching a 'sub-sub-mode' to allow d/
* Make recognition of ex command names similar to vi's
* Move "status line" to the main statusbar
* Refactor searching for less random jumps and more speed
* Rework line ranges and support for marks
* Use basetext cursor handling and indentation support for better integration
* [etc]
Platform Specific
......@@ -44,27 +89,35 @@ Windows
Symbian Target
Maemo Target
* Improved support for Debian packaging:
- Automatic creation of Debian files in project directory
- Debian files adaptable by users
* Deployment information is taken from .pro file's INSTALLS variable
* Support for "subdirs" and library project types
* Projects created by mobile wizards are now usable for Maemo development
* Automatic creation and deployment of Desktop files for application projects
* Fremantle: Support for exporting host directories to the device (also employed for zero-copy deployment)
Designer
* Add switching between code and forms using Shift-F4
* Various improvements to mode switching
* Added switching between code and forms using Shift-F4
* Made various improvements to mode switching
Version control plugins
* Support git version 1.7.x
* Add support for git --amend
* Make it possible to run gitk from Qt Creator
* Improve commit window, show number of files to be committed, add context
* Added support for git --amend
* Made it possible to run gitk from Qt Creator
* Improved commit window, show number of files to be committed, add context
menu for quickly checking and unchecking all files
* Add branch selector to the git checkout wizard
* Add support for the CVS 'edit' functionality, make Qt Creator prompt to
* Added branch selector to the git checkout wizard
* Added support for the CVS 'edit' functionality, make Qt Creator prompt to
request a read-only file using 'cvs edit' (cvsnt only).
* Perforce: Add setting to automatically open read-only files
* Perforce: Added setting to automatically open read-only files
Wizards
* Custom wizard: Enhance template processing of wizards to be able to include
* Custom wizard: Enhanced template processing of wizards to be able to include
sections of files conditionally, extend functionality of combo control
to be able to handle user-displayable strings and keywords
* Custom wizard: Add ability to have files generated by scripts
* Custom wizard: Added ability to have files generated by scripts
Additional credits go to:
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Type=Application
Terminal=false
Name=BatteryIndicator
Exec=/opt/usr/bin/BatteryIndicator
Icon=BatteryIndicator
X-Window-Icon=
X-HildonDesk-ShowInToolbar=true
X-Osso-Type=application/x-executable
#-------------------------------------------------
#
# Project created by QtCreator 2010-05-26T16:46:58
#
#-------------------------------------------------
# Add files and directories to ship with the application
# by adapting the examples below.
# file1.source = myfile
# dir1.source = mydir
DEPLOYMENTFOLDERS = # file1 dir1
QT += core gui
# Avoid auto screen rotation
#DEFINES += ORIENTATIONLOCK
TARGET = BatteryIndicator
TEMPLATE = app
# Needs to be defined for Symbian
#DEFINES += NETWORKACCESS
SOURCES += main.cpp\
batteryindicator.cpp
HEADERS += batteryindicator.h
FORMS += batteryindicator.ui
symbian:TARGET.UID3 = 0xE5123A52
CONFIG += mobility
MOBILITY = systeminfo
symbian {
TARGET.UID3 = 0xecbd72d7
# TARGET.CAPABILITY +=
TARGET.EPOCSTACKSIZE = 0x14000
TARGET.EPOCHEAPSIZE = 0x020000 0x800000
}
SOURCES += main.cpp mainwindow.cpp
HEADERS += mainwindow.h
FORMS += mainwindow.ui
# Please do not modify the following two lines. Required for deployment.
include(deployment.pri)
qtcAddDeployment()
OTHER_FILES += \
debian/changelog \
debian/compat \
debian/control \
debian/copyright \
debian/README \
debian/rules
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="44px"
version="1.1"
viewBox="0 0 44 44"
width="44px"
x="0px"
y="0px"
id="svg2"
inkscape:version="0.47 r22583"
sodipodi:docname="qt.svg">
<metadata
id="metadata18">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs16">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 22 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="44 : 22 : 1"
inkscape:persp3d-origin="22 : 14.666667 : 1"
id="perspective2836" />
</defs>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1020"
id="namedview14"
showgrid="false"
inkscape:zoom="21.454545"
inkscape:cx="49.412871"
inkscape:cy="21.894358"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="1"
inkscape:current-layer="g3" />
<g
transform="matrix(0.18308778,0,0,0.18308778,6.6100946,3.2385199)"
id="g3">
<path
d="M 43.09,0.3586 C 40.94,0.0036 38.84,-0.0824 36.81,0.0776 31.968136,0.39505671 27.122677,0.73638425 22.28,1.0696 9.62,2.0816 0,12.4996 0,26.8896 l 0,169.7 14.19,13.2 28.87,-209.42 0.03,-0.011 z"
style="fill:#006225"
id="path5"
sodipodi:nodetypes="cccccccc" />
<path
d="m 174.4,160 c 0,12.5 -7.75,24.07 -17.57,25.77 L 14.23,209.73 V 25.93 C 14.23,9.21 27.57,-2.27 43.12,0.3 l 131.3,21.52 v 138.2 z"
style="fill:#80c342"
id="path7" />
<path
d="m 154.9,80.96 -12.96,-0.598 0,0.278 6.945,0.32 6.016,0 z"
style="fill:#006225"
id="path11" />
<path
d="m 144.6,135.6 c 0.66,0.328 1.43,0.476 2.351,0.476 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 h -6.015 c -1.821,0.832 -3.532,1.457 -5.176,1.848 z"
style="fill:#006225"
id="path13" />
<path
id="path17"
style="fill:#ffffff"
d="m 91.15,132.4 c 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -4.34,0 -7.68,2.535 -10.01,7.625 -2.52,5.543 -3.793,17.04 -3.793,34.44 0,16.82 1.238,28.75 3.734,35.75 2.356,6.672 5.879,9.976 10.5,9.976 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 m 17.98,3.75 c -4.117,9.707 -10.39,16.06 -18.99,19 0.867,4.449 2.176,7.441 3.922,9.019 1.351,1.211 3.433,1.821 6.222,1.821 0.805,0 1.668,-0.055 2.59,-0.157 v 13.12 l -5.961,0.782 c -1.758,0.23 -3.426,0.343 -5.004,0.343 -5.218,0 -9.445,-1.265 -12.62,-3.824 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 1.629,0 3.309,0.102 5.043,0.305 11.95,1.375 20.62,7.016 26.26,16.79 5.535,9.562 8.254,23.27 8.254,41.26 0,16.48 -2,29.45 -6.043,39.02 z M 130.4,45.91 l 11.52,1.238 0,20.21 12.96,0.914 0,12.68 -12.96,-0.598 0,46.33 c 0,4.032 0.445,6.625 1.34,7.789 0.8,1.067 2.046,1.594 3.71,1.594 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 v 11.65 c -5.136,2.258 -10.18,3.598 -15.12,4.02 -0.718,0.055 -1.41,0.086 -2.078,0.086 -4.48,0 -7.906,-1.301 -10.25,-3.934 -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.535 L 118.046,79.25 V 65.66 l 7.586,0.547 4.773,-20.3 z" />
<path
d="m 100.3,166 c 0.809,0 1.672,-0.055 2.59,-0.157 H 98.054 C 98.73,165.949 99.507,166 100.3,166 z"
style="fill:#006225"
id="path19" />
<path
id="path21"
style="fill:#006225"
d="m 84.85,63.98 c 2.336,5.997 3.484,16.92 3.484,32.81 0,17.7 -1.16,29.57 -3.512,35.62 -1.894,4.879 -4.527,7.902 -7.863,9.07 0.965,0.368 1.992,0.551 3.078,0.551 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -1.09,0 -2.117,0.16 -3.082,0.481 h -0.004 c 3.601,1.121 6.379,4.215 8.336,9.261 z m -2.344,114.3 c -0.113,-0.05 -0.227,-0.105 -0.336,-0.16 -0.012,-0.004 -0.023,-0.012 -0.035,-0.015 -0.102,-0.051 -0.207,-0.106 -0.309,-0.157 -0.019,-0.011 -0.039,-0.019 -0.058,-0.031 -0.09,-0.051 -0.184,-0.098 -0.278,-0.148 -0.027,-0.016 -0.054,-0.036 -0.086,-0.051 -0.082,-0.043 -0.164,-0.09 -0.242,-0.137 -0.039,-0.023 -0.078,-0.047 -0.113,-0.07 -0.07,-0.039 -0.145,-0.082 -0.215,-0.125 -0.047,-0.031 -0.094,-0.059 -0.14,-0.09 -0.059,-0.039 -0.118,-0.074 -0.176,-0.113 -0.059,-0.039 -0.114,-0.075 -0.168,-0.114 -0.051,-0.031 -0.102,-0.066 -0.149,-0.097 -0.066,-0.047 -0.132,-0.094 -0.195,-0.137 -0.039,-0.027 -0.078,-0.055 -0.113,-0.082 -0.078,-0.055 -0.153,-0.113 -0.231,-0.172 -0.023,-0.016 -0.05,-0.035 -0.078,-0.055 -0.098,-0.078 -0.199,-0.156 -0.297,-0.234 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 h -6.351 c -10.15,0.008 -18.22,3.977 -24,12.04 -6.855,9.563 -10.34,24.64 -10.34,45.07 0,18.95 2.547,33.44 7.551,43.34 4.934,9.75 12.05,15.56 21.19,17.5 1.989,9.641 5.09,16.16 9.297,19.54 3.176,2.559 7.403,3.824 12.62,3.824 0.098,0 0.199,0 0.297,-0.004 h 5.539 c -3.406,-0.05 -6.383,-0.66 -8.906,-1.828 L 82.498,178.28 z M 128.4,145.6 c -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.57 l -6.226,-0.285 v -13.59 h -6.016 v 3.035 c 0.871,3.273 1.555,6.82 2.063,10.64 l 4.164,0.192 v 51.36 c 0,6.723 1.367,11.62 4.09,14.67 2.343,2.633 5.765,3.934 10.25,3.934 h 6.015 c -4.48,0 -7.906,-1.301 -10.25,-3.934 z m 2.043,-99.66 -6.016,0 -4.668,19.88 5.911,0.422 4.773,-20.3 z" />
</g>
</svg>
#include "batteryindicator.h"
#include "ui_batteryindicator.h"
//! [2]
BatteryIndicator::BatteryIndicator(QWidget *parent) :
QDialog(parent),
ui(new Ui::BatteryIndicator),
deviceInfo(NULL)
{
ui->setupUi(this);
setupGeneral();
}
//! [2]
BatteryIndicator::~BatteryIndicator()
{
delete ui;
}
//! [1]
void BatteryIndicator::setupGeneral()
{
deviceInfo = new QSystemDeviceInfo(this);
ui->batteryLevelBar->setValue(deviceInfo->batteryLevel());
connect(deviceInfo, SIGNAL(batteryLevelChanged(int)),
ui->batteryLevelBar, SLOT(setValue(int)));
}
//! [1]
The Debian Package batteryindicator
----------------------------
Comments regarding the Package
-- unknown <> Tue, 05 Oct 2010 12:01:24 +0200
batteryindicator (0.0.1) unstable; urgency=low
* Initial Release.
-- unknown <> Tue, 05 Oct 2010 12:01:24 +0200
Source: batteryindicator
Section: user/hidden
Priority: optional
Maintainer: unknown <>
Build-Depends: debhelper (>= 5), libqt4-dev
Standards-Version: 3.7.3
Homepage: <insert the upstream URL, if relevant>
Package: batteryindicator
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: <insert up to 60 chars description>
<insert long description, indented with spaces>
This package was debianized by unknown <> on
Tue, 05 Oct 2010 12:01:24 +0200.
It was downloaded from <url://example.com>
Upstream Author(s):
<put author's name and email here>
<likewise for another author>
Copyright:
<Copyright (C) YYYY Name OfAuthor>
<likewise for another author>
License:
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
The Debian packaging is (C) 2010, unknown <> and
is licensed under the GPL, see above.
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
touch configure-stamp
build: build-stamp
build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
$(MAKE)
#docbook-to-man debian/batteryindicator.sgml > batteryindicator.1
touch $@
clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
$(MAKE) clean
dh_clean
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
# Add here commands to install the package into debian/batteryindicator.
$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/batteryindicator install
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs
dh_installdocs
dh_installexamples
# dh_install
# dh_installmenu